Commit Graph

735 Commits

Author SHA1 Message Date
snipe f463cd6c8d Fixes for #759 - location heirarchy 2015-05-04 02:50:42 -07:00
snipe 5e7a4e8193 Fixes #599 - show groups in user list 2015-05-04 01:44:49 -07:00
snipe c8870ddcab Fixes #736 - more fields in bulk edit 2015-05-04 01:30:20 -07:00
snipe bbdbd5397c Check for valid asset before attempting to get name 2015-05-04 00:46:26 -07:00
snipe 527650d03b Merge branch 'patch-5' of https://github.com/DanielNemanic/snipe-it into DanielNemanic-patch-5
# Conflicts:
#	app/views/backend/models/view.blade.php
2015-05-02 12:28:34 -07:00
snipe 77d1d93ebc Fixes #729 - CSS wordwrap for long licenses 2015-04-30 18:17:44 -07:00
snipe 62b5ec5b02 Slack field validation and placeholder text 2015-04-30 16:58:33 -07:00
snipe 9f9a9a51b3 Fixes #774 - layout issue on profiles 2015-04-29 23:21:04 -07:00
snipe 3c00f38a0f Slack integration for asset checkin/checkout 2015-04-29 17:38:22 -07:00
snipe 3b491d4a6b Fixes #757 - use showAssetName method 2015-04-29 16:22:25 -07:00
snipe a0fce2e0fb Fixes #766
Should be refactored to make the Action logger into a base class and to use polymorphic relationships for the IDs, and migrate accessory_id into asset_id in the log table. This was quick and dirty.
2015-04-29 16:14:08 -07:00
snipe bce06543b2 Merge remote-tracking branch 'origin/master' into develop 2015-04-29 15:28:38 -07:00
snipe 9841dbbbc4 Fixed HTML so settings are saved correctly 2015-04-29 15:28:11 -07:00
snipe d61506fcf7 Fixes for #766 - add activity report 2015-04-29 14:50:12 -07:00
madd15 c6419e1c07 Update link to Documentation in footer 2015-04-17 16:01:44 +09:30
Daniel Nemanic fe72139410 Update view.blade.php
Added class="img-responsive" to Model Image on Line 116.
2015-04-15 09:05:02 +02:00
Daniel Nemanic 6f9daa28eb Update view.blade.php
Added {{ Config::get('app.url') }} in Line 116 to avoid no Image in SubFolder. ( http://domain.com/snipe-it/... )
2015-04-15 08:53:50 +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
madd15 2e0fa9126a Add dashboard to side navigation 2015-04-14 10:02:37 +09:30
madd15 1a4f148318 Fix #737 -Only display comma & address2 if not Null 2015-04-10 09:14:59 +09:30
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 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
madd15 9be50152b3 per_page Select drop-down 2015-04-02 11:21:32 +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
madd15 ff23616bb5 Fix #712 - Change RTD to Deployed if checkedout 2015-04-01 09:36:54 +10:30
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 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
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 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