Commit Graph

182 Commits

Author SHA1 Message Date
Aladin Alaily 0b5f83fc56 add a drop down of locations 2015-08-21 10:39:45 -04:00
snipe aae7d4523f Don't need to float left there 2015-08-17 10:11:03 -07:00
snipe f7cc9036ea Added password generator to user creation 2015-08-17 10:06:37 -07:00
snipe 7dd50eddfa Nicer error messages on validation fail for LDAP 2015-08-14 22:57:32 -07:00
snipe 676bedc9be LDAP UI language strings 2015-08-14 20:15:24 -07:00
snipe 260abfc2d7 Only show LDAP stuff if the LDAP config has been set up in the config 2015-08-14 19:40:17 -07:00
Aladin Alaily 470b543910 Updated the view to match the controller 2015-08-14 00:17:50 -04:00
Aladin Alaily 1343c09cd7 Made the user interface a little more neat. 2015-08-13 15:05:15 -04:00
Aladin Alaily 34b14f67c6 Fixed the formatting 2015-08-13 13:39:31 -04:00
Aladin Alaily d780f0f3cf Added some space between the Import and LDAP buttons 2015-08-13 13:32:19 -04:00
Aladin Alaily a531ea34bb Cleaned up the code 2015-08-13 13:27:24 -04:00
Aladin Alaily aa72b9c107 Added a button to the LDAP functionality 2015-08-13 13:27:05 -04:00
Aladin Alaily b2c2c1ee15 LDAP Sync 2015-08-13 13:14:11 -04:00
snipe b3249dcf48 Merge remote-tracking branch 'origin/develop' into 2.0
# Conflicts:
#	app/controllers/admin/UsersController.php
#	app/models/Model.php
#	app/views/backend/hardware/edit.blade.php
#	app/views/backend/users/index.blade.php
#	composer.lock
2015-08-11 13:20:25 -07:00
snipe 3c0cc94652 Fixed route
TODO:

- add modal button
2015-08-06 04:53:23 -07:00
snipe 5dcc795aa2 Fixes #1024 - delete option added to user dropdown 2015-08-06 04:33:34 -07:00
snipe 106ed6a9a0 Added location to user listing 2015-08-06 03:59:23 -07:00
madd15 336858e4ed Fix #1022 - Missing Lang on viewing deleted user 2015-08-06 09:33:53 +09:30
snipe dc265ba2a8 Fixed back button on user create 2015-08-04 20:48:54 -07:00
snipe 3bb296db78 Fixed language string for notes (when the hell did THAT break?) 2015-07-30 15:10:59 -07:00
snipe 4f07818a2d Only activate "email users" checkbox if there is an email address given for the user 2015-07-26 21:22:09 -07:00
snipe 2b2e6a8829 Additional localization strings 2015-07-25 00:20:17 -07:00
snipe 6dea227c3e Fixes #851 - bulk user delete 2015-07-24 22:37:15 -07:00
snipe cf3619d766 Fixes #937 - bug in which type of asset 2015-07-24 18:09:11 -07:00
madd15 ba94a57e08 Adjust Manager and Location width 2015-07-16 10:26:53 +09:30
madd15 616af831a7 Add title and content to delete modal 2015-07-10 09:54:14 +09:30
madd15 1e730078c1 Add file uploads to Users 2015-07-10 09:23:34 +09:30
snipe 16b49c25e1 Bringing back the spinner on processing screen 2015-07-09 03:56:18 -07:00
snipe c61adc7041 Partial fix for #851 datatables. Because clear error reporting is apparently for suckers 2015-07-09 03:20:57 -07:00
snipe 6524ac3678 Beginning of #851 - no controller methods yet, but still troubleshooting stupid datatables errors.
[Error] TypeError: undefined is not an object (evaluating 'f.nTf=a[b].cell')
	jb (jquery.dataTables.min.js, line 24)
	ga (jquery.dataTables.min.js, line 45)
	(anonymous function) (jquery.dataTables.min.js, line 92)
	each (jquery-latest.js, line 383)
	each (jquery-latest.js, line 136)
	o (jquery.dataTables.min.js, line 82)
	(anonymous function) (users, line 371)
	fire (jquery-latest.js, line 3119)
	fireWith (jquery-latest.js, line 3231)
	ready (jquery-latest.js, line 3443)
	completed (jquery-latest.js, line 3474)
2015-07-09 03:09:18 -07:00
snipe edfa064fd4 Disable emailing imported users if demo mode 2015-06-23 18:38:21 -07:00
snipe bf3cb73070 Include location ID on user import 2015-06-23 15:05:11 -07:00
snipe d77e763f86 Change badge to label 2015-06-23 15:04:35 -07:00
snipe 5266c22890 Show consumable checkout date 2015-06-23 14:10:04 -07:00
snipe 39a3b93537 Pagination on user history 2015-06-23 14:01:48 -07:00
snipe ba13101f64 Bad data language string 2015-06-23 13:48:56 -07:00
snipe 28a9f90a72 Lazy eager load history for optimized queries 2015-06-23 13:44:49 -07:00
snipe f2a2ccdab4 Nicer display for profile 2015-06-23 12:59:55 -07:00
snipe 3ce9500d75 Moved password up with other required fields 2015-06-16 00:20:43 -07:00
snipe a7aee2fe1c Location no longer required for users 2015-06-15 18:39:02 -07:00
snipe f42540fedf More fixes for #165 - added username field 2015-06-15 12:40:27 -07:00
snipe d0189fb076 Added consumables to user matrix for #782 2015-06-09 20:05:24 -07:00
snipe 68d8b10b22 Changed text to icons for more compacted view 2015-05-04 13:31:38 -07:00
snipe 5e7a4e8193 Fixes #599 - show groups in user list 2015-05-04 01:44:49 -07:00
snipe 9f9a9a51b3 Fixes #774 - layout issue on profiles 2015-04-29 23:21:04 -07:00
snipe 92a4f025d8 Fixes #718 - uppercase state/country abbreviations 2015-04-01 15:31:53 -07:00
Madd15 06b3d6e5ce Fix saveState, change chumper defaults
Hopefully this will fix the saveState issues
2015-03-27 16:49:03 +10:30
madd15 3782531f57 Fix missing </div> 2015-03-19 16:13:14 +10:30
madd15 fab313a908 Conform API 2015-03-19 16:10:29 +10:30
madd15 25dea384fe Change layout and add notes 2015-03-18 16:46:00 +10:30