3199dfd1d8
Checking testing issue to see if wrong environment is loading
2015-08-28 20:10:58 -04:00
ceac5a59ff
More tweaks to the travis
2015-08-28 20:10:58 -04:00
309ce7d0bd
Another tweak - getting close
2015-08-28 20:10:58 -04:00
129e45c817
Updated travis yaml to add a permissions change for the storage directory
2015-08-28 20:10:57 -04:00
e8f3b27141
Added a sleep statement to make things work possibly
2015-08-28 20:10:57 -04:00
2eb64b3105
Last change for detecting correct environment
2015-08-28 20:10:57 -04:00
c48ae56e2f
Last tweak before I head to begin drinking heavily...
2015-08-28 20:10:56 -04:00
8d5033c4e5
A tweak to make this work with an app environment variable
2015-08-28 20:10:56 -04:00
fd78fd8d24
This is getting old...
2015-08-28 20:10:56 -04:00
1f6874f0af
One last tweak - this may be it
2015-08-28 20:10:55 -04:00
fdde048f11
More tweaks / changes
2015-08-28 20:10:55 -04:00
8fd50e9524
Adding more debug tweaks
2015-08-28 20:10:55 -04:00
f836f88e38
Another tweak getting closer
2015-08-28 20:10:55 -04:00
775239e2ed
Almost there...
2015-08-28 20:10:54 -04:00
16d1875157
A change to my previous tweak for background serving
2015-08-28 20:10:54 -04:00
af6d9b462b
A couple more tweaks to make everything work
2015-08-28 20:10:53 -04:00
bfeb4560ca
Got some more tweaks, and changes to make things work
2015-08-28 20:10:53 -04:00
194e43d206
More tweaks for debugging
2015-08-28 20:10:53 -04:00
13830b5c09
More tweaking of the travis yaml file trying to get more out of the results
2015-08-28 20:10:52 -04:00
855a155178
Tweaking the configuration to work with travis - attempting hostname tweaks
2015-08-28 20:10:52 -04:00
3975555503
One more stupid mistake in travis yaml file -
2015-08-28 20:10:52 -04:00
b1d6d4da37
Fixed stupid mistake in the travis yaml file
2015-08-28 20:10:51 -04:00
be402a9d7d
Fixed issue in travis yaml file
2015-08-28 20:10:51 -04:00
00aba507f7
Fixed acceptance suite yaml to make it work for travis-ci as well as local testing
2015-08-28 20:10:50 -04:00
0cadab8fc6
Initial changes to allow travis-ci to run codeception tests
2015-08-28 20:10:50 -04:00
cc14eee161
Adding setup for Codeception
2015-08-28 20:10:50 -04:00
da10a9a2aa
Fixes #1130 - don't try to send email if email is not provided with the user
2015-08-28 12:15:07 -07:00
cf7ef5e8b0
Merge pull request #1131 from irasnyd/docker-fixes
...
Add LDAP support to Docker image
2015-08-28 10:02:18 -07:00
3f08258bf0
Add LDAP support to Docker image
...
This adds LDAP support to the Docker image. All parameters are specified
using environment variables named following the convention in the
configuration files themselves.
2015-08-28 09:10:28 -07:00
f7ce7060eb
Allow Docker users to set the server URL
...
This change allows Docker users to set the server URL by setting the
SERVER_URL environment variable. This is done in the same way as the
database and mail settings.
2015-08-28 09:03:06 -07:00
49e898fd26
Merge pull request #1122 from irasnyd/docker-fixes
...
Fix broken Docker build
2015-08-26 14:43:10 -07:00
1927f131aa
Fix broken Docker build
...
The Dockerfile now includes the php5-curl package, which is needed to
satisfy a missing dependency.
The docker/app_start.patch was updated to match changes to the source
code.
2015-08-26 14:09:03 -07:00
a4a29be868
Bumped version
2015-08-25 19:40:08 -07:00
2e7fd02f42
Updated language strings
2015-08-24 12:59:35 -07:00
da6770c9d9
Fixes #1102 - default currency stored as htmlentities in the DB
2015-08-21 18:11:23 -07:00
7dd2b3d580
Fixes #1104
2015-08-21 16:00:03 -07:00
e5b80ab423
Merge pull request #1105 from aalaily/develop
...
Remove hardcoded location in favour of a selection dropdown
2015-08-21 12:19:25 -07:00
27efae93ac
Add some explanation about the location field.
2015-08-21 10:42:37 -04:00
960be7c5ae
Replace hardcoded location with a user selection.
2015-08-21 10:40:18 -04:00
0b5f83fc56
add a drop down of locations
2015-08-21 10:39:45 -04:00
89564b3d2a
Merge pull request #1099 from kobie-chasehansen/fix-for-#1098
...
fix for #1098
2015-08-20 21:39:00 -07:00
610392777b
fix
2015-08-21 00:30:55 -04:00
e916fdcc89
Fixes #1092 , setting LDAP_OPT_REFERRALS to 0 for Active Directory
2015-08-20 15:54:42 -07:00
70f7f65394
Fixed path for windows
2015-08-20 15:38:50 -07:00
8892feea62
Fixed typo
2015-08-20 15:38:35 -07:00
c7b0ecfac8
Slack notification for requested assets
2015-08-19 17:51:35 -07:00
d47198086f
Added notes search to licenses
2015-08-19 17:23:55 -07:00
89f7f50901
Merge pull request #1074 from mtucker6784/develop
...
Installer modified for 2.0 (develop currently)
2015-08-19 17:16:53 -07:00
8339dd3db2
Fixes #1089 - checkout button on accessory view page
2015-08-19 17:13:14 -07:00
e63d62d2c8
Fixes #1083
2015-08-19 12:33:16 -07:00
Vincent Sposato