eeda4366a3
Removed cruft from debugging
2015-08-11 14:32:14 -07:00
88e10516a9
Updated footer links
2015-08-11 14:19:13 -07:00
b3249dcf48
Merge remote-tracking branch 'origin/develop' into 2.0
...
# Conflicts:
# app/controllers/admin/UsersController.php
# app/models/Model.php
# app/views/backend/hardware/edit.blade.php
# app/views/backend/users/index.blade.php
# composer.lock
2015-08-11 13:20:25 -07:00
936d7dab1b
Fixes #1043
2015-08-11 12:36:03 -07:00
3ebbd030e7
Fixed issue with Asset model
2015-08-07 18:52:19 -04:00
7ae226635f
First rough pass at asset acceptance report
2015-08-07 18:50:55 -04:00
84d81184fa
Fixes #1009 - Add MAC address to search
2015-08-06 05:13:27 -07:00
3c0cc94652
Fixed route
...
TODO:
- add modal button
2015-08-06 04:53:23 -07:00
5dcc795aa2
Fixes #1024 - delete option added to user dropdown
2015-08-06 04:33:34 -07:00
106ed6a9a0
Added location to user listing
2015-08-06 03:59:23 -07:00
336858e4ed
Fix #1022 - Missing Lang on viewing deleted user
2015-08-06 09:33:53 +09:30
dc265ba2a8
Fixed back button on user create
2015-08-04 20:48:54 -07:00
449ad4f86b
Fixes #1014 - error if no assets are unaccepted
2015-08-04 13:22:13 -07:00
183f8ae1bf
Merge remote-tracking branch 'origin/develop' into 2.0
...
# Conflicts:
# app/commands/ImportCommand.php
# app/lang/en/admin/users/message.php
# app/lang/en/general.php
2015-08-04 12:51:35 -07:00
cf4f178485
Change to using route in error message
...
When I've broken things and wound up with a 500 error the link back to home
produces a 404 error. I believe its because it uses 'to' instead of 'route' but
I'm not familiar enough with php to be sure of my theory.
2015-08-04 10:40:40 +10:00
03818adc14
Added the new report to the sidebar of reports
2015-08-01 12:23:41 -04:00
b195934a4a
Finished building out the report, and refactoring to make the code more expressive
...
Need to finish writing the code to track threads
2015-08-01 12:20:49 -04:00
3bb296db78
Fixed language string for notes (when the hell did THAT break?)
2015-07-30 15:10:59 -07:00
305c22f72d
Added request to dashboard
2015-07-30 14:59:24 -07:00
9f81792e70
Request button strings
2015-07-30 14:52:55 -07:00
6bc2128c3e
Added requestable button
2015-07-30 14:48:19 -07:00
78835a8b1f
Add requestable as bulk-edit option
2015-07-30 14:32:25 -07:00
5297d699b3
Fix logo url
2015-07-30 18:32:43 +09:30
c1ae844308
Fix #972 - Change back button to work
2015-07-29 10:13:18 +09:30
20eb2df9be
Fix to nicen up the layout for the inline-adding and Bootstrapify it.
2015-07-28 14:25:47 -07:00
1e38ced885
Nicer display of "add new" inline functionality.
...
TODO:
Handle validation failures in a less fugly way
2015-07-28 11:58:45 -07:00
fe2fb63007
Localization strings for inline modals
2015-07-28 11:31:08 -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
a901a648af
Fixes #875 - allow user to decline asset and check asset back in if declined
2015-07-26 22:53:48 -07:00
464c83599b
Nicer validation display on login screen
2015-07-26 22:01:45 -07:00
c78355e39a
Cleaned up login screen layout
2015-07-26 21:58:03 -07:00
4f07818a2d
Only activate "email users" checkbox if there is an email address given for the user
2015-07-26 21:22:09 -07:00
979212b2ed
Sans serif in emails
2015-07-26 21:21:52 -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
2b2e6a8829
Additional localization strings
2015-07-25 00:20:17 -07:00
6dea227c3e
Fixes #851 - bulk user delete
2015-07-24 22:37:15 -07:00
cf3619d766
Fixes #937 - bug in which type of asset
2015-07-24 18:09:11 -07:00
991a364a3d
Updated form to use username
2015-07-24 16:56:31 -07:00
eaf077f807
Fixes #946 - navbar custom color not working in FF
2015-07-24 16:29:54 -07:00
e4bee3d372
Merge pull request #951 from madd15/fixes-1
...
Fix asset view duplicate file uploads and layout
2015-07-24 15:12:04 -07:00
2835905398
Fix dup file uploads and layout
2015-07-24 12:24:10 +09:30
b918ea88cc
Add checkin email template
2015-07-24 10:29:44 +09:30
42e101291e
Add Email on Checkin Field
2015-07-24 10:25:11 +09:30
fd9e8b712b
Add flexibility if values not present
2015-07-24 09:26:34 +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
4f1f21287c
Add Expected Checkin Date
2015-07-23 12:37:45 +09:30
dea23bef45
Add Expected Checkin Date
2015-07-23 11:53:07 +09:30
7afcd09651
Add Expected Checkin Date
2015-07-23 10:07:04 +09:30
e47146faee
Moved link for asset maintenances to the asset menu with the other items related to assets / hardware
2015-07-20 21:35:37 -04:00
snipe