 snipe
|
a5b2dbfaf0
|
Merge remote-tracking branch 'origin/develop'
v1.2.9
|
2015-07-23 12:33:26 -07:00 |
|
|
snipe
|
e455b2af6e
|
Only update email if password locking isn't set to true
|
2015-07-23 12:30:44 -07:00 |
|
|
snipe
|
d26c40b26e
|
Fixed issue where email not saved on edit
|
2015-07-23 12:28:26 -07:00 |
|
|
snipe
|
abb970fe39
|
Merge remote-tracking branch 'origin/develop'
|
2015-07-17 16:25:55 -07:00 |
|
|
snipe
|
f8ecbed829
|
Added purchase date to importer
|
2015-07-17 16:25:20 -07:00 |
|
|
snipe
|
9ac093e0be
|
Merge remote-tracking branch 'origin/develop'
|
2015-07-17 14:18:20 -07:00 |
|
|
snipe
|
38c9d8d6ca
|
Added notes/order number to asset view
|
2015-07-17 14:18:08 -07:00 |
|
|
snipe
|
4557502b1d
|
Added notes/order number to controller
|
2015-07-17 14:15:08 -07:00 |
|
|
snipe
|
b85d972488
|
Added mod rewrite to force SSL
|
2015-07-16 20:32:10 -07:00 |
|
|
snipe
|
61e16a4668
|
Merge remote-tracking branch 'origin/develop'
|
2015-07-16 16:25:15 -07:00 |
|
|
snipe
|
e447159d4a
|
Added checks for missing fields, added email column, asset notes
|
2015-07-16 16:23:35 -07:00 |
|
|
snipe
|
b191406a0c
|
Ignore couscous
|
2015-07-16 14:58:22 -07:00 |
|
|
snipe
|
dacbdd9aa5
|
Delete book.json
|
2015-07-10 19:46:17 -07:00 |
|
|
snipe
|
e1eb2da5f3
|
Create book.json
|
2015-07-09 13:32:26 -07:00 |
|
|
snipe
|
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 |
|
|
snipe
|
9936cf4a43
|
Better production default for #903
|
2015-07-09 00:53:58 -07:00 |
|
|
snipe
|
e9443a244c
|
Small fix to config value
|
2015-07-09 00:52:05 -07:00 |
|
|
snipe
|
f8be47dfbf
|
Fixes #903 - adds config variable for multi_login, overrides Sentry method
|
2015-07-09 00:41:46 -07:00 |
|
|
snipe
|
c2d63915c3
|
Fixed insecure font call
|
2015-07-08 17:48:59 -07:00 |
|
|
snipe
|
fd59ca0802
|
Fixed spacing
|
2015-07-08 17:33:51 -07:00 |
|
|
snipe
|
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 |
|
|
snipe
|
05f0b94bf6
|
Fixed language string
|
2015-07-08 13:05:17 -07:00 |
|
|
snipe
|
f54c86db87
|
Command line asset importer
|
2015-07-08 13:05:05 -07:00 |
|
|
madd15
|
a22687abc5
|
Fix #896 - Only show Checkout/Checkin if deployable
|
2015-07-07 14:38:28 +09:30 |
|
|
snipe
|
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 |
|
|
madd15
|
61836f20c5
|
Clear Mac Address on Clone
|
2015-07-07 08:23:51 +09:30 |
|
|
madd15
|
62d382d704
|
Remove serial and assigned_to when cloning asset
|
2015-07-07 08:19:58 +09:30 |
|
|
snipe
|
3746bc333b
|
Better checking for model name and category name
|
2015-07-06 14:12:49 -07:00 |
|
|
snipe
|
ccde517c88
|
Use showAssetName to get asset name
|
2015-07-06 14:10:24 -07:00 |
|
|
snipe
|
f855bfd4ef
|
Better error checking for eol data
|
2015-07-06 14:09:48 -07:00 |
|
|
snipe
|
1601bdd4eb
|
Added rtd_location_id back into selected columns
|
2015-07-02 16:52:08 -07:00 |
|
|
snipe
|
552bdfdc2d
|
Switched defaultLoc to belongsTo relationship
|
2015-07-02 16:51:52 -07:00 |
|
|
snipe
|
1d4cfcfd58
|
Only save uploaded logo if not in demo mode
|
2015-06-30 22:38:40 -07:00 |
|
|
snipe
|
6915987239
|
Added demo language string
|
2015-06-30 22:38:19 -07:00 |
|
|
snipe
|
3a44a7e8bb
|
Disable logo upload for demo
|
2015-06-30 22:38:12 -07:00 |
|
|
snipe
|
f2abbd0e8f
|
Deny editing users on demo
|
2015-06-30 22:10:23 -07:00 |
|
|
snipe
|
62f8d002e3
|
Temp commented out some stuff
|
2015-06-30 22:05:21 -07:00 |
|
|
snipe
|
0766ae2d17
|
Disallow group edit for demo
|
2015-06-30 22:04:48 -07:00 |
|
|
snipe
|
95920be8ea
|
Fixed weird commenting
|
2015-06-30 22:04:05 -07:00 |
|
|
snipe
|
588ff742fe
|
Add manufacturer to models listing for clarity
|
2015-06-30 19:15:43 -07:00 |
|
|
snipe
|
5084836737
|
Merge pull request #861 from strand/patch-1
Update Code of Conduct to Contributor Covenant 1.1.0
v1.2.8
|
2015-06-19 09:16:08 -07:00 |
|
|
Strand McCutchen
|
063e3bbea6
|
Update Code of Conduct to Contributor Covenant 1.1.0
|
2015-06-19 10:15:05 -06:00 |
|
|
snipe
|
c3c4e9def2
|
Fixes #852 - localized string for file types, added zip and rar for asset upload
|
2015-06-16 12:54:53 -07:00 |
|
|
snipe
|
7820efc121
|
Fixes #822 and #847 - added notes field on import for MySQL strict mode
|
2015-06-15 11:20:09 -07:00 |
|
|
snipe
|
5a6fe6ccf8
|
Fixes #806
|
2015-06-09 02:20:00 -07:00 |
|
|
snipe
|
c69038d3ae
|
Fixes #836
|
2015-06-09 02:00:55 -07:00 |
|
|
snipe
|
5939e46eee
|
Bumped version for fixed 1.2.7
|
2015-06-01 17:52:03 -07:00 |
|
|
snipe
|
a8a0a59982
|
Fixes #825 - title bar spacing issue
|
2015-06-01 17:51:20 -07:00 |
|
|
snipe
|
73a08c031c
|
Fixes #818, and randomizes password for dummy user
v1.2.7-master
|
2015-05-27 11:45:44 -07:00 |
|
|
snipe
|
c77e7bf725
|
Merge pull request #816 from tomcastleman/develop
Reassignable should default to true on create form
|
2015-05-24 10:49:41 -07:00 |
|