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
379f6bef6c
catergories lang and serveral icons
2015-02-26 23:48:17 +10:30
59ea144b28
Minor UX tweaks
2015-02-26 03:07:19 -08:00
ca1351b704
Switched to all FA
2015-02-25 18:14:51 -08:00
6ab95ff387
Prevent auth changes on demo
2015-02-25 10:37:39 -08:00
4340d50071
Stil allow new user creation
2015-02-24 12:06:00 -08:00
de94311c47
Add ability to prevent passwords from being changed
2015-02-24 11:57:46 -08:00
f6ae35df63
Only show the "email credentials" checkbox if new user
2015-02-18 02:51:41 -08:00
87936a58fa
CSV user import
2015-02-18 02:48:16 -08:00
51a7752771
Moved cancel text to buttons language file
2015-02-06 18:52:09 -08:00
b826673d0d
Added username field for #377
2014-11-20 16:17:48 -05:00
6b2d3efe3e
Fixes #237 - reporting-only group
2014-11-04 18:21:10 -05:00
8d3d8c86b1
A0.4.3 add asset, license, user, model clone and artisan db migration
2014-08-12 17:25:07 +09:00
b1fafa7ca4
Added asset, license, user and model cloning
2014-08-12 13:41:17 +09:00
0dfc9660ca
alpha 0.4.0 release candidate
2014-08-11 17:13:43 +09:00
af083570a0
initial beta .4 draft
2014-08-10 19:09:08 +09:00
cb8369e9de
Initial QA Patch to fix errors
...
Add License
Add Asset
Show Deleted Users
License Assign
2014-08-08 00:03:12 +09:00
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
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
6b5a552d95
Fixed #186 - Bug with select box not retaining selections on edit screen
2014-07-09 03:09:55 -04:00
276b1553c1
Mark required form elements as required
2014-07-08 19:17:31 -04:00
a7b809cb91
Updated title/header for users, additional fixes for #151
2014-07-08 04:39:51 -04:00
af269b536e
Refactored users to use same form for edit/create
2014-07-08 04:35:23 -04:00
8b914102b7
Updated spacing for PSR-2
2014-06-24 17:49:39 -04:00
3e7a9e45d1
Fixes PR #168 and #167
2014-06-23 19:40:09 -04:00
94016678f8
More internationalization per #151
2014-06-09 00:02:31 -04:00
f6717d9f49
Added manager drop down for users, manager name in index
2013-12-12 01:49:38 -05:00
11c657ffa4
Fixes #36
2013-11-29 16:08:18 -05:00
030db6e267
Upgrading to bootstrap 3
...
Ugh.
2013-11-29 04:10:25 -05:00
4142629665
Layout tweaks for mobile - related to #54
2013-11-28 19:22:39 -05:00
8d3d337820
Change input type to email where relevant (better mobile support)
2013-11-27 08:42:31 -05:00
897bc63621
Location drop down to user in views
2013-11-18 09:54:37 -05:00
b554a9f9db
Updated blades with new style buttons
2013-11-18 04:49:54 -05:00
cfb37dcec0
Replaced english text with language reference on buttons
2013-11-17 20:05:12 -05:00
feda21a6e3
Initial laravel import
2013-11-13 01:59:39 -05:00
snipe