a365cdc2cc
Switch to new method
2015-08-25 16:34:51 +09:30
899e543173
Switch to new method
2015-08-18 16:12:23 +09:30
567ad6c3bb
Switch to new method
2015-08-18 14:11:03 +09:30
fd9cf29459
Additional changes for search and order functions
2015-08-07 09:44:23 +09:30
032d79593a
quick fix $inout/$action issue
2015-07-30 13:47:43 +09:30
f152841e81
quick fix $inout/$action issue
2015-07-30 13:46:59 +09:30
c513007b36
Add sort to table, missing most columns still
2015-07-30 13:44:32 +09:30
43af451709
Merge pull request #971 from madd15/patch-3
...
Small EOL fix if no value returned
2015-07-28 20:59:42 -07:00
35f97cceb7
Fix missing lists causing modal errors
2015-07-29 10:34:21 +09:30
2507c1aa70
Correct Asset Count
2015-07-29 09:26:44 +09:30
679b9f6def
Small EOL fix
2015-07-28 17:03:39 +09:30
87cd77b4df
Merge remote-tracking branch 'origin/2.0' into bootstrap-table-experiment
...
# Conflicts:
# app/controllers/admin/AssetsController.php
2015-07-27 23:41:22 -07:00
e4ad1011da
Merge pull request #969 from snipe/inline_adding
...
Inline adding of dependent drop-down contents on asset-creation
2015-07-27 23:39:07 -07:00
de8180ec70
Abililty to inline-add things when you are creating a new asset
2015-07-27 23:27:45 -07:00
4a51ff9ba5
Duh
2015-07-27 22:46:13 -07:00
22be076504
More experiments
2015-07-27 22:39:47 -07:00
ae91f829e1
Change to bootstrap table compatable method
2015-07-28 13:50:10 +09:30
9184dd5303
Fix for sad action column with button wrapping
2015-07-27 15:28:41 -07:00
7aba5f3a84
Request #961 - Clone button on license list view
2015-07-28 07:33:51 +09:30
5e7bfe314a
Fix missing ]
2015-07-27 21:20:19 +09:30
a099d16714
Only send email if an email address was given
2015-07-26 22:08:26 -07:00
b32e3a3475
Shwo username instead of email
2015-07-26 21:21:42 -07:00
28304556a9
First pass at this, the ugly way. Just to see wha it looks like.
2015-07-26 18:15:06 -07:00
5701b4d38e
Return accessories as well
2015-07-25 00:05:59 -07:00
23866bce26
Use redirect to route instead of back because POST
2015-07-24 23:08:33 -07:00
0f0dab556d
Fixes #807 - bad link for subfolders
2015-07-24 22:48:29 -07:00
6dea227c3e
Fixes #851 - bulk user delete
2015-07-24 22:37:15 -07:00
59b739c1c4
Fixes #902 - redirect to group listing page after group create
2015-07-24 17:43:33 -07:00
fbb55c14d6
Merge remote-tracking branch 'origin/develop' into 2.0
...
# Conflicts:
# app/controllers/admin/AssetsController.php
2015-07-24 15:56:10 -07:00
00bcae7feb
Add email to postCheckin
2015-07-24 10:24:14 +09:30
6d96d6cba4
Add email to postCheckin
2015-07-24 10:22:54 +09:30
e3f0815012
Add Checkin_email to Create and Edit
2015-07-24 10:21:51 +09:30
d62d6ebf05
Add extra fields for email
2015-07-24 09:28:17 +09:30
e4277b47e8
Add extra fields for email
2015-07-24 09:27:44 +09:30
0de1d45492
Merge pull request #944 from madd15/Feature/Additional-Email-Info
...
WIP - Feature #709/#606 - Additional Email Info / Expected Checkin Date
2015-07-23 16:16:19 -07:00
fdee3ee93e
Merge pull request #933 from madd15/patch-4
...
#916 - Change Userlist identifier from email to username
2015-07-23 16:16:02 -07:00
ef045c61ca
Merge pull request #931 from madd15/patch-3
...
Fix #930 - Add reassignable to create
2015-07-23 16:15:53 -07:00
6d1197a144
Fix edit model cat list showing deleted categories
2015-07-24 08:44:53 +09:30
e455b2af6e
Only update email if password locking isn't set to true
2015-07-23 12:30:44 -07:00
d26c40b26e
Fixed issue where email not saved on edit
2015-07-23 12:28:26 -07:00
8ba55b4bf2
Fix missing checkedout_at
2015-07-23 12:40:22 +09:30
4375d66d09
Add Expected Checkin Date
2015-07-23 10:05:16 +09:30
130a041be0
Added Carbon to the uses statement for reports controller
2015-07-20 21:42:07 -04:00
a7a2f5f974
Minor change to reports controller to include the View facade
2015-07-20 21:41:29 -04:00
d1d6fe26a6
Fixed all issues that were reported by @leobg
...
Also, renamed and fixed items of concern by @snipe
Renamed Improvements to Asset Maintenances
2015-07-20 21:34:19 -04:00
3df0550b19
Built the report and the export for the Improvements report
...
Added the links on the navigation
2015-07-20 21:26:23 -04:00
6eb296303f
Working through attempts to get footer callback working
2015-07-20 21:17:04 -04:00
4c37dcf5bb
Finished off the edit and view pages
2015-07-20 21:16:15 -04:00
2457003deb
Fixed issue found with date being handled incorrectly
...
Updated multiple views to reflect this issue
2015-07-20 21:16:06 -04:00
5ee4eb5871
Update the migration to fix an issue with the improvement_time so it would be an integer
...
Created the view for improvements
Updated messages in language pack for additional items needed
Updated the asset view and supplier view to fix an issue
2015-07-20 21:15:46 -04:00
madd15