madd15
|
7bb9929624
|
Add Notes Lang
|
2015-03-18 16:46:47 +10:30 |
|
madd15
|
25dea384fe
|
Change layout and add notes
|
2015-03-18 16:46:00 +10:30 |
|
madd15
|
ceb93926a3
|
Add notes field
|
2015-03-18 16:44:42 +10:30 |
|
snipe
|
e9a6261752
|
Merge pull request #673 from madd15/patch-1
dataTables Processing and Custom Processing Content
|
2015-03-17 23:00:09 -07:00 |
|
madd15
|
434dbe035c
|
Processing and custom processing content
|
2015-03-18 16:08:02 +10:30 |
|
madd15
|
f5e14e59e9
|
Processing and custom processing content
|
2015-03-18 16:06:54 +10:30 |
|
madd15
|
c8bf26a3b3
|
Fix layout of loading box
|
2015-03-18 16:01:48 +10:30 |
|
snipe
|
139d206413
|
Select specific fields so Chumper has a smaller collection to parse
|
2015-03-17 18:05:01 -07:00 |
|
snipe
|
a341db4cf7
|
Prevent delete when password lock is active
|
2015-03-17 17:29:48 -07:00 |
|
snipe
|
b66f55362f
|
Merge pull request #672 from madd15/patch-1
Change to use eager loaded userloc not assetloc
|
2015-03-17 17:21:34 -07:00 |
|
madd15
|
fdb92a2012
|
Change to use eager loaded userloc not assetloc
|
2015-03-18 10:50:52 +10:30 |
|
snipe
|
b3a75690f1
|
Merge pull request #671 from madd15/assets-deleted
Fix Deleted Assets View
|
2015-03-17 17:18:02 -07:00 |
|
snipe
|
0292a0fee6
|
Checkall
|
2015-03-17 17:07:59 -07:00 |
|
Madd15
|
c14761b9a1
|
Re-fix button not showing
|
2015-03-18 10:27:04 +10:30 |
|
snipe
|
8404736662
|
Added bulk edit button back into table footer
|
2015-03-17 16:52:10 -07:00 |
|
madd15
|
9edcc39de2
|
Fix restore button now showing
|
2015-03-18 10:15:57 +10:30 |
|
madd15
|
1620186f5d
|
Change Deleted to new ?status
|
2015-03-18 10:11:11 +10:30 |
|
snipe
|
94afe20c20
|
Removed throttle eager load, added userlocation
|
2015-03-17 16:36:20 -07:00 |
|
snipe
|
d254f9809f
|
Merge branch 'develop' of github.com:snipe/snipe-it into develop
|
2015-03-17 16:15:38 -07:00 |
|
snipe
|
18209c2448
|
Merge pull request #670 from madd15/patch-1
Fix spacing between Create and Import
|
2015-03-17 16:15:26 -07:00 |
|
snipe
|
519575893d
|
Fix JS modal error
|
2015-03-17 16:14:40 -07:00 |
|
madd15
|
f794218b6f
|
Update buttons to use Lang
|
2015-03-18 09:26:14 +10:30 |
|
madd15
|
4932fe3397
|
Add button current/deleted
|
2015-03-18 09:25:28 +10:30 |
|
madd15
|
4f18a71124
|
Fix space in title
|
2015-03-18 09:20:53 +10:30 |
|
madd15
|
07e9ff4290
|
Add Users
|
2015-03-18 09:19:23 +10:30 |
|
madd15
|
176264b317
|
Fix title for deleted
|
2015-03-18 09:18:42 +10:30 |
|
madd15
|
4c3033d414
|
Fix spacing between Create and Import
|
2015-03-18 09:16:01 +10:30 |
|
snipe
|
61e6d55bcf
|
Merge pull request #669 from madd15/patch-1
Fix scopeGetDeleted - Missing withTrashed()
|
2015-03-17 15:36:51 -07:00 |
|
snipe
|
c00086c740
|
Fix eager loading for user throttle
|
2015-03-17 15:36:11 -07:00 |
|
madd15
|
e01b1b3935
|
Fix scopeGetDeleted - Missing withTrashed()
|
2015-03-18 09:04:51 +10:30 |
|
snipe
|
c2c0196a3d
|
Eager loading managers, licenses
|
2015-03-17 14:58:15 -07:00 |
|
snipe
|
3da652216b
|
Possible fix for #652 - need to test mobile and Cinema display
|
2015-03-16 21:18:32 -07:00 |
|
snipe
|
0ffb5df40b
|
Fixed changelog order
|
2015-03-16 20:22:32 -07:00 |
|
snipe
|
cfc26b283c
|
Updated changelog
|
2015-03-16 20:20:53 -07:00 |
|
snipe
|
41dd7a2b2a
|
Update to Senry 2.1.5 for security vulnerability
|
2015-03-16 18:39:13 -07:00 |
|
snipe
|
c0b61991ba
|
Smaller gap in header
|
2015-03-16 17:49:51 -07:00 |
|
snipe
|
1597461c02
|
More padding by filter
|
2015-03-16 17:42:01 -07:00 |
|
snipe
|
46c1f2a28b
|
Server side datatables for user view - needs fix for deleted users
|
2015-03-16 17:33:41 -07:00 |
|
snipe
|
77fd73bc1b
|
Merge remote-tracking branch 'origin/features/chumper-datatables' into develop
|
2015-03-16 14:49:51 -07:00 |
|
snipe
|
3ad17d64b0
|
Merge branch 'develop' of github.com:snipe/snipe-it into develop
|
2015-03-16 14:49:32 -07:00 |
|
snipe
|
412ec53d08
|
Merge pull request #662 from madd15/features/chumper-datatables
Tweak table to be like others
|
2015-03-16 11:51:18 -07:00 |
|
madd15
|
6f3be59b14
|
Tweak table to be like others
|
2015-03-16 23:21:01 +10:30 |
|
snipe
|
fce4c4dcb1
|
Merge pull request #660 from madd15/patch-1
Fix button layouts
|
2015-03-15 20:13:37 -07:00 |
|
madd15
|
bb7d3d1a85
|
Fix button layouts
|
2015-03-16 09:28:48 +10:30 |
|
snipe
|
ff7499e373
|
Merge pull request #658 from madd15/features/chumper-datatables
Remove Select buttons, Row Select and Add sorting fixes
|
2015-03-14 11:35:04 -07:00 |
|
madd15
|
958a7298fe
|
Fix excludes
|
2015-03-15 03:04:54 +10:30 |
|
madd15
|
69b80dc9c6
|
Fixed Sorting
|
2015-03-15 03:02:58 +10:30 |
|
madd15
|
60531450c8
|
Remove Sorting and default to asset name
Removed sorting on checkbox, in/out and action columns and defaulted
sorting to asset name column
|
2015-03-15 02:40:59 +10:30 |
|
madd15
|
cbfdb88e13
|
Remove Row Select
|
2015-03-15 02:16:06 +10:30 |
|
madd15
|
fcd62d72b1
|
Remove Select buttons and [] that are not required
|
2015-03-15 02:10:41 +10:30 |
|