Commit Graph

1295 Commits

Author SHA1 Message Date
snipe 0e26480674 Merge branch 'develop' of github.com:snipe/snipe-it into develop 2015-04-01 15:32:03 -07:00
snipe 92a4f025d8 Fixes #718 - uppercase state/country abbreviations 2015-04-01 15:31:53 -07:00
madd15 ff23616bb5 Fix #712 - Change RTD to Deployed if checkedout 2015-04-01 09:36:54 +10:30
madd15 7d9c90f8dd Only pull eula if set to use default in category 2015-04-01 08:51:40 +10:30
snipe afdf00eacb Removed settings save for display fields 2015-03-27 22:34:39 -07:00
snipe 51148f1371 Removed additional settings, since all are displayable now 2015-03-27 22:32:38 -07:00
snipe d58cc8d490 Herp derp plural 2015-03-27 21:48:47 -07:00
snipe 0c827b318b Default location fix 2015-03-27 21:48:04 -07:00
snipe 5d946b19cb Fixed checkmodel at route level 2015-03-27 17:44:49 -07:00
snipe 605d0ed8e1 Moved checkModel into model from controller 2015-03-27 13:45:37 -07:00
snipe c92f09fddb Merge pull request #700 from madd15/feat/savestate
Fix saveState, change chumper defaults
2015-03-27 13:33:33 -07:00
Madd15 87bf51b033 Restore JS changes 2015-03-27 16:52:40 +10:30
Madd15 06b3d6e5ce Fix saveState, change chumper defaults
Hopefully this will fix the saveState issues
2015-03-27 16:49:03 +10:30
madd15 b32379393f Fix missed hardware statuses 2015-03-27 07:50:13 +10:30
snipe bbcc8aa9ac Update groups if unlocked 2015-03-25 14:26:12 -07:00
snipe 865c302f71 Prevent changing user email/pass/groups if locked 2015-03-25 14:26:00 -07:00
madd15 e2a2746ed6 Add if locked disable button 2015-03-26 05:54:14 +10:30
madd15 6854c568c7 Add if locked disable button 2015-03-26 05:53:58 +10:30
madd15 d952a1199b Remove forgot password link and fix save icon 2015-03-26 05:39:56 +10:30
madd15 7f2ccc860b Remove forgot password link and fix save icon 2015-03-26 05:38:56 +10:30
madd15 d9b9224045 Fix mobile unable to click sign in 2015-03-25 13:02:02 +10:30
snipe 8685e90513 Merge pull request #689 from madd15/feat/more-tables
Convert to Datatables - Models, Categories and Accessories
2015-03-24 18:45:34 -07:00
madd15 a9f15fbcae Convert Categories View to use Datatables, and fix Model View missing comma 2015-03-25 12:03:49 +10:30
madd15 7d266fdc4e Convert Models View to use Datatables 2015-03-25 12:03:48 +10:30
madd15 7f03c7538f Convert Accessories View to use Datatable 2015-03-25 12:03:47 +10:30
madd15 d90d7d7ddd Only include first 3 columns on exports 2015-03-25 12:03:46 +10:30
madd15 7881e70afb Update Model Check in Hardware Edit and move to API 2015-03-25 12:03:45 +10:30
madd15 e61f254ffc Update datatable options 2015-03-25 12:03:44 +10:30
madd15 678b7700b4 Add use Datatable 2015-03-25 12:03:44 +10:30
madd15 1d1c14ae21 Add use Datatable 2015-03-25 12:03:43 +10:30
madd15 66d1872230 Fix button spacing 2015-03-25 12:03:42 +10:30
madd15 faa999ab2b Fix incorrect values 2015-03-25 12:03:41 +10:30
madd15 6678905d79 Remove width from actions 2015-03-25 12:03:40 +10:30
madd15 3e98f05564 Convert Models and Categories Index to use Datatables 2015-03-25 12:02:32 +10:30
snipe 35bbea3052 Fixes #688 - show model if no asset name 2015-03-24 17:08:15 -07:00
madd15 2c6597c5fb Add deleted_at to select array for datatable 2015-03-23 18:17:41 +10:30
madd15 da983af2cb Fix #683 - Use sAjaxSource, change to processing 2015-03-21 21:22:23 +10:30
madd15 c79fd5ed30 Fix showAll on Print 2015-03-21 17:52:15 +10:30
madd15 2d9e49f245 Fix #682 - Updated buttons and data loading
*Buttons show now only show what is visible (this means the checkbox, checkin and actions for now)
*Changed from setUrl to ajax for loading the data
2015-03-21 17:46:05 +10:30
snipe 75d5f494a3 Bypass site name validation if locked 2015-03-20 15:08:10 -07:00
snipe 40852f9a6a Update to settings edit 2015-03-20 15:00:05 -07:00
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
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