67e0e14a12
License importer, small fixes for asset imporer
2015-08-14 14:18:51 -07:00
85a64f9dfd
Merge remote-tracking branch 'origin/develop'
2015-08-06 04:00:46 -07:00
106ed6a9a0
Added location to user listing
2015-08-06 03:59:23 -07:00
56f490cef9
Merge pull request #1029 from madd15/patch-4
...
Fix #1022 - Missing Lang on viewing deleted user
2015-08-05 18:06:17 -07:00
336858e4ed
Fix #1022 - Missing Lang on viewing deleted user
2015-08-06 09:33:53 +09:30
fda6d60225
Merge pull request #1011 from goetzk/route-not-to
...
Change to using route in error message
2015-08-04 12:46:31 -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
e63a07800f
Merge pull request #994 from madd15/patch-4
...
Fix logo url
2015-08-02 11:05:07 -07:00
5297d699b3
Fix logo url
2015-07-30 18:32:43 +09:30
a28481cd8f
Merge remote-tracking branch 'origin/develop'
2015-07-27 23:10:40 -07:00
5455abfd16
Fix for importer
2015-07-27 23:10:03 -07:00
3460016c94
Another small readme tweak
2015-07-27 17:04:15 -07:00
e49c33b56b
Minor documentation updates
2015-07-27 17:02:55 -07:00
8b101b10ec
Updated language files
2015-07-27 10:25:35 -07:00
a5b2dbfaf0
Merge remote-tracking branch 'origin/develop'
2015-07-23 12:33:26 -07:00
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
abb970fe39
Merge remote-tracking branch 'origin/develop'
2015-07-17 16:25:55 -07:00
f8ecbed829
Added purchase date to importer
2015-07-17 16:25:20 -07:00
9ac093e0be
Merge remote-tracking branch 'origin/develop'
2015-07-17 14:18:20 -07:00
38c9d8d6ca
Added notes/order number to asset view
2015-07-17 14:18:08 -07:00
4557502b1d
Added notes/order number to controller
2015-07-17 14:15:08 -07:00
b85d972488
Added mod rewrite to force SSL
2015-07-16 20:32:10 -07:00
61e16a4668
Merge remote-tracking branch 'origin/develop'
2015-07-16 16:25:15 -07:00
e447159d4a
Added checks for missing fields, added email column, asset notes
2015-07-16 16:23:35 -07:00
b191406a0c
Ignore couscous
2015-07-16 14:58:22 -07:00
dacbdd9aa5
Delete book.json
2015-07-10 19:46:17 -07:00
e1eb2da5f3
Create book.json
2015-07-09 13:32:26 -07:00
f5d4eb5842
Merge pull request #897 from madd15/patch-2
...
Fix #896 - Only show Checkout/Checkin if deployable
2015-07-09 01:19:57 -07:00
9936cf4a43
Better production default for #903
2015-07-09 00:53:58 -07:00
e9443a244c
Small fix to config value
2015-07-09 00:52:05 -07:00
f8be47dfbf
Fixes #903 - adds config variable for multi_login, overrides Sentry method
2015-07-09 00:41:46 -07:00
c2d63915c3
Fixed insecure font call
2015-07-08 17:48:59 -07:00
fd59ca0802
Fixed spacing
2015-07-08 17:33:51 -07:00
de23ec5785
Fixes #544 - disable checking an asset out to a user if it is not a deployable status
2015-07-08 17:18:46 -07:00
05f0b94bf6
Fixed language string
2015-07-08 13:05:17 -07:00
f54c86db87
Command line asset importer
2015-07-08 13:05:05 -07:00
a22687abc5
Fix #896 - Only show Checkout/Checkin if deployable
2015-07-07 14:38:28 +09:30
82892a38b8
Merge pull request #891 from madd15/patch-3
...
Fix #873 - Remove serial, assigned_to & macaddress when cloning asset
2015-07-06 16:50:58 -07:00
61836f20c5
Clear Mac Address on Clone
2015-07-07 08:23:51 +09:30
62d382d704
Remove serial and assigned_to when cloning asset
2015-07-07 08:19:58 +09:30
3746bc333b
Better checking for model name and category name
2015-07-06 14:12:49 -07:00
ccde517c88
Use showAssetName to get asset name
2015-07-06 14:10:24 -07:00
f855bfd4ef
Better error checking for eol data
2015-07-06 14:09:48 -07:00
1601bdd4eb
Added rtd_location_id back into selected columns
2015-07-02 16:52:08 -07:00
552bdfdc2d
Switched defaultLoc to belongsTo relationship
2015-07-02 16:51:52 -07:00
1d4cfcfd58
Only save uploaded logo if not in demo mode
2015-06-30 22:38:40 -07:00
6915987239
Added demo language string
2015-06-30 22:38:19 -07:00
3a44a7e8bb
Disable logo upload for demo
2015-06-30 22:38:12 -07:00
f2abbd0e8f
Deny editing users on demo
2015-06-30 22:10:23 -07:00
snipe