Commit Graph

2210 Commits

Author SHA1 Message Date
snipe 480fd78c51 Disllow delete if parent 2015-07-28 20:45:32 -07:00
snipe 0c9018289b Fixes #970 2015-07-28 20:24:58 -07:00
snipe 65bf156da1 Better spacing for modal for elements 2015-07-28 18:40:06 -07:00
snipe a8624a736d Merge pull request #983 from madd15/patch-1
Fix #972 - Change back button to work
2015-07-28 17:59:59 -07:00
madd15 c1ae844308 Fix #972 - Change back button to work 2015-07-29 10:13:18 +09:30
snipe bb450e6bb6 Merge pull request #980 from snipe/inline_layout_fix
Fix to nicen up the layout for the inline-adding and Bootstrapify it.
2015-07-28 14:39:12 -07:00
Brady Wetherington 20eb2df9be Fix to nicen up the layout for the inline-adding and Bootstrapify it. 2015-07-28 14:25:47 -07:00
snipe 1e38ced885 Nicer display of "add new" inline functionality.
TODO:

Handle validation failures in a less fugly way
2015-07-28 11:58:45 -07:00
snipe fe2fb63007 Localization strings for inline modals 2015-07-28 11:31:08 -07:00
snipe b79841d481 Fix for @uberbrady's missing route on inline adding 2015-07-28 11:18:18 -07:00
snipe e4ad1011da Merge pull request #969 from snipe/inline_adding
Inline adding of dependent drop-down contents on asset-creation
2015-07-27 23:39:07 -07:00
Brady Wetherington de8180ec70 Abililty to inline-add things when you are creating a new asset 2015-07-27 23:27:45 -07:00
snipe 80145c699e One more because I have teh dumb and cannot brain today 2015-07-27 18:18:41 -07:00
snipe f99cafc101 Fix for 0000-00-00 purchase date 2015-07-27 17:16:28 -07:00
snipe 4014f5e15b Bug in purchase date 2015-07-27 17:11:46 -07:00
snipe fdb31ac19e Small tweaks to import script 2015-07-27 16:50:14 -07:00
snipe 9184dd5303 Fix for sad action column with button wrapping 2015-07-27 15:28:41 -07:00
snipe 26e081a2cb Fixes #909 again, because math is super hard 2015-07-27 15:26:53 -07:00
snipe 66a198a175 Merge pull request #966 from madd15/patch-2
Request #961 - Clone button on license list view
2015-07-27 15:07:52 -07:00
madd15 7aba5f3a84 Request #961 - Clone button on license list view 2015-07-28 07:33:51 +09:30
snipe 8d48fddac4 Merge pull request #956 from madd15/patch-1
Fix missing ]
2015-07-27 10:27:53 -07:00
snipe 8b5de894df Updated language files 2015-07-27 10:24:21 -07:00
snipe 5781a01311 Added English, Indonesian 2015-07-27 10:24:08 -07:00
snipe de1adf227b New language files 2015-07-27 10:18:40 -07:00
madd15 5e7bfe314a Fix missing ] 2015-07-27 21:20:19 +09:30
snipe 08ce08db62 Missing language strings for accept/decline 2015-07-26 23:01:31 -07:00
snipe 56504e07c9 More consistent language 2015-07-26 22:55:09 -07:00
snipe a901a648af Fixes #875 - allow user to decline asset and check asset back in if declined 2015-07-26 22:53:48 -07:00
snipe a099d16714 Only send email if an email address was given 2015-07-26 22:08:26 -07:00
snipe 464c83599b Nicer validation display on login screen 2015-07-26 22:01:45 -07:00
snipe c78355e39a Cleaned up login screen layout 2015-07-26 21:58:03 -07:00
snipe bc7c456f99 Added decline route 2015-07-26 21:22:28 -07:00
snipe 4f07818a2d Only activate "email users" checkbox if there is an email address given for the user 2015-07-26 21:22:09 -07:00
snipe 979212b2ed Sans serif in emails 2015-07-26 21:21:52 -07:00
snipe b32e3a3475 Shwo username instead of email 2015-07-26 21:21:42 -07:00
snipe 67e18cb110 Updates for switch to username 2015-07-26 19:56:03 -07:00
Brady Wetherington 28304556a9 First pass at this, the ugly way. Just to see wha it looks like. 2015-07-26 18:15:06 -07:00
snipe 6a5777816c Pulled extra route resources that weren't being used 2015-07-26 17:51:18 -07:00
snipe 2b2e6a8829 Additional localization strings 2015-07-25 00:20:17 -07:00
snipe 5701b4d38e Return accessories as well 2015-07-25 00:05:59 -07:00
snipe 23866bce26 Use redirect to route instead of back because POST 2015-07-24 23:08:33 -07:00
snipe ac5dd0dbf9 Remove unique constraint on email 2015-07-24 23:05:11 -07:00
snipe 0f0dab556d Fixes #807 - bad link for subfolders 2015-07-24 22:48:29 -07:00
snipe 6dea227c3e Fixes #851 - bulk user delete 2015-07-24 22:37:15 -07:00
snipe cf3619d766 Fixes #937 - bug in which type of asset 2015-07-24 18:09:11 -07:00
snipe 59b739c1c4 Fixes #902 - redirect to group listing page after group create 2015-07-24 17:43:33 -07:00
snipe 59963b88f5 Fixes #941 - looser restrictions on alpha_space custom validator 2015-07-24 17:29:47 -07:00
snipe 7d67b6a9ae Fixed forgotten password 2015-07-24 17:16:50 -07:00
snipe e944b2d1c3 Fixed blade path 2015-07-24 16:56:55 -07:00
snipe 442db4b5c8 Removed duplicate routes from previous merge 2015-07-24 16:56:44 -07:00