Commit graph

10943 commits

Author SHA1 Message Date
snipe c5b24c83df Updated app config for 5.3
THIS WILL BREAK ON UPGRADE RIGHT NOW.

I need to more gracefully handle the switch between mcrypt and the new cipher
2016-12-14 04:33:27 -08:00
snipe f6e567d5d4 Updated dependencies for 5.3 2016-12-14 04:32:34 -08:00
snipe b83f73f7d6 Updated providers for 5.3 2016-12-14 04:32:24 -08:00
snipe 8ca5c6c25e Moved routes to new new routes files for 5.3 2016-12-14 04:32:10 -08:00
snipe f0dd4c5a97 Remove middleware for checking for maintenance
This is (mostly) a built-in feature in Laravel 5.3
2016-12-14 04:31:19 -08:00
snipe 65db55908a Rename to AuthController to LoginController 2016-12-14 04:30:56 -08:00
snipe 93ba90e837 Merge remote-tracking branch 'origin/develop' 2016-12-12 19:24:00 -08:00
snipe dd28c5709e Add action=“” to form (possible IE11 fix) 2016-12-12 19:23:41 -08:00
snipe fc70d79a17 Merge remote-tracking branch 'origin/develop' 2016-12-12 19:07:07 -08:00
snipe 42fe481f71 Bumped hash 2016-12-12 19:06:36 -08:00
snipe 95f1a98b96 Removed extraneous closing label tags 2016-12-12 19:03:45 -08:00
snipe 6f1e0d6d9f Updated readme with security notice 2016-12-12 19:03:12 -08:00
snipe ae66bba0f1 Fixes #3015 - increase size of state field in suppliers 2016-12-07 17:50:20 -08:00
snipe 32c5a258a7 Updated hash 2016-12-07 17:14:48 -08:00
snipe e7ac860f77 Supress error if pagination isn’t set up on the server 2016-12-07 17:07:48 -08:00
snipe 899a991a3b Added package.json 2016-12-07 17:07:07 -08:00
snipe f26d86dff2 Updated gulpfile 2016-12-07 17:06:48 -08:00
snipe 84317f7f50 Fixes #2990 - disabled autocomplete on login 2016-12-06 11:50:20 -08:00
snipe 65016a2383 Merge remote-tracking branch 'origin/develop' 2016-12-05 16:12:41 -08:00
snipe eb48e5ed1c Bumped hash 2016-12-05 16:12:05 -08:00
snipe dbcb2ccb46 Merge remote-tracking branch 'origin/develop' 2016-12-05 15:09:49 -08:00
Daniel Meltzer 927a12f78d Fix #2985. Missed in the field rename (#3014) 2016-12-05 15:09:14 -08:00
Brady Wetherington dd52b4828c Make .gitignore and .gitkeep files permissions match their directories (#3018) 2016-12-05 15:08:37 -08:00
snipe 6273e313bc Set DB_SSL to false for config 2016-12-03 17:33:36 -08:00
snipe 2afcfcc87c Set DB_SSL to false for config 2016-12-03 17:32:44 -08:00
snipe 1afef9416a Merge remote-tracking branch 'origin/develop'
# Conflicts:
#	config/version.php
2016-12-03 17:15:02 -08:00
snipe 77685fd52b Bumped version 2016-12-03 17:13:09 -08:00
snipe f532abebd4 Updated translations 2016-12-03 17:10:05 -08:00
Brady Wetherington 6f9a82f4ea On a succesful LDAP user-creation, we should return the $user, not (#3008)
just 'true'.
2016-12-01 15:54:13 -08:00
snipe 4049143ebf Bumped version 2016-12-01 06:11:03 -08:00
snipe 4df53bdf8d Merge remote-tracking branch 'origin/develop'
# Conflicts:
#	config/version.php
#	resources/views/account/view-assets.blade.php
2016-12-01 06:10:50 -08:00
snipe d49a1ea304 More graceful error message if log doesn’t exist 2016-12-01 06:05:14 -08:00
snipe 521f4facd5 Bumped version 2016-12-01 05:56:24 -08:00
snipe b4653dfc15 Ignore npm log 2016-12-01 05:55:29 -08:00
snipe 659d9c10ca Bumped hash 2016-12-01 05:54:21 -08:00
snipe 2ab0594530 Prevent errors if company support conflict prevents viewing the item 2016-12-01 05:54:14 -08:00
snipe 8a81b29901 Fixed missing closing angle bracket 2016-12-01 05:53:20 -08:00
snipe 93d9a6e4bb Ignore npm log 2016-12-01 05:52:50 -08:00
snipe 99e79a02d6 Revert "Halp! Stuck in pre-commit loop hell. :("
This reverts commit 47c77fe042.
2016-12-01 03:08:14 -08:00
snipe 47c77fe042 Halp! Stuck in pre-commit loop hell. :( 2016-12-01 03:07:47 -08:00
snipe e42da293ee Updated version for pre-release 2016-12-01 03:07:21 -08:00
snipe a2ffe77d55 Automatically updated version hash 2016-12-01 03:07:12 -08:00
snipe a7a9f027fb Automatically updated version hash 2016-12-01 03:00:18 -08:00
snipe e587b2dcee Automatically updated version hash 2016-12-01 03:00:02 -08:00
snipe c3b4342df4 Automatically updated version hash 2016-12-01 02:59:17 -08:00
snipe 5a7ea0e908 Updated hash 2016-12-01 02:59:11 -08:00
snipe 59617cc7d3 Updated version in settings 2016-12-01 02:57:47 -08:00
snipe 1be22cf051 Improved versioning script 2016-12-01 02:53:41 -08:00
snipe e62f3f9fb4 Bumped hash 2016-12-01 02:27:12 -08:00
snipe 7ccef51a4f Removed some dumb comments 2016-12-01 02:25:53 -08:00