Commit graph

1220 commits

Author SHA1 Message Date
snipe 20876a4502 Meh 2016-04-13 01:51:28 -07:00
snipe 468fb14274 Added ci config to _env 2016-04-13 01:23:47 -07:00
snipe eaa02ef7d3 More poking and hoping 2016-04-13 01:14:23 -07:00
snipe 62b3653e7c Fixed CI db stuff 2016-04-13 01:08:02 -07:00
snipe 91c9a08d29 Switch back to testing-ci 2016-04-13 01:01:03 -07:00
snipe 1eeb4d042a Sigh. 2016-04-13 00:56:43 -07:00
snipe 454d0daa25 This won't work either, but running out of ideas 2016-04-13 00:45:42 -07:00
snipe 1c6e4a74be Why the fuck not. 2016-04-13 00:35:28 -07:00
snipe 7083bb50ca Remove sqlite references (duh) 2016-04-12 23:56:13 -07:00
snipe 561bf038f7 Remove sqlite env var 2016-04-12 23:45:14 -07:00
snipe 4def8b7349 Try mysql for travis 2016-04-12 23:43:53 -07:00
snipe db83faeb49 Remove baseurl 2016-04-12 23:32:52 -07:00
snipe cf0a2051b0 Remove constructor 2016-04-12 22:53:38 -07:00
snipe f7d1415e33 Added SetUp back in :( 2016-04-12 22:49:07 -07:00
snipe aa4bb121ae Remove the putenv 2016-04-12 22:10:50 -07:00
snipe 1fb8f421a2 Add parent::createApplication(); 2016-04-12 22:00:21 -07:00
snipe a6a6edfeaa Updated travis.yml 2016-04-12 21:01:39 -07:00
snipe cbe0f8a9eb Split environments into configs 2016-04-12 21:00:20 -07:00
snipe cc057fe282 Reformatting URL in acceptance.yml 2016-04-12 20:48:37 -07:00
snipe 39c7439be6 Removed custom phantomJS stuff - it's 404ing 2016-04-12 20:21:53 -07:00
snipe f7b6276311 Updated test url 2016-04-12 20:21:39 -07:00
snipe cd0df27516 Comment edit 2016-04-12 19:24:02 -07:00
snipe 6a8883104d Fixed DB name in testing config 2016-04-12 19:23:40 -07:00
snipe b6fa3a2a89 Added todos, fixed ID casing 2016-04-07 17:23:52 -07:00
snipe 40aac1bf89 Fixed seeds 2016-04-07 17:15:41 -07:00
snipe 4b168e8cfa Fixes #1932 - disallow category delete if there are assets/accessories/etc 2016-04-07 17:15:30 -07:00
snipe d601db2090 Updated docs 2016-04-07 17:08:38 -07:00
snipe bf728da39d Updated to use 5.2 trans() instead of Lang::get for localization 2016-04-07 13:39:35 -07:00
snipe a62859dc6d Updated docblocks 2016-04-07 13:21:09 -07:00
snipe 95e4845176 Fix userlist for accessory checkout 2016-04-07 05:03:14 -07:00
snipe 0e6b8a8358 Switch to use trans from Lang::get for laravel 5.2 2016-04-07 02:51:57 -07:00
snipe 64d36a9e64 Fixes #1922 - sort by license name 2016-04-04 22:16:24 -07:00
snipe ecf9734105 Swtch env to just testing.
This won't work, but neither does anything else
2016-03-30 18:31:09 -07:00
snipe 2e7ddb75db Try diff block for testing (not testing-ci) 2016-03-30 15:56:53 -07:00
snipe 269944ecdf Try adding phantom as the browser 2016-03-30 15:47:29 -07:00
snipe 4a7b0c0d0f Updated docblocks 2016-03-28 22:51:49 -07:00
snipe 08c196872c Removed IP test in custom fields since we are using laravel's IP validation now 2016-03-28 21:53:36 -07:00
snipe 093e4bbb73 Updated translations 2016-03-28 21:50:00 -07:00
snipe 6f9bad1005 Use lightbox for images in asset file listing 2016-03-25 20:38:27 -07:00
snipe 90d4a8b2e3 Cleanup namespaces a bit 2016-03-25 19:26:22 -07:00
snipe e7405e8d89 Coding is still hard, apparently. 2016-03-25 18:51:44 -07:00
snipe a10da2e148 Fixes error loading consumables 2016-03-25 18:29:45 -07:00
snipe 3f97cc0137 Fixes the fucking "Assets Retired" thing AGAIN. 2016-03-25 18:22:25 -07:00
snipe 41384dc62f Fixes #1845 - remove ability for users to change their email and password 2016-03-25 18:20:57 -07:00
snipe f1558706ff Updated docblocks 2016-03-25 18:07:12 -07:00
snipe 46a76e2c55 More compact user code 2016-03-25 17:45:50 -07:00
snipe bd1cb921fc Nicer namespacing and lazy eager loading for 101 queries in location assets 2016-03-25 17:38:17 -07:00
snipe 2b74fd86cb Trying to fix backup script
This is still broken, but I will come back to it
2016-03-25 17:21:01 -07:00
snipe 95e2825716 A few more path fixes 2016-03-25 17:20:28 -07:00
snipe e60bda0563 Updated file paths for uploads 2016-03-25 17:12:31 -07:00