Commit Graph

541 Commits

Author SHA1 Message Date
snipe ea42a18930 Merge pull request #99 from flashingcursor/develop
Datatables groundwork, minor tweaks.
2013-12-01 13:34:44 -08:00
Gil Rutkowski 36a714b154 Published debug bar assets on install. Moved jQuery & data tables to the head. Added Chumper Datatables. 2013-12-01 15:15:52 -06:00
snipe bee260b1f0 Added filename to log 2013-12-01 06:45:03 -05:00
snipe 45f46466d7 More fleshed out default db for testing 2013-11-30 22:04:33 -05:00
snipe 8f235881c5 Added phpunit in require-dev, removed ardent, as we're not actually using it at this point 2013-11-30 22:04:00 -05:00
snipe 8bf6a34c58 Unit testing conf files 2013-11-30 22:01:59 -05:00
snipe ca591ccb5d One more 2013-11-30 22:01:42 -05:00
snipe 9d22ce5ac7 Added gitignore lines for new conf files 2013-11-30 22:00:44 -05:00
snipe 067ddb9aac Config tweaks 2013-11-30 17:53:21 -05:00
snipe b352817407 Ignoring configs 2013-11-30 17:42:15 -05:00
snipe e2dc24d926 Updated readme 2013-11-30 17:39:02 -05:00
snipe baab758377 Fixed language support 2013-11-30 17:30:02 -05:00
snipe d91d75abe4 Fixing JSON parse errors from #97 2013-11-30 17:08:39 -05:00
snipe 12d3d10dec Merge branch 'develop' of github.com:snipe/snipe-it into develop 2013-11-30 17:02:22 -05:00
snipe 7693e83d7f wtf 2013-11-30 17:02:11 -05:00
snipe 3bc35208af Merge pull request #97 from flashingcursor/develop
Making things a bit more environmentally sensitive...
2013-11-30 13:53:49 -08:00
Gil Rutkowski 78d1c0345e Merge remote-tracking branch 'upstream/develop' into develop 2013-11-30 11:52:27 -06:00
Gil Rutkowski ca39b34b8c Automatically run Sentry Migrations and DB migrations after composer install. 2013-11-30 11:36:05 -06:00
Gil Rutkowski 3d1a533bf2 Environmental cleanup. 2013-11-30 11:17:02 -06:00
Gil Rutkowski 71eaeb2783 Updated README for Environments and revised the order of things. 2013-11-29 23:56:48 -06:00
Gil Rutkowski f9d8cb1b93 Made things a bit more environmentally sensitive. 2013-11-29 23:22:48 -06:00
snipe f62ce4039d @uberbrady is a pedantic shitbag. 2013-11-29 17:07:49 -05:00
snipe 8f9a82e400 Prevent user editing on deleted user 2013-11-29 17:05:55 -05:00
snipe 2be6c6f5da Hurr. 2013-11-29 16:57:49 -05:00
snipe 35155dfc4c Prevent user from being deleted if they still have assets assigned to them 2013-11-29 16:57:24 -05:00
Gil Rutkowski 2e82794ab4 Merge branch 'develop' of github.com:snipe/snipe-it into develop 2013-11-29 15:45:41 -06:00
snipe 7142e37372 Deleted users 2013-11-29 16:44:48 -05:00
snipe dca7a7f2eb Allow deleted users 2013-11-29 16:39:24 -05:00
snipe a7ca9f0c9f Layout tweaks 2013-11-29 16:36:11 -05:00
Gil Rutkowski 7c3a9faf53 Updating from upstream
Merge remote-tracking branch 'upstream/develop' into develop
2013-11-29 15:20:28 -06:00
Gil Rutkowski 2fe58f8d6d Merge branch 'patch-1' of github.com:flashingcursor/snipe-it into develop 2013-11-29 15:16:01 -06:00
snipe bc16276a38 Merge pull request #96 from flashingcursor/patch-1
Removed post-install-cmd php artisan optimize.
2013-11-29 13:10:47 -08:00
snipe 11c657ffa4 Fixes #36 2013-11-29 16:08:18 -05:00
snipe 80afa7cbc7 Disallow checkout of undeployable items 2013-11-29 15:27:44 -05:00
snipe 56adc67e67 Require manufacturer ID 2013-11-29 15:21:11 -05:00
snipe 02f1977d30 Fixed error message 2013-11-29 15:20:29 -05:00
snipe b68e39472d Updating to bootstrap 3 2013-11-29 15:19:00 -05:00
snipe 10df2bc950 Bootstrap 3 2013-11-29 14:46:38 -05:00
Gil Rutkowski f6aecd8af9 Removed post-install-cmd php artisan optimize. Causes initial install to fail due to lack of required config (mail.php) 2013-11-29 14:37:44 -05:00
snipe 567f395afa More fixes for #88 2013-11-29 14:37:06 -05:00
snipe 7003eff42c More fixes for #88 2013-11-29 14:36:46 -05:00
snipe d54eb94497 Improved layout 2013-11-29 14:35:24 -05:00
Gil Rutkowski 295cef61df Merge branch 'develop' of github.com:snipe/snipe-it into develop 2013-11-29 12:52:03 -06:00
Gil Rutkowski 8ed5584565 Removed post-install artisan optimize from composer.json — this breaks first time install as a mail config doesn’t exist yet. 2013-11-29 12:42:14 -06:00
snipe e305099b45 Fixed model view 2013-11-29 09:52:51 -05:00
snipe 091de54bab BS3 error validation text 2013-11-29 09:45:30 -05:00
snipe 112d5d5994 Style change - removed underline from header 2013-11-29 09:35:51 -05:00
snipe 428998c6fb Prettier buttons 2013-11-29 09:32:10 -05:00
snipe 56b52392e8 honor user soft-deletes 2013-11-29 09:28:45 -05:00
snipe ddf0997a93 Signin BS3 2013-11-29 09:05:30 -05:00