Commit Graph

1908 Commits

Author SHA1 Message Date
snipe df59e7f699 New strings 2015-06-19 11:44:19 -07:00
snipe d0216d76f8 Updated to generic strings 2015-06-18 15:00:41 -07:00
snipe ec10526d69 Center envelope in user listing 2015-06-18 15:00:32 -07:00
snipe 49b746a811 QTY strings 2015-06-18 15:00:23 -07:00
snipe 1013580236 Fixed typo 2015-06-18 15:00:16 -07:00
snipe 98d9a2e6f9 Bold current page number 2015-06-18 14:36:32 -07:00
snipe e4217af1ec Minified 2015-06-18 14:36:23 -07:00
snipe 3d4607ebd3 Fixes #858 - find admin group by name instead of ID for consideration of clustered DBs 2015-06-17 17:16:05 -07:00
snipe 2be1d64de3 Merge remote-tracking branch 'origin/develop' into 1.3.0 2015-06-16 12:56:14 -07: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 16ec68e0b6 Hide email icon if no email address is provided 2015-06-16 01:45:34 -07:00
snipe 3ce9500d75 Moved password up with other required fields 2015-06-16 00:20:43 -07:00
snipe c699452473 Bumped version 2015-06-15 18:39:42 -07:00
snipe d943408f44 Location and email not required, username required 2015-06-15 18:39:34 -07:00
snipe a7aee2fe1c Location no longer required for users 2015-06-15 18:39:02 -07:00
snipe 32f3740eda Update email for #165 to reflect username 2015-06-15 18:38:52 -07:00
snipe f42540fedf More fixes for #165 - added username field 2015-06-15 12:40:27 -07:00
snipe f25b90ee27 Set https as default app url 2015-06-15 12:39:43 -07:00
snipe fdef266089 Addresses #577 and fixes #165 - switch from email to username 2015-06-15 12:16:39 -07:00
snipe c4375f9fbc Merge remote-tracking branch 'origin/develop' into 1.3.0
# Conflicts:
#	app/controllers/admin/UsersController.php
2015-06-15 11:30:40 -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 d0189fb076 Added consumables to user matrix for #782 2015-06-09 20:05:24 -07:00
snipe e4517a8782 Removed checkin for #782, since that doesn't exist in consumables 2015-06-09 19:58:22 -07:00
snipe 19604480bb Consumables section
TODO:

- Add checkout to location
- Drop Checkin (doesn't really exist in this context)
- Add missing strings - consolidate where possible. Lots of dupes :-/
2015-06-09 19:50:34 -07:00
snipe 704d66b6f3 Raw DB migration for nullable user notes 2015-06-09 17:45:11 -07:00
snipe 6315c343a7 Add consumables table 2015-06-09 17:44:59 -07:00
snipe 766b4b901f Fixes #822 - make user notes field nullable default null 2015-06-09 17:34:52 -07:00
snipe f671c89b14 Composer update for bin path 2015-06-09 17:31:28 -07:00
snipe 03bd1498e8 Added codeception 2015-06-09 16:52:08 -07:00
snipe f743bacd0f Updated language strings 2015-06-09 16:14:37 -07:00
snipe 309158352e Added Korean translation 2015-06-09 16:14:28 -07:00
snipe 2540ac09ec Fixes #822 2015-06-09 16:02:10 -07:00
snipe 5a6fe6ccf8 Fixes #806 2015-06-09 02:20:00 -07:00
snipe af2decea9d Merge remote-tracking branch 'origin/master' into 1.3.0
# Conflicts:
#	app/controllers/admin/AssetsController.php
2015-06-09 02:10:29 -07:00
snipe c69038d3ae Fixes #836 2015-06-09 02:00:55 -07:00
snipe 9ea8316d74 Merge remote-tracking branch 'origin/develop' into 1.3.0
# Conflicts:
#	app/config/version.php
2015-06-01 17:52:39 -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 123caf42c2 Merge remote-tracking branch 'origin/develop' into 1.3.0
# Conflicts:
#	app/views/backend/hardware/labels.blade.php
#	app/views/backend/layouts/default.blade.php
2015-05-27 11:17:14 -07:00
snipe 5997dd9387 Missing string for action 2015-05-27 11:13:42 -07:00
snipe 9cf03e2e60 Better escaping on activity report page 2015-05-27 10:16:06 -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
Tom Castleman 7a4299c724 Reassignable should default to true on create form 2015-05-24 13:35:28 +01:00
snipe b9b0239837 Merge pull request #813 from tomcastleman/develop-1
Update develop following PR #809
2015-05-22 11:51:50 -07:00
snipe a43ae71afd Merge pull request #812 from tomcastleman/develop
Reassignable License Setting
2015-05-22 11:50:44 -07:00
Tom Castleman c4339a5d94 Merge branch 'master' into develop
* master:
  Removed debugbar:publish
2015-05-22 14:37:01 +01:00
Tom Castleman b161a38e9b Add licenses.reassignable migration
Implement licenses.reassignable

View edit for licenses.reassignable

Add licenses.reassignable to LicensesController

Disable Check In when !license->reassignable

Validate license check-in post
2015-05-22 14:11:36 +01:00
snipe 735268034d Merge pull request #809 from tomcastleman/patch-1
Removed debugbar:publish
2015-05-21 18:56:49 -07:00
snipe aad473486f Merge pull request #798 from DanielNemanic/patch-8
Generating Asset Name to Label Print
2015-05-21 18:56:36 -07:00