Commit Graph

1517 Commits

Author SHA1 Message Date
snipe 61b04d6e40 Fixes #579 - user cannot accept more than once 2015-03-01 16:35:32 -08:00
snipe 3263543d84 Added language string for already accepted 2015-03-01 15:33:07 -08:00
snipe 9ea4386354 Set default debug to false for production config 2015-03-01 15:17:23 -08:00
snipe ac23e8fd02 Removed line 2015-03-01 15:16:38 -08:00
snipe 6bb3f222ea Hash version for settings page 2015-02-28 15:21:44 -08:00
snipe d7b7a3a4a8 Better version output 2015-02-28 15:18:31 -08:00
snipe 4502582beb Trying to fix pre-commit hook :( 2015-02-28 15:06:31 -08:00
snipe 9355fcb58f Testing auto-versioning 2015-02-28 15:04:40 -08:00
snipe c6f23e7b27 Bumped version 2015-02-28 14:59:43 -08:00
snipe b986b3276c Dynamic version number on settings and footer 2015-02-28 14:59:03 -08:00
snipe 3e3935485f Set version config 2015-02-28 14:44:30 -08:00
snipe 7047af44f6 Fixed layout for remember me button 2015-02-28 13:30:14 -08:00
snipe 2d5e9b6ea5 Removed dummy text 2015-02-28 13:11:05 -08:00
snipe 33a709ecbc Merge remote-tracking branch 'origin/develop' v1.2.6 2015-02-28 12:27:45 -08:00
snipe 9b42d3a4fc Bumped version number 2015-02-28 12:27:22 -08:00
snipe c598e3d9c0 Merge remote-tracking branch 'origin/develop' 2015-02-27 21:07:45 -08:00
snipe c822fff714 New language strings 2015-02-27 21:07:17 -08:00
snipe c881535fda Updated language strings 2015-02-27 13:32:53 -08:00
snipe 715fc3fa9b Bumped version for release v1.2.6-beta 2015-02-26 19:17:06 -08:00
snipe c484afb12b Fixed typo for accessories accept 2015-02-26 18:58:08 -08:00
snipe 5ec91ef5fc Removed test url 2015-02-26 18:56:30 -08:00
snipe 30db9a2943 Unified asset/accessory acceptance 2015-02-26 18:42:39 -08:00
snipe 1273c4ca87 EULA/req improvements 2015-02-26 18:20:52 -08:00
snipe cb73d81d5b Smaller buttons 2015-02-26 17:23:03 -08:00
snipe 04735f1aff Fixed assetlog display 2015-02-26 17:04:21 -08:00
snipe d33dcbbcb1 Fixed bad method call in accessories on delete 2015-02-26 16:17:25 -08:00
snipe 04401ca09f Merge remote-tracking branch 'origin/develop' 2015-02-26 16:14:11 -08:00
snipe 0ff23c422a Better language strings 2015-02-26 16:13:47 -08:00
snipe 74a7b304c2 Limit categories to accessory categories 2015-02-26 16:09:40 -08:00
snipe 231e465898 Added category types to view 2015-02-26 16:00:52 -08:00
snipe 68c3e88343 Few more error icons 2015-02-26 15:52:38 -08:00
snipe ef6eae63d8 Fixed error icon 2015-02-26 15:50:33 -08:00
snipe afe2eb736c Added category type 2015-02-26 15:48:44 -08:00
snipe 1552c1e917 Accessories log (not reporting correctly yet) 2015-02-26 15:25:48 -08:00
snipe 258d1cd705 Removed extra table columns 2015-02-26 15:25:33 -08:00
snipe d7b4e8a8de Removed cruft from checkin form 2015-02-26 15:25:21 -08:00
snipe c0c563b1c7 Fixes accessory relationshop for pivot 2015-02-26 15:25:08 -08:00
snipe 430b8233ed Fixed user relationship 2015-02-26 15:24:51 -08:00
snipe 47f1488acc Get the accessory pivot ID 2015-02-26 15:24:41 -08:00
snipe 21799cca6d User acceptance for accessories 2015-02-26 15:24:23 -08:00
snipe e7ae4bd1c4 Merge pull request #574 from madd15/patch-3
Remove unused trashedAssets()
2015-02-26 14:21:05 -08:00
snipe 7da6ba5f68 Merge pull request #575 from madd15/patch-4
Reduces Queries on Model Index View
2015-02-26 14:20:22 -08:00
madd15 8e9f7965c7 Reduces Queries on Model Index View 2015-02-27 08:44:41 +10:30
madd15 4ef2dd0c7e Remove unused trashedAssets() 2015-02-27 08:42:53 +10:30
snipe 19ad8970d7 Fixed arrow icon 2015-02-26 14:08:42 -08:00
snipe a20e1f6943 Fixed attach to relation 2015-02-26 14:08:31 -08:00
snipe 5010720a97 Fixed accessory relationship 2015-02-26 14:07:52 -08:00
snipe efaf067b94 Fixed user relationship 2015-02-26 14:07:39 -08:00
snipe 6efd268004 Disable checkouts if there are none left 2015-02-26 13:28:08 -08:00
snipe 7f26f01a8f Merge pull request #573 from madd15/models
Force Model Restore before Asset Restore
2015-02-26 13:06:15 -08:00