Commit Graph

  • 5f3bc8e74b Update user-profile.css Daniel Nemanic 2015-04-14 15:00:31 +02:00
  • bd3409285f Merge pull request #745 from DanielNemanic/patch-2 snipe 2015-04-14 02:04:48 -07:00
  • 18a3ff67cb Merge pull request #744 from DanielNemanic/patch-1 snipe 2015-04-14 02:04:42 -07:00
  • 61eda122e4 Update print.css Daniel Nemanic 2015-04-14 11:00:09 +02:00
  • 6cb70e865e Update layout.css Daniel Nemanic 2015-04-14 10:56:58 +02:00
  • 4b32c28f7e Merge pull request #741 from madd15/patch-5 snipe 2015-04-13 17:37:39 -07:00
  • f0a9b2c71d Merge pull request #738 from madd15/patch-4 snipe 2015-04-13 17:37:31 -07:00
  • 2e0fa9126a Add dashboard to side navigation madd15 2015-04-14 10:02:37 +09:30
  • 63b1f3834e New language strings snipe 2015-04-13 11:26:02 -07:00
  • 1a4f148318 Fix #737 -Only display comma & address2 if not Null madd15 2015-04-10 09:14:59 +09:30
  • 9de083afa7 Merge pull request #734 from snipe/depreciation_fix2 snipe 2015-04-08 16:41:23 -07:00
  • 551b5c42d8 "Years" turn out to be 12 times longer than months, apparently Brady Wetherington 2015-04-08 16:36:06 -07:00
  • 30966b14af Merge branch 'develop' of github.com:snipe/snipe-it into develop snipe 2015-04-08 16:25:46 -07:00
  • 9bbf933b05 Added missing search string snipe 2015-04-08 16:25:34 -07:00
  • f8143b6c7c Merge pull request #728 from madd15/feature/Group-View snipe 2015-04-06 21:03:59 -07:00
  • efba1b9038 Fix update button to goto right group madd15 2015-04-07 13:31:56 +09:30
  • 80090a41ec Add Group User View Madd15 2015-04-07 13:25:20 +09:30
  • 0cff78d127 Updated language strings snipe 2015-04-02 15:42:58 -07:00
  • e88a81141f Added view link to asset tag, since some assets won't have names snipe 2015-04-02 15:40:41 -07:00
  • c88ce0d14d Fixes for #722 datatables snipe 2015-04-02 14:55:36 -07:00
  • 33e7ce6761 Fixes for #722 localization snipe 2015-04-02 14:28:11 -07:00
  • 766afdeeae Merge pull request #720 from madd15/patch-4 snipe 2015-04-01 17:59:09 -07:00
  • 1edd6d3542 Get default page length and new Length menu madd15 2015-04-02 11:22:33 +10:30
  • 9be50152b3 per_page Select drop-down madd15 2015-04-02 11:21:32 +10:30
  • 7ad6dda260 Merge remote-tracking branch 'origin/develop' snipe 2015-04-01 17:41:21 -07:00
  • e4b45231ec Fix for bad seed data if Jon Doe doesn't get created snipe 2015-04-01 17:22:48 -07:00
  • 6b853750e5 Fix for strict mode app install snipe 2015-04-01 16:34:02 -07:00
  • dc1380edd1 Merge remote-tracking branch 'origin/develop' snipe 2015-04-01 15:48:19 -07:00
  • b53847cb61 Updated language strings snipe 2015-04-01 15:48:02 -07:00
  • 06b465540d Merge remote-tracking branch 'origin/develop' snipe 2015-04-01 15:44:51 -07:00
  • 0a734d8502 Missing semicolons snipe 2015-04-01 15:44:13 -07:00
  • 98eda57188 Merge pull request #719 from madd15/patch-3 snipe 2015-04-01 15:41:47 -07:00
  • 46781c94cd Fix #715 - Missing $modelCheck api call madd15 2015-04-02 09:10:07 +10:30
  • 3a06d8802d Merge remote-tracking branch 'origin/develop' snipe 2015-04-01 15:39:24 -07:00
  • 0e26480674 Merge branch 'develop' of github.com:snipe/snipe-it into develop snipe 2015-04-01 15:32:03 -07:00
  • 92a4f025d8 Fixes #718 - uppercase state/country abbreviations snipe 2015-04-01 15:31:53 -07:00
  • 5529204b17 Merge pull request #713 from madd15/patch-3 snipe 2015-03-31 16:53:49 -07:00
  • da43f44fea Merge pull request #707 from j0k3r/patch-1 snipe 2015-03-31 16:53:40 -07:00
  • ff23616bb5 Fix #712 - Change RTD to Deployed if checkedout madd15 2015-04-01 09:36:54 +10:30
  • de59f654af Merge pull request #711 from madd15/patch-3 snipe 2015-03-31 15:22:44 -07:00
  • 7d9c90f8dd Only pull eula if set to use default in category madd15 2015-04-01 08:51:40 +10:30
  • b0886f970a Fix link to the demo Jeremy 2015-03-29 09:56:04 +02:00
  • afdf00eacb Removed settings save for display fields snipe 2015-03-27 22:34:39 -07:00
  • 51148f1371 Removed additional settings, since all are displayable now snipe 2015-03-27 22:32:38 -07:00
  • d58cc8d490 Herp derp plural snipe 2015-03-27 21:48:47 -07:00
  • 0c827b318b Default location fix snipe 2015-03-27 21:48:04 -07:00
  • 5d946b19cb Fixed checkmodel at route level snipe 2015-03-27 17:44:49 -07:00
  • d2e23adf84 Merge pull request #704 from madd15/patch-3 snipe 2015-03-27 16:10:56 -07:00
  • 7d35fae0f4 Fix processing stuck on exit print view madd15 2015-03-28 09:09:36 +10:30
  • 605d0ed8e1 Moved checkModel into model from controller snipe 2015-03-27 13:45:37 -07:00
  • c92f09fddb Merge pull request #700 from madd15/feat/savestate snipe 2015-03-27 13:33:33 -07:00
  • 2cde817ffb Merge pull request #698 from madd15/patch-2 snipe 2015-03-27 13:33:07 -07:00
  • 87bf51b033 Restore JS changes Madd15 2015-03-27 16:52:40 +10:30
  • 06b3d6e5ce Fix saveState, change chumper defaults Madd15 2015-03-27 16:49:03 +10:30
  • b32379393f Fix missed hardware statuses madd15 2015-03-27 07:50:13 +10:30
  • bbcc8aa9ac Update groups if unlocked snipe 2015-03-25 14:26:12 -07:00
  • 865c302f71 Prevent changing user email/pass/groups if locked snipe 2015-03-25 14:26:00 -07:00
  • 2cf8256079 Merge pull request #693 from madd15/patch-2 snipe 2015-03-25 13:28:44 -07:00
  • e2a2746ed6 Add if locked disable button madd15 2015-03-26 05:54:14 +10:30
  • 6854c568c7 Add if locked disable button madd15 2015-03-26 05:53:58 +10:30
  • d952a1199b Remove forgot password link and fix save icon madd15 2015-03-26 05:39:56 +10:30
  • 7f2ccc860b Remove forgot password link and fix save icon madd15 2015-03-26 05:38:56 +10:30
  • f0d3d1b036 Merge pull request #690 from madd15/patch-2 snipe 2015-03-24 19:34:06 -07:00
  • d9b9224045 Fix mobile unable to click sign in madd15 2015-03-25 13:02:02 +10:30
  • 8685e90513 Merge pull request #689 from madd15/feat/more-tables snipe 2015-03-24 18:45:34 -07:00
  • a9f15fbcae Convert Categories View to use Datatables, and fix Model View missing comma madd15 2015-03-24 11:27:00 +10:30
  • 7d266fdc4e Convert Models View to use Datatables madd15 2015-03-24 11:06:37 +10:30
  • 7f03c7538f Convert Accessories View to use Datatable madd15 2015-03-24 10:31:58 +10:30
  • d90d7d7ddd Only include first 3 columns on exports madd15 2015-03-23 08:37:18 +10:30
  • 7881e70afb Update Model Check in Hardware Edit and move to API madd15 2015-03-23 08:30:50 +10:30
  • e61f254ffc Update datatable options madd15 2015-03-21 21:30:09 +10:30
  • 678b7700b4 Add use Datatable madd15 2015-03-20 17:02:33 +10:30
  • 1d1c14ae21 Add use Datatable madd15 2015-03-20 17:01:31 +10:30
  • 66d1872230 Fix button spacing madd15 2015-03-20 16:05:56 +10:30
  • faa999ab2b Fix incorrect values madd15 2015-03-20 16:01:30 +10:30
  • 6678905d79 Remove width from actions madd15 2015-03-20 15:57:43 +10:30
  • 3e98f05564 Convert Models and Categories Index to use Datatables madd15 2015-03-20 15:39:46 +10:30
  • 35bbea3052 Fixes #688 - show model if no asset name snipe 2015-03-24 17:08:15 -07:00
  • 86623822f5 Trying to fix the build snipe 2015-03-23 10:37:55 -07:00
  • ad1a9396ac Merge pull request #684 from madd15/patch-1 snipe 2015-03-23 10:13:41 -07:00
  • 2c6597c5fb Add deleted_at to select array for datatable madd15 2015-03-23 18:17:41 +10:30
  • da983af2cb Fix #683 - Use sAjaxSource, change to processing madd15 2015-03-21 21:22:23 +10:30
  • c79fd5ed30 Fix showAll on Print madd15 2015-03-21 17:52:15 +10:30
  • 2d9e49f245 Fix #682 - Updated buttons and data loading madd15 2015-03-21 17:46:05 +10:30
  • 75d5f494a3 Bypass site name validation if locked snipe 2015-03-20 15:08:10 -07:00
  • 40852f9a6a Update to settings edit snipe 2015-03-20 15:00:05 -07:00
  • 7f07f35beb Updated language strings snipe 2015-03-20 14:56:12 -07:00
  • c6be6f480e Disable editing title when locked snipe 2015-03-20 14:56:03 -07:00
  • 617cc67467 Added Thai language files snipe 2015-03-20 14:31:31 -07:00
  • 0c9bc4e59e Added link to Common Issues and Getting Help pages snipe 2015-03-20 14:24:23 -07:00
  • 72048a5267 Updated default mail server to mailchimp snipe 2015-03-20 14:24:04 -07:00
  • 80d2347095 Better label layout snipe 2015-03-20 12:38:39 -07:00
  • fa794d7a15 Basic QR code printing snipe 2015-03-19 18:06:50 -07:00
  • 85b6571bc3 Merge pull request #680 from madd15/features/api snipe 2015-03-19 00:40:28 -07:00
  • 14aa12eb09 Add Licenses API madd15 2015-03-19 16:53:43 +10:30
  • 8af799614e Update for dataTables madd15 2015-03-19 16:52:52 +10:30
  • f9e0add436 Change to Datatable madd15 2015-03-19 16:52:07 +10:30
  • 3782531f57 Fix missing </div> madd15 2015-03-19 16:13:14 +10:30
  • fab313a908 Conform API madd15 2015-03-19 16:10:29 +10:30
  • 4e70cfdb95 Conform API madd15 2015-03-19 16:10:02 +10:30