Commit Graph

1782 Commits

Author SHA1 Message Date
snipe bd3409285f Merge pull request #745 from DanielNemanic/patch-2
Update print.css
2015-04-14 02:04:48 -07:00
snipe 18a3ff67cb Merge pull request #744 from DanielNemanic/patch-1
Update layout.css
2015-04-14 02:04:42 -07:00
Daniel Nemanic 61eda122e4 Update print.css
Added @media print for printing and .table-responsive {overflow: hidden;} to avoid table scrollbars.
2015-04-14 11:00:09 +02:00
Daniel Nemanic 6cb70e865e Update layout.css
To avoid screen resolution errors on printing, added the @media attribute.
2015-04-14 10:56:58 +02:00
snipe 4b32c28f7e Merge pull request #741 from madd15/patch-5
Add dashboard to side navigation
2015-04-13 17:37:39 -07:00
snipe f0a9b2c71d Merge pull request #738 from madd15/patch-4
Fix #737 -Only display comma & address2 if not empty
2015-04-13 17:37:31 -07:00
madd15 2e0fa9126a Add dashboard to side navigation 2015-04-14 10:02:37 +09:30
snipe 63b1f3834e New language strings 2015-04-13 11:26:02 -07:00
madd15 1a4f148318 Fix #737 -Only display comma & address2 if not Null 2015-04-10 09:14:59 +09:30
snipe 9de083afa7 Merge pull request #734 from snipe/depreciation_fix2
Fix to issue with depreciation not returning correct value
2015-04-08 16:41:23 -07:00
Brady Wetherington 551b5c42d8 "Years" turn out to be 12 times longer than months, apparently 2015-04-08 16:36:06 -07:00
snipe 30966b14af Merge branch 'develop' of github.com:snipe/snipe-it into develop 2015-04-08 16:25:46 -07:00
snipe 9bbf933b05 Added missing search string 2015-04-08 16:25:34 -07:00
snipe f8143b6c7c Merge pull request #728 from madd15/feature/Group-View
Fix #723 - Add view to list users of group
2015-04-06 21:03:59 -07:00
madd15 efba1b9038 Fix update button to goto right group 2015-04-07 13:31:56 +09:30
Madd15 80090a41ec Add Group User View 2015-04-07 13:25:20 +09:30
snipe 0cff78d127 Updated language strings 2015-04-02 15:42:58 -07:00
snipe e88a81141f Added view link to asset tag, since some assets won't have names 2015-04-02 15:40:41 -07:00
snipe c88ce0d14d Fixes for #722 datatables 2015-04-02 14:55:36 -07:00
snipe 33e7ce6761 Fixes for #722 localization 2015-04-02 14:28:11 -07:00
snipe 766afdeeae Merge pull request #720 from madd15/patch-4
Fix #716 - Default page length, settings per page change
2015-04-01 17:59:09 -07:00
madd15 1edd6d3542 Get default page length and new Length menu 2015-04-02 11:22:33 +10:30
madd15 9be50152b3 per_page Select drop-down 2015-04-02 11:21:32 +10:30
snipe e4b45231ec Fix for bad seed data if Jon Doe doesn't get created 2015-04-01 17:22:48 -07:00
snipe 6b853750e5 Fix for strict mode app install 2015-04-01 16:34:02 -07:00
snipe b53847cb61 Updated language strings 2015-04-01 15:48:02 -07:00
snipe 0a734d8502 Missing semicolons 2015-04-01 15:44:13 -07:00
snipe 98eda57188 Merge pull request #719 from madd15/patch-3
Fix #715 - Missing $modelCheck api call
2015-04-01 15:41:47 -07:00
madd15 46781c94cd Fix #715 - Missing $modelCheck api call 2015-04-02 09:10:07 +10:30
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
snipe 5529204b17 Merge pull request #713 from madd15/patch-3
Fix #712 - Change RTD to Deployed if checkedout
2015-03-31 16:53:49 -07:00
snipe da43f44fea Merge pull request #707 from j0k3r/patch-1
Fix link to the demo
2015-03-31 16:53:40 -07:00
madd15 ff23616bb5 Fix #712 - Change RTD to Deployed if checkedout 2015-04-01 09:36:54 +10:30
snipe de59f654af Merge pull request #711 from madd15/patch-3
Fix #710 - Only pull eula if set to use default in category
2015-03-31 15:22:44 -07:00
madd15 7d9c90f8dd Only pull eula if set to use default in category 2015-04-01 08:51:40 +10:30
Jeremy b0886f970a Fix link to the demo 2015-03-29 09:56:04 +02:00
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 d2e23adf84 Merge pull request #704 from madd15/patch-3
Fix processing stuck on exit print view
2015-03-27 16:10:56 -07:00
madd15 7d35fae0f4 Fix processing stuck on exit print view 2015-03-28 09:09:36 +10:30
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
snipe 2cde817ffb Merge pull request #698 from madd15/patch-2
Fix missed hardware statuses
2015-03-27 13:33:07 -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