Commit Graph

113 Commits

Author SHA1 Message Date
snipe 04735f1aff Fixed assetlog display 2015-02-26 17:04:21 -08:00
snipe 1552c1e917 Accessories log (not reporting correctly yet) 2015-02-26 15:25:48 -08:00
snipe 31df29cac8 Fixed funky layout from datatables 2015-02-26 13:05:10 -08:00
snipe 3e189d3502 Fixes #538 - sortable tables 2015-02-26 12:59:40 -08:00
snipe 97d97fc4df Merge branch 'develop' of github.com:snipe/snipe-it into develop
Conflicts:
	app/views/backend/categories/edit.blade.php
	app/views/backend/depreciations/edit.blade.php
	app/views/backend/groups/create.blade.php
	app/views/backend/groups/edit.blade.php
	app/views/backend/hardware/bulk.blade.php
	app/views/backend/hardware/checkin.blade.php
	app/views/backend/hardware/checkout.blade.php
	app/views/backend/hardware/edit.blade.php
	app/views/backend/licenses/checkin.blade.php
	app/views/backend/licenses/checkout.blade.php
	app/views/backend/licenses/edit.blade.php
	app/views/backend/locations/edit.blade.php
	app/views/backend/manufacturers/edit.blade.php
	app/views/backend/models/edit.blade.php
	app/views/backend/statuslabels/edit.blade.php
	app/views/backend/suppliers/edit.blade.php
	app/views/frontend/account/change-email.blade.php
	app/views/frontend/account/change-password.blade.php
	app/views/frontend/account/profile.blade.php
	app/views/frontend/auth/forgot-password-confirm.blade.php
	app/views/frontend/auth/signin.blade.php
2015-02-26 10:26:04 -08:00
madd15 88ce0abe85 more icons 2015-02-27 01:32:24 +10:30
madd15 379f6bef6c catergories lang and serveral icons 2015-02-26 23:48:17 +10:30
snipe 59ea144b28 Minor UX tweaks 2015-02-26 03:07:19 -08:00
snipe 29863004e2 more small mobile fixes 2015-02-25 20:01:36 -08:00
snipe ca1351b704 Switched to all FA 2015-02-25 18:14:51 -08:00
snipe 2b83b52735 Disallow delete if lock_passwords is true 2015-02-25 10:49:03 -08:00
snipe 6ab95ff387 Prevent auth changes on demo 2015-02-25 10:37:39 -08:00
snipe 4340d50071 Stil allow new user creation 2015-02-24 12:06:00 -08:00
snipe de94311c47 Add ability to prevent passwords from being changed 2015-02-24 11:57:46 -08:00
snipe e04ac89c5a Added expiring warrantee alerts 2015-02-24 02:07:33 -08:00
snipe 01f11f2da4 Updated text 2015-02-18 02:56:01 -08:00
snipe f6ae35df63 Only show the "email credentials" checkbox if new user 2015-02-18 02:51:41 -08:00
snipe 87936a58fa CSV user import 2015-02-18 02:48:16 -08:00
snipe c26369f8cc Added spacing between buttons 2015-02-11 21:21:19 -08:00
snipe 51a7752771 Moved cancel text to buttons language file 2015-02-06 18:52:09 -08:00
snipe e22ce0d377 Changes added_on to created_at 2015-02-06 18:43:04 -08:00
snipe daefc86e58 Formattig fixes for #386 2014-11-21 06:10:30 -05:00
snipe b826673d0d Added username field for #377 2014-11-20 16:17:48 -05:00
snipe 02feb69d5d Localization on user's view page, new strings 2014-11-12 16:22:30 -05:00
snipe 6b2d3efe3e Fixes #237 - reporting-only group 2014-11-04 18:21:10 -05:00
snipe 1078dbf5c5 Fixes #324 2014-11-03 02:39:11 -05:00
madd15 0b4c1b8d83 Feature Avatars
Appropriate changes to views and controllers
User Avatar Migration
Add intervention/image
2014-10-29 14:18:54 +10:30
snipe bf1e075551 Fixes #87 - made datatables responsive 2014-10-16 17:46:47 -04:00
snipe cd4e994ef5 Removed erronerous "All the users!" text 2014-08-15 19:27:35 -04:00
snipe 4365659a2c Removed IDE files 2014-08-13 15:45:29 -04:00
Cordeos Team 8d3d8c86b1 A0.4.3 add asset, license, user, model clone and artisan db migration 2014-08-12 17:25:07 +09:00
Cordeos Team b1fafa7ca4 Added asset, license, user and model cloning 2014-08-12 13:41:17 +09:00
Cordeos Team 0dfc9660ca alpha 0.4.0 release candidate 2014-08-11 17:13:43 +09:00
Cordeos Team af083570a0 initial beta .4 draft 2014-08-10 19:09:08 +09:00
Cordeos Team 87c2a4c9c0 initial commit 2014-08-10 16:42:40 +09:00
root cb8369e9de Initial QA Patch to fix errors
Add License
Add Asset
Show Deleted Users
License Assign
2014-08-08 00:03:12 +09:00
root 6c5bbec44e Changes:
Updated user create to make LOCATION required - same as user edit
Own account password change updated to require only 6-12 characters
2014-08-05 14:56:37 +09:00
root d71a02982d Changes:
set new user create to active YES as default
Changed user password validation to 6-12 characters
Licenses controller removed asset_id from the INSERT column list
2014-08-05 13:36:47 +09:00
root b8a4c7e4d6 Initial COMMIT to set the file modified tracking. No changes made. 2014-08-05 13:22:08 +09:00
snipe 89000440f3 Added admin ability to unsuspend locked accounts #changelog 2014-07-16 18:21:22 -04:00
snipe 6b5a552d95 Fixed #186 - Bug with select box not retaining selections on edit screen 2014-07-09 03:09:55 -04:00
snipe 276b1553c1 Mark required form elements as required 2014-07-08 19:17:31 -04:00
snipe 5266d9a30a Fixed title tag for user list view 2014-07-08 05:38:07 -04:00
snipe 6068a940bd Added employee number to user view, per #183 2014-07-08 04:44:36 -04:00
snipe a7b809cb91 Updated title/header for users, additional fixes for #151 2014-07-08 04:39:51 -04:00
snipe af269b536e Refactored users to use same form for edit/create 2014-07-08 04:35:23 -04:00
leostat a170efae27 fix for #167 2014-06-26 11:10:13 +01:00
leostat 919119c5b9 Sanatise fullname class #167 2014-06-26 10:45:31 +01:00
snipe 8b914102b7 Updated spacing for PSR-2 2014-06-24 17:49:39 -04:00
snipe 77f4848d6e Missed a few 2014-06-24 17:45:21 -04:00