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
bce06543b2
Merge remote-tracking branch 'origin/master' into develop
2015-04-29 15:28:38 -07:00
9841dbbbc4
Fixed HTML so settings are saved correctly
2015-04-29 15:28:11 -07:00
d61506fcf7
Fixes for #766 - add activity report
2015-04-29 14:50:12 -07:00
6a7fcd5c40
Fixes #769 - set sort order for Accessory Category
2015-04-29 13:54:54 -07:00
b4b273fc43
Fixed typo
2015-04-28 16:42:08 -07:00
1c2e5ecc0f
Remove space after concat to fix SQL FUNCTION CONCAT NOT EXIST error
2015-04-28 15:19:00 +08:00
c6419e1c07
Update link to Documentation in footer
2015-04-17 16:01:44 +09:30
ba58e718b4
Resolved some deps from vendor changes
2015-04-16 22:18:35 -07:00
30c8fffa0a
Loading string
2015-04-15 09:51:48 -07:00
fe72139410
Update view.blade.php
...
Added class="img-responsive" to Model Image on Line 116.
2015-04-15 09:05:02 +02:00
4b32c28f7e
Merge pull request #741 from madd15/patch-5
...
Add dashboard to side navigation
2015-04-13 17:37:39 -07:00
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
2e0fa9126a
Add dashboard to side navigation
2015-04-14 10:02:37 +09:30
63b1f3834e
New language strings
2015-04-13 11:26:02 -07:00
1a4f148318
Fix #737 -Only display comma & address2 if not Null
2015-04-10 09:14:59 +09:30
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
551b5c42d8
"Years" turn out to be 12 times longer than months, apparently
2015-04-08 16:36:06 -07:00
30966b14af
Merge branch 'develop' of github.com:snipe/snipe-it into develop
2015-04-08 16:25:46 -07:00
9bbf933b05
Added missing search string
2015-04-08 16:25:34 -07:00
efba1b9038
Fix update button to goto right group
2015-04-07 13:31:56 +09:30
80090a41ec
Add Group User View
2015-04-07 13:25:20 +09:30
0cff78d127
Updated language strings
2015-04-02 15:42:58 -07:00
e88a81141f
Added view link to asset tag, since some assets won't have names
2015-04-02 15:40:41 -07:00
c88ce0d14d
Fixes for #722 datatables
2015-04-02 14:55:36 -07:00
33e7ce6761
Fixes for #722 localization
2015-04-02 14:28:11 -07:00
1edd6d3542
Get default page length and new Length menu
2015-04-02 11:22:33 +10:30
9be50152b3
per_page Select drop-down
2015-04-02 11:21:32 +10:30
e4b45231ec
Fix for bad seed data if Jon Doe doesn't get created
2015-04-01 17:22:48 -07:00
6b853750e5
Fix for strict mode app install
2015-04-01 16:34:02 -07:00
b53847cb61
Updated language strings
2015-04-01 15:48:02 -07:00
0a734d8502
Missing semicolons
2015-04-01 15:44:13 -07:00
46781c94cd
Fix #715 - Missing $modelCheck api call
2015-04-02 09:10:07 +10:30
0e26480674
Merge branch 'develop' of github.com:snipe/snipe-it into develop
2015-04-01 15:32:03 -07:00
92a4f025d8
Fixes #718 - uppercase state/country abbreviations
2015-04-01 15:31:53 -07:00
ff23616bb5
Fix #712 - Change RTD to Deployed if checkedout
2015-04-01 09:36:54 +10:30
7d9c90f8dd
Only pull eula if set to use default in category
2015-04-01 08:51:40 +10:30
afdf00eacb
Removed settings save for display fields
2015-03-27 22:34:39 -07:00
51148f1371
Removed additional settings, since all are displayable now
2015-03-27 22:32:38 -07:00
d58cc8d490
Herp derp plural
2015-03-27 21:48:47 -07:00
0c827b318b
Default location fix
2015-03-27 21:48:04 -07:00
5d946b19cb
Fixed checkmodel at route level
2015-03-27 17:44:49 -07:00
605d0ed8e1
Moved checkModel into model from controller
2015-03-27 13:45:37 -07:00
c92f09fddb
Merge pull request #700 from madd15/feat/savestate
...
Fix saveState, change chumper defaults
2015-03-27 13:33:33 -07:00
87bf51b033
Restore JS changes
2015-03-27 16:52:40 +10:30
06b3d6e5ce
Fix saveState, change chumper defaults
...
Hopefully this will fix the saveState issues
2015-03-27 16:49:03 +10:30
b32379393f
Fix missed hardware statuses
2015-03-27 07:50:13 +10:30
bbcc8aa9ac
Update groups if unlocked
2015-03-25 14:26:12 -07:00
865c302f71
Prevent changing user email/pass/groups if locked
2015-03-25 14:26:00 -07:00
e2a2746ed6
Add if locked disable button
2015-03-26 05:54:14 +10:30
snipe