Commit Graph

1701 Commits

Author SHA1 Message Date
snipe 7f07f35beb Updated language strings 2015-03-20 14:56:12 -07:00
snipe c6be6f480e Disable editing title when locked 2015-03-20 14:56:03 -07:00
snipe 617cc67467 Added Thai language files 2015-03-20 14:31:31 -07:00
snipe 0c9bc4e59e Added link to Common Issues and Getting Help pages 2015-03-20 14:24:23 -07:00
snipe 72048a5267 Updated default mail server to mailchimp 2015-03-20 14:24:04 -07:00
snipe 80d2347095 Better label layout 2015-03-20 12:38:39 -07:00
snipe fa794d7a15 Basic QR code printing 2015-03-19 18:06:50 -07:00
snipe 85b6571bc3 Merge pull request #680 from madd15/features/api
Accessories and Licenses API
2015-03-19 00:40:28 -07:00
madd15 14aa12eb09 Add Licenses API 2015-03-19 16:53:43 +10:30
madd15 8af799614e Update for dataTables 2015-03-19 16:52:52 +10:30
madd15 f9e0add436 Change to Datatable 2015-03-19 16:52:07 +10:30
madd15 3782531f57 Fix missing </div> 2015-03-19 16:13:14 +10:30
madd15 fab313a908 Conform API 2015-03-19 16:10:29 +10:30
madd15 4e70cfdb95 Conform API 2015-03-19 16:10:02 +10:30
madd15 75bbbcb4ca Change to Datatable 2015-03-19 16:09:26 +10:30
madd15 abf91c7b29 Update for dataTables 2015-03-19 16:08:38 +10:30
madd15 603fccb26c Update Routes for API 2015-03-19 16:07:38 +10:30
snipe 333d858f33 Merge pull request #679 from madd15/feature/dynamic-mac-address
jQuery Mac Address Field
2015-03-18 18:11:26 -07:00
madd15 c9628722cb Add check/model route 2015-03-19 11:31:01 +10:30
madd15 e56ccb0c82 Add jQuery for mac address field 2015-03-19 09:46:31 +10:30
madd15 61d916d94d Update for dynamic mac address field 2015-03-19 09:43:34 +10:30
snipe 7e573c73f9 Merge pull request #674 from madd15/patch-2
Add #665 - User Notes Field - Fixed Error on user creation
2015-03-17 23:48:33 -07:00
madd15 4aa4e7c9fc Fix error if user is not in throttle table 2015-03-18 17:11:34 +10:30
madd15 161d72390b Update edit for notes field 2015-03-18 16:50:15 +10:30
madd15 53ab21b016 Migration to add notes field to users 2015-03-18 16:47:52 +10:30
madd15 7bb9929624 Add Notes Lang 2015-03-18 16:46:47 +10:30
madd15 25dea384fe Change layout and add notes 2015-03-18 16:46:00 +10:30
madd15 ceb93926a3 Add notes field 2015-03-18 16:44:42 +10:30
snipe e9a6261752 Merge pull request #673 from madd15/patch-1
dataTables Processing and Custom Processing Content
2015-03-17 23:00:09 -07:00
madd15 434dbe035c Processing and custom processing content 2015-03-18 16:08:02 +10:30
madd15 f5e14e59e9 Processing and custom processing content 2015-03-18 16:06:54 +10:30
madd15 c8bf26a3b3 Fix layout of loading box 2015-03-18 16:01:48 +10:30
snipe 139d206413 Select specific fields so Chumper has a smaller collection to parse 2015-03-17 18:05:01 -07:00
snipe a341db4cf7 Prevent delete when password lock is active 2015-03-17 17:29:48 -07:00
snipe b66f55362f Merge pull request #672 from madd15/patch-1
Change to use eager loaded userloc not assetloc
2015-03-17 17:21:34 -07:00
madd15 fdb92a2012 Change to use eager loaded userloc not assetloc 2015-03-18 10:50:52 +10:30
snipe b3a75690f1 Merge pull request #671 from madd15/assets-deleted
Fix Deleted Assets View
2015-03-17 17:18:02 -07:00
snipe 0292a0fee6 Checkall 2015-03-17 17:07:59 -07:00
Madd15 c14761b9a1 Re-fix button not showing 2015-03-18 10:27:04 +10:30
snipe 8404736662 Added bulk edit button back into table footer 2015-03-17 16:52:10 -07:00
madd15 9edcc39de2 Fix restore button now showing 2015-03-18 10:15:57 +10:30
madd15 1620186f5d Change Deleted to new ?status 2015-03-18 10:11:11 +10:30
snipe 94afe20c20 Removed throttle eager load, added userlocation 2015-03-17 16:36:20 -07:00
snipe d254f9809f Merge branch 'develop' of github.com:snipe/snipe-it into develop 2015-03-17 16:15:38 -07:00
snipe 18209c2448 Merge pull request #670 from madd15/patch-1
Fix spacing between Create and Import
2015-03-17 16:15:26 -07:00
snipe 519575893d Fix JS modal error 2015-03-17 16:14:40 -07:00
madd15 f794218b6f Update buttons to use Lang 2015-03-18 09:26:14 +10:30
madd15 4932fe3397 Add button current/deleted 2015-03-18 09:25:28 +10:30
madd15 4f18a71124 Fix space in title 2015-03-18 09:20:53 +10:30
madd15 07e9ff4290 Add Users 2015-03-18 09:19:23 +10:30