Mirrors/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2024-08-13 02:10:44 +02:00
Code Issues Actions 34 Packages Projects Releases Wiki Activity
33,795 Commits 400 Branches 1,017 Tags 5.5 GiB
c044aa34fa
Commit Graph

707 Commits

Author SHA1 Message Date
Jan-Christoph Borchardt
6b2b903ea6 Merge pull request #8468 from owncloud/remove-infieldlabels 
Remove infieldlabels
 2014-06-04 09:28:20 +02:00
icewind1991
cdf8a123e7 Merge pull request #8264 from owncloud/app-enable-by-group 
Add the option to enable apps only for specific groups
 2014-06-03 19:01:12 +02:00
Jan-Christoph Borchardt
9396b22fe3 add missing placeholder shim for change password fields in IE8/9 2014-06-03 15:30:10 +02:00
Thomas Müller
79b3558c6d Merge pull request #7151 from owncloud/user-jquery 
Continuing the New User management
 2014-06-03 15:04:30 +02:00
Bart Visscher
49f1e4a811 Fix syntax error 2014-06-03 12:42:36 +02:00
Robin Appelman
0f82b8efb3 Preserve changed groups when switching between apps 2014-06-03 12:42:36 +02:00
Robin Appelman
953e194245 Dont show group settings for login, filesystem, etc apps after enabling them 2014-06-03 12:42:36 +02:00
Robin Appelman
e3567242b2 Remove debug statements 2014-06-03 12:42:36 +02:00
Robin Appelman
7e07ff6f4f Disable enabling apps by groups for filesystem, authentication and loggin apps 2014-06-03 12:42:36 +02:00
Robin Appelman
7272779456 Prevent js error 2014-06-03 12:42:35 +02:00
Robin Appelman
53dc30af4f Add option to enable app for specific groups 2014-06-03 12:42:35 +02:00
Arthur Schiwon
39982c2aea fix grouplist behaviour (blank after filtering) 2014-06-02 17:32:59 +02:00
Morris Jobke
6f4bdbdb94 Merge pull request #8784 from owncloud/fold-reshare-settings 
make reshare settings foldable
 2014-06-02 14:37:10 +02:00
Arthur Schiwon
75cc16f2bd remove debug output 2014-06-02 12:53:59 +02:00
Arthur Schiwon
28a012410a polish JSDoc 2014-06-02 12:53:59 +02:00
Arthur Schiwon
92b8344489 replace setTimeout and clearTimeout handling by _.debounce 2014-06-02 12:53:59 +02:00
Arthur Schiwon
ec572607e1 remove group rename stuff, there is not support in the backends yet. to do for oc8. 2014-06-02 12:53:59 +02:00
Arthur Schiwon
7b63c2c036 cleanup 2014-06-02 12:53:59 +02:00
Arthur Schiwon
d030c28d69 bind undo to current deleteHandler 2014-06-02 12:53:59 +02:00
ringmaster
fc7438b221 Fix UserList.empty(), use _.defer() instead of setTimeout() 2014-06-02 12:53:58 +02:00
ringmaster
4de14fe6da Javascript cleanup for groups. 2014-06-02 12:53:58 +02:00
ringmaster
c38548a1aa Rebase cleanup. 
Removing code that should not have been restored.
Originally removed in 45fd8f6d.
 2014-06-02 12:53:58 +02:00
ringmaster
ad1c34db45 Revisions from review. 
* Explicit toString()-based getters for uid and displayname data.
* Restored user check for group multiselect in new user creation form.
* Removed jQuery colon expr for uid.
 2014-06-02 12:53:58 +02:00
ringmaster
747c011615 More specific selectors, javascript cleanup. 
* Assigned jQuery selector results to variables for speed.
* Moved all .attr('data') calls to .data() calls.
* Added :data(uid) selector.
* Split the multiselect checkhandlers into separate functions.
* De-duped click event on password change/img.
* Used fluent interface on jQuery object for event binding.
* Removed redundant tag names in class selectors.
* Fixed incorrect date display for last login.
* Added Userlist.has() to search for uid.
* General code convention compliance fixes.

to-do: Group dropdowns currently don't add the admin group after the search result, not sure why yet.
 2014-06-02 12:53:58 +02:00
Thomas Müller
f324aa7b24 fix some jshint errors 2014-06-02 12:53:58 +02:00
Jan-Christoph Borchardt
66d00cf782 user management: remove unneeded and erroneous user filter reset function 2014-06-02 12:53:57 +02:00
Lukas Reschke
0067306fd6 Remove uneeded last comma 2014-06-02 12:53:57 +02:00
Arthur Schiwon
a9bd416643 add reset button for the filter field 2014-06-02 12:53:57 +02:00
Arthur Schiwon
dea7f45782 stick with current group when the filter is used 2014-06-02 12:53:57 +02:00
Arthur Schiwon
7b8935abda show users whose username starts with the search pattern first 
We may want to switch or extend it to display name. I leave it like this for now, continued work on this needs to have sortable columns in mind
 2014-06-02 12:53:56 +02:00
Arthur Schiwon
d87347e64e update GroupList when a users is added or removed to a group 2014-06-02 12:53:56 +02:00
Thomas Müller
3c9788d40c js cleanup + typos 2014-06-02 12:53:56 +02:00
Thomas Müller
d779db5aba js cleanup 2014-06-02 12:53:56 +02:00
Arthur Schiwon
249e42c4cd enable group filtering 2014-06-02 12:53:55 +02:00
Arthur Schiwon
dbc854d8b8 Fire up server request only on typing printed or modifying characters and when the string actually changed 2014-06-02 12:53:55 +02:00
Arthur Schiwon
8df50acce7 some documentation 2014-06-02 12:53:55 +02:00
Arthur Schiwon
68dc665c65 dynamically decide whether to load 10 or 30 users 2014-06-02 12:53:55 +02:00
Arthur Schiwon
5b8ba79356 make filter work on server-side 2014-06-02 12:53:55 +02:00
Arthur Schiwon
19fd7cd9c7 When emptying a list, a hidden entry remains. If the user uid is the same as of a user being to be loaded, it will not be appended but removed. Thus, add a random user name to avoid such happenings. 2014-06-02 12:53:55 +02:00
Arthur Schiwon
5f57d72b93 kick out deprecated and dislodged OC.Router 2014-06-02 12:53:55 +02:00
raghunayyar
fe4b1f8b10 Enhancement: Adds Group to grouplist when added via multiselect 2014-06-02 12:53:55 +02:00
raghunayyar
d3cee79b5a Enhancement: Adding Group on the Sidebar updates the multiselect on the Userlist. 2014-06-02 12:53:55 +02:00
raghunayyar
e159f7e4a9 Enhancement: Implements Grouplist Toggle, Courtesy Calendar App Settings. 2014-06-02 12:53:55 +02:00
raghunayyar
7aca126086 Adds @blizzz to authors 2014-06-02 12:53:54 +02:00
Arthur Schiwon
b3d68fc175 refactor delete handling and apply it to users and groups 2014-06-02 12:53:54 +02:00
raghunayyar
b6b133237a Initial Commit with Group Toggle. 2014-06-02 12:53:54 +02:00
Arthur Schiwon
cfba7e20cf don't hide add group when text is entered (except for ESC press) 2014-06-02 12:53:54 +02:00
Arthur Schiwon
853ced644d hide Add Group when clicking away or pressing ESC 2014-06-02 12:53:54 +02:00
Arthur Schiwon
a4cfa95545 restructure group.js and put functions to object, also add group list sorting after adding. 2014-06-02 12:53:54 +02:00
Arthur Schiwon
480173569f put Add Group elements hiding and showing into its own function 2014-06-02 12:53:54 +02:00
Arthur Schiwon
330dfeb46b group name input shall not vanish upon click, plus cleanup (groups do not have home folders) 2014-06-02 12:53:54 +02:00
Arthur Schiwon
749afe74df when clicking on Add Group also put the focus into the group name field 2014-06-02 12:53:54 +02:00
Arthur Schiwon
faab6c095c move group-click initialization to groups.js and only react on elements with a data-gid attribute given 2014-06-02 12:53:54 +02:00
raghunayyar
65aa20433c Enhancement : Toggle Add Group on Click, @blizzz have a look here. 2014-06-02 12:53:53 +02:00
Arthur Schiwon
506e065f23 stricter test for 0 2014-06-02 12:53:53 +02:00
raghunayyar
eed108ec1b Enhancement : The edit icon looks like files app rename fileaction. 2014-06-02 12:53:53 +02:00
Arthur Schiwon
d650cd66dc mark selected group active 2014-06-02 12:53:53 +02:00
Arthur Schiwon
1f4bc7cb10 port scroll improvements 2014-06-02 12:53:52 +02:00
Arthur Schiwon
478393e15a load groups when clicking on them 2014-06-02 12:53:52 +02:00
raghunayyar
e681e1eec0 Initial Commit: Takes Quota Settings inside Navigation, Changes Create -> Add Group 2014-06-02 12:53:51 +02:00
raghunayyar
f751e0bc48 Splits Code for Users and Groups. 2014-06-02 12:53:51 +02:00
Arthur Schiwon
57ffaddf26 add Last Login column 2014-06-02 12:53:51 +02:00
raghunayyar
970f899726 Initial Commit : Changes Storage to Quota, Implements GroupName editing. 2014-06-02 12:52:53 +02:00
Arthur Schiwon
dc28f58951 add Storage Location col 2014-06-02 12:52:53 +02:00
raghunayyar
8e34316e04 Fixes User Search by username. 2014-06-02 12:52:53 +02:00
raghunayyar
c7af9cd6dd Initial Commit : User Search, Fixes Typos 2014-06-02 12:52:53 +02:00
raghunayyar
71160ff853 Deletes Group Clientside Effectively. 2014-06-02 12:52:52 +02:00
raghunayyar
ce46cd3680 Implements Group Creation from Sidebar 2014-06-02 12:52:52 +02:00
Georg Ehrke
020255b4e5 add button for properly uninstalling apps 2014-05-31 17:50:39 +02:00
Volkan Gezer
4843d13056 prevent pageload if pressed enter on name email change 2014-05-30 15:12:39 +02:00
Volkan Gezer
c01f196f72 make reshare settings foldable 2014-05-29 21:14:20 +02:00
Joas Schilling
dc83b17f49 Fix double "saved" message when changing email settings 2014-05-28 11:50:55 +02:00
Bjoern Schiessle
12338e0ef0 allow admin to disable sharing for specific groups of users 2014-05-22 10:43:44 +02:00
Volkan Gezer
5291f47c66 fix typo encryption 2014-05-15 01:29:14 +02:00
Björn Schießle
dab3cb65cf Merge pull request #8522 from owncloud/sharing_ux_improvements 
Sharing ux improvements
 2014-05-14 12:54:27 -04:00
Bjoern Schiessle
a9ac11718e backup the encryption key after the encryption was disabled so that the user 
can restore them if needed
 2014-05-13 12:35:25 +02:00
Bjoern Schiessle
ec045b251c hide input field if default expire date isn't activated 2014-05-13 11:28:25 +02:00
Lukas Reschke
eecd4bd18e Use JS as content-type due to mimesniffing 2014-04-17 10:40:19 +02:00
Björn Schießle
10dc1de644 Merge pull request #8069 from owncloud/fix-localization-issues-with-file-encrypt-app 
Fix some localization issues with file encryption/decryption strings
 2014-04-11 17:22:13 +02:00
Thomas Müller
647abe512b reduce code duplication, fix parse error, prevent page reload on hitting enter while changing the display name - refs #8085 2014-04-07 14:04:16 +02:00
Volkan Gezer
286323f7a4 Fix some localization issues with file encryption/decription strings 2014-04-05 19:28:53 +02:00
Morris Jobke
bd2cf6ee29 Merge pull request #7817 from owncloud/app-navigation-for-apps 
Makes #app-navigation a part of app management.
 2014-04-01 21:38:43 +02:00
Vincent Petry
82f98fb3d3 Fixed user list offset call 2014-03-28 18:12:34 +01:00
raghunayyar
3d8ce8104f Adds Style changes to app-navigation in core/css/apps.css 2014-03-24 17:59:53 +05:30
raghunayyar
59d1ee565e Makes #app-navigation a part of app management. 2014-03-20 13:34:50 +05:30
kondou
8fafee31ef Use $.hide() instead of .hidden for now 
.inlineblock ranks higher than .hidden
 2014-03-12 15:42:29 +01:00
kondou
dd97d532be Remove OC.Router usage 2014-03-12 15:31:48 +01:00
kondou
1c82b4751e Merge branch 'master' into hide_remove_image_avatar 2014-03-12 15:29:26 +01:00
Thomas Müller
32b29c9d73 Merge branch 'master' into fix-7307 
Conflicts:
	core/js/router.js
	settings/js/admin.js
 2014-03-06 00:15:08 +01:00
Joas Schilling
5b8cde48dc Add button to send a test mail after changing the email settings 
Fix #7175
 2014-03-05 10:01:34 +01:00
Thomas Müller
5f711912a1 remove OC.Router.registerLoadedCallback() 2014-03-02 23:45:23 +01:00
Thomas Müller
1291303c5a Replace OC.Router.generate() with OC.generateUrl() 2014-03-02 22:30:24 +01:00
kondou
3c11dc0006 Merge branch 'master' into hide_remove_image_avatar 2014-02-28 19:28:29 +01:00
Jan-Christoph Borchardt
d9a153dbe9 Merge pull request #7174 from owncloud/issue/7166 
Add option to change email settings in admin section
 2014-02-26 14:41:07 +01:00
Jan-Christoph Borchardt
84eea47991 Merge pull request #7406 from owncloud/settings-apps.js-style 
coding style fixes: cut long lines, whitespace
 2014-02-26 14:24:34 +01:00
Joas Schilling
9847912257 Remove unused variables, add doc blocks and break lines 
Fix #7166
 2014-02-26 13:10:46 +01:00
kondou
593adab258 Fix scrutinizer issue in settings/js/apps.js 2014-02-26 11:41:32 +01:00
Vincent Petry
a1600a289c Merge pull request #7401 from owncloud/highlight_selected_app_settings 
Highlight the selected app in app-settings
 2014-02-26 11:07:43 +01:00
Jan-Christoph Borchardt
bc1c136cd6 coding style fixes: cut long lines, whitespace 2014-02-26 10:34:38 +01:00
Joas Schilling
331bd527a7 Hide SMTP options based on selected send mode 
Fix #7166
 2014-02-26 10:30:22 +01:00
kondou
e32acf933d Highlight the selected app in app-settings 2014-02-26 04:03:41 +01:00
Robin Appelman
80481a1e41 Merge branch 'master' into mobile-header 2014-02-21 12:46:09 +01:00
kondou
88882e3fa7 Use addClass('hidden') and removeClass('hidden') 2014-02-21 12:42:07 +01:00
kondou
0e0b4d5575 Hide remove image, if there's no custom avatar 
Fix #7308
 2014-02-20 21:53:59 +01:00
Lukas Reschke
917a505af4 Merge pull request #7291 from owncloud/adminess-raghu 
Move isadmin to template and rename it to oc_isadmin
 2014-02-20 19:01:28 +01:00
Jan-Christoph Borchardt
bfe6dfe5da Merge pull request #7056 from owncloud/users-scrollperformance 
Improve users list scrolling performance
 2014-02-20 16:45:36 +01:00
Jan-Christoph Borchardt
20b740f8e4 do not show display name on mobile when profile picture is present 2014-02-20 13:37:23 +01:00
Lukas Reschke
16262e3fd2 Move isadmin to template and rename it to oc_isadmin 2014-02-19 17:56:12 +01:00
Joas Schilling
c196e59e88 Add event parameter to keyup event 
Fix issue #7277
 2014-02-19 10:25:52 +01:00
Joas Schilling
fdb0d2067f Remove duplicated definition and move OC.msg to js/js.js 
Fix issue #7166
 2014-02-19 10:20:52 +01:00
Joas Schilling
8387cd8ae3 Add option to change email settings in admin section 
Fix issue #7166
 2014-02-18 14:26:03 +01:00
Vincent Petry
58b1dc5e76 Added loading spinner to users list on scroll 2014-02-18 10:52:05 +01:00
Vincent Petry
c732764eb5 Improve users list scrolling performance 
- fixed JS error when avatar mode is disabled
- added spinner at the bottom of the table
- scroll detection now happens earlier
- single/multiselect init is deferred so that the new rows are first appended
  into the list (more responsive) and initialized afterwards
- disabled users sorting after add (assuming they are always sorted on
  the server side)
 2014-02-17 19:32:45 +01:00
Morris Jobke
13fa0e2a9d Fix implied evals and doubled definition of variable 
fixes #7119
fixes #7120
fixes #7121
fixes #7122
 2014-02-07 17:47:42 +01:00
Bjoern Schiessle
6bb27ea76b disable button and input field during decryption 2014-01-24 12:15:06 +01:00
Bjoern Schiessle
2a3cb7ac5b remove the form, it isn't needed here 2014-01-24 11:41:24 +01:00
Jan-Christoph Borchardt
5956277ed4 Merge pull request #6234 from owncloud/change-email-by-enter 
change mail address by pressing enter - fixes #6179
 2014-01-23 08:03:22 -08:00
Morris Jobke
80dead5a9f fix double call of changeEmailAddress() 2014-01-18 22:59:49 +01:00
Bjoern Schiessle
80d871ab1e added website field 2014-01-17 16:35:48 +01:00
Bjoern Schiessle
e2de3b8337 distinguish app links from doc links 2014-01-17 16:08:32 +01:00
Bjoern Schiessle
bf0471a92e show link to app documentation 2014-01-17 14:56:25 +01:00
Björn Schießle
45709937af Merge pull request #6786 from wakeup/master 
Fix untranslated text when deleting user
 2014-01-16 03:22:55 -08:00
Volkan Gezer
97b0840bbe Fix untranslated text when deleting user 
This should fix issue #6728
 2014-01-15 18:40:04 +01:00
Morris Jobke
5c1a9f35f1 Indicate password strength using strengthify 
* uses zxcvbn
 * outsourced to separate jquery plugin
 * async loading
 * hide strength meter if input is empty
 * feedback if user enters weakest password
 * fade in and out
 * show tipsy with strength
 * Opera 12, IE8-10, FF 23, Chromium 29
 2014-01-15 11:10:12 +01:00
Morris Jobke
bc23f46198 fix typo 2013-12-09 16:05:10 +01:00
Morris Jobke
44a55056e7 change mail address by pressing enter - fixes #6179 2013-12-07 17:33:27 +01:00
Morris Jobke
ac77218d57 parent().parent() -> closest() 2013-12-06 13:53:01 +01:00
Morris Jobke
008bfc6793 Fix full name edit for repetive edit 
fixes #6212

fixes the data attributes after edit
fixes markup to successfully re-edit display name
 2013-12-05 23:44:59 +01:00
Bjoern Schiessle
caf486d6e7 - show a spinner while decrypting files if the encryption app was disabled 
- don't fade-out the decryption result
 2013-11-20 12:23:10 +01:00
Vincent Petry
9d230bcc75 Improve quota input field 
- Added tooltip with examples
- The quota value returned by the server is now displayed after update
- Fixes #5346
 2013-10-30 20:46:53 +01:00
Vincent Petry
5aeafab9ab Fixed wrong id when reading checkbox value for force SSL setting 
Fixes #5488
 2013-10-23 15:21:18 +02:00
Vincent Petry
00f4928866 Added warning notification when user home already exists 
When creating a user and the home already exists in the data dir, a
warning notification will be displayed.

Fixes #5161
 2013-10-22 18:10:29 +02:00
raghunayyar
7c2f1fd580 Puts the language divider in place. thanks @Kondou-ger ;) 2013-10-11 18:46:59 +05:30
raghunayyar
e27bb660bd Uniform Styles and Indentation Fixes for Personal Block 2013-10-11 18:03:53 +05:30
Vincent Petry
6970774776 Fixed display name change for IE8 
After saving the display name, the oldDisplayName field's value was
wrongly set with text(), which would append the text inside the input
element which is considered as an invalid operation in IE8.

This fix for #5054 correctly puts the old value into the field with a val() call.
 2013-10-11 10:48:30 +02:00
Victor Dubiniuk
a240e63981 Fix new user avatar. Ref#5166 2013-10-07 18:00:15 +03:00
kondou
b0ff10a536 Hide defaultavatar in #header and don't darken proper avatars in #header 2013-10-04 02:27:53 +02:00
kondou
24d092c4ba Have uniform (wrong) indention 2013-09-28 17:49:07 +02:00
kondou
4907685405 Base defaultavatar text on displayname 
Fix #4876
 2013-09-28 16:46:53 +02:00
Bart Visscher
45a7b0dbac Fix the apps enabling/disabling in settings 2013-09-20 20:29:15 +02:00
Bart Visscher
817b8d151b Merge pull request #4745 from owncloud/split_personal-user_passwordchange 
Split personal and user-mgmt password change logic
 2013-09-18 07:53:11 -07:00
Bernhard Posselt
a58e176852 Merge pull request #4506 from owncloud/oc_avatars 
OC Avatars
 2013-09-14 16:00:36 -07:00
kondou
18da2f9cf7 Improve changepassword route naming 2013-09-13 17:07:23 +02:00
ringmaster
3790cbb493 Allow numeric group names 2013-09-13 09:06:20 -04:00
kondou
c9c5e1b97f Merge branch 'master' into oc_avatars 2013-09-12 07:41:44 +02:00
kondou
2ae3ab98d8 Merge branch 'master' into split_personal-user_passwordchange 2013-09-11 16:35:55 +02:00
kondou
4963a5b30f Fix language selection; Fix #4756 2013-09-07 16:28:51 +02:00
kondou
d18a070a03 Have the "notsquare" error as data, not as message 2013-09-06 13:46:50 +02:00
kondou
a21376480d Split personal and user-mgmt password change logic 2013-09-06 08:05:07 +02:00
kondou
3774632ecc Clean up avatars and preliminary use JSON->rawlist.php 2013-09-05 23:12:52 +02:00
kondou
15ab798353 Fix an IE8 bug with the avatarcropper. 
1. Crop an avatar
2. Crop another avatar without reloading
-> Second cropper is 28px x 30px big
 2013-09-05 19:26:02 +02:00
kondou
6db96603a0 Have login-checks and CSRF checks 2013-09-05 00:04:31 +02:00
kondou
fca5db748b Remove backgroundcolor on updating avatar, and add a missing parameter 2013-09-04 13:16:21 +02:00
kondou
a1e7614d73 Clean up oc_avatars 2013-09-04 12:56:14 +02:00
kondou
32a7ba9823 Don't update avatar on displayNameChange anymore 2013-09-04 07:13:09 +02:00
kondou
6d42f51d0c Fix unwanted caching in IE8 2013-09-03 18:34:40 +02:00
kondou
4724d60ecd Partly fix cropper in IE8 and don't use a dialog for it 2013-09-03 17:40:41 +02:00
kondou
65413a95dc Merge branch 'master' into oc_avatars 
Conflicts:
	config/config.sample.php
 2013-09-03 04:43:11 +02:00
kondou
e7e3f1b81a Fix some of @jancborchardt's complaints in oc_avatars 2013-09-02 17:07:38 +02:00
kondou
c95d4cafa9 Fix @tanghus's complains in avatars and clean up cropper after closing with "x" 2013-09-01 19:12:54 +02:00
kondou
aa88eea9cf Sanitize displayname, respect data @ $element, fix routename, clean after cropping, updateAvatar with displayname 2013-08-31 18:27:28 +02:00
kondou
5d653753bd Merge branch 'master' into oc_avatars 2013-08-31 12:56:36 +02:00
Jan-Christoph Borchardt
1e834c57a4 fix issues caused by introduction of sticky Apps management footer 2013-08-30 13:46:10 +02:00
kondou
ecf187393b Finish cropper, Get rid of TODOs, Improve \OCP\Avatar and "fix" unitests 2013-08-30 09:00:37 +02:00
kondou
c533b80682 Use OC_Cache and finish cropper functionality 2013-08-29 16:56:32 +02:00
kondou
0c708be76b Use defaultavatars 2013-08-29 14:26:11 +02:00
Thomas Müller
1d04843ef0 no duplicate declaration of appLicense + camelCase 2013-08-28 22:42:43 +02:00
kondou
6c7efd5dac Work around #4630 to fix license showing 2013-08-28 22:12:01 +02:00
kondou
bdf48a6daa Use OC.Router.generate, TODO use cache, prepare for defaultavatars 2013-08-28 21:20:28 +02:00
kondou
8d8a57de7f Continue work on cropper 2013-08-28 16:39:00 +02:00
kondou
31736a1df3 Have a controller instead ofo avatar.php and fix some cropper-design 2013-08-26 16:46:55 +02:00
kondou
9a8908b643 Use Jcrop, have inline errormsg, work on cropping, clean up, WIP 2013-08-25 21:06:44 +02:00
kondou
81cadd5ea3 Remove gravatar and no-avatar functionality, prepare for default avatars even more and reword some stuff 2013-08-25 21:06:02 +02:00
kondou
0a4febf1eb Integrate newavatar.php into avatar.php by using GET, POST & DELETE 2013-08-25 21:06:01 +02:00
kondou
9c12da6a94 Several improvements 
- Don't use gravatars default avatars
- Use "profile image" instead of "avatar"
- Use <p> instead of tables
- Ease updateAvatar()
- Actually return something in \OCP\Avatar
 2013-08-25 21:05:40 +02:00
kondou
d7e6c77e20 Have a fancy uploadavatar button 2013-08-25 21:05:40 +02:00
kondou
9500109349 Refactor newavatar.php and show (for now) an alert on problems when setting new avatars 2013-08-25 21:05:40 +02:00
kondou
4521b54c67 Have /avatar.php as a central avatar-point 2013-08-25 21:04:49 +02:00
kondou
252548c62c Improve styling & enable avatar-upload at personal page 2013-08-25 21:04:45 +02:00
kondou
fac671b14e Modularize get(), async getAvatar, avatars @ usermgmt 
And other small improvements
 2013-08-25 21:04:04 +02:00
kondou
4a08f7d710 Add basic avatars and gravatar 2013-08-25 21:02:43 +02:00
kondou
0ce35af02a Merge branch 'master' into improve_app-management 
Conflicts:
	settings/js/apps.js
 2013-08-21 19:20:25 +02:00
Christopher
90da518e3e Merge pull request #4262 from owncloud/fix_jslint_kondou 
Fix some JSLint warnings
 2013-08-20 12:45:10 -07:00
Morris Jobke
de949b1caa Merge pull request #4447 from owncloud/fix_4351_master 
Use JSON to send/receive group data.
 2013-08-20 02:49:48 -07:00
Björn Schießle
9be836814c Merge pull request #4239 from owncloud/decrypt_files_again 
Enable user to decrypt files again after encryption app was disabled
 2013-08-18 09:51:48 -07:00
kondou
7c296a6cf9 Move .errormsg from settings-css to .warning in core. Reusable! 2013-08-18 17:37:22 +02:00
kondou
db424cc86b Use appitem instead of always recreating a jquery object 
Also fix some wrong data storages
 2013-08-18 14:49:11 +02:00
kondou
9f4bd7cb47 Don't use an alert for displaying app-mgmt-errors 
Rather display a dominant div and mark the problematic app in the applist.

Fix #305
 2013-08-18 13:49:34 +02:00
kondou
c741a25eaa Merge branch 'master' into improve_app-management 2013-08-18 12:15:22 +02:00
kondou
9e8a6b704d Add _many_ newlines at the end of files 2013-08-18 11:06:59 +02:00
Owen Winkler
9840363488 Break long lines into smaller ones. 2013-08-18 05:03:20 -04:00
kondou
edd92e4c09 Merge branch 'master' into fix_jslint_kondou 
Conflicts:
	apps/files/js/file-upload.js
 2013-08-18 00:38:52 +02:00
Bjoern Schiessle
cabe92ef12 Merge branch 'master' into decrypt_files_again 
Conflicts:
	apps/files_encryption/tests/keymanager.php
 2013-08-17 13:15:22 +02:00
Owen Winkler
cd7e57e8ec Use JSON to send/receive group data. 
Squashed commits from PR #4364 for master.
 2013-08-15 06:19:40 -04:00
Jan-Christoph Borchardt
31d50288a5 draw attention to the newly added app entry by flashing it twice 2013-08-07 21:54:28 +02:00
Jan-Christoph Borchardt
7a9daa99d1 scroll the app navigation down so the newly added app is seen 2013-08-07 21:53:53 +02:00
Jan-Christoph Borchardt
775f33cc1b prepend the new app before the 'More apps' function 2013-08-07 21:53:25 +02:00
kondou
1a4465f41d Improve app-management 
- Better error messages

- Translate untranslated strings

Basically picks non-app-dependency related stuff from #4017
 2013-08-06 17:19:18 +02:00
kondou
1348330c7d Fix a syntax error & have if-conds in an own line 2013-08-01 18:44:01 +02:00
kondou
aaf0fec9f5 Fix some JSLint warnings 2013-07-31 21:21:02 +02:00
Bjoern Schiessle
b6fa0e4eef working decrypt files method 2013-07-29 17:06:05 +02:00
Björn Schießle
e15e394fcc add ajax call to decrypt all files 
Conflicts:
	apps/files_encryption/lib/crypt.php
 2013-07-29 13:39:05 +02:00
kondou
05084e03a0 Use !== and === in settings. 2013-07-21 13:55:25 +02:00
kondou
efb707a431 Use OC instead of oc to show alert at an error. 
Related to #4001
 2013-07-10 04:28:54 +02:00
Victor Dubiniuk
a20f7f1d67 Do not add groups if user has no groups 2013-07-03 22:06:09 +03:00
Victor Dubiniuk
13bfa3be27 Use svg to png fallback on demand only 2013-06-28 23:18:11 +03:00
Victor Dubiniuk
6ecbae7da9 Add fallback for svg app icons 2013-06-28 23:10:40 +03:00
Victor Dubiniuk
d110e60316 Hide a ghost image on the apps management page 2013-06-28 21:53:56 +03:00
Victor Dubiniuk
b2cb81f857 Replace display name only 2013-06-18 00:17:08 +03:00
Björn Schießle
f1a5b8b524 show nicer warning if the admin recovery password was wrong 2013-05-16 16:01:40 +02:00
Björn Schießle
8ae30891b3 some error handling in case the recovery password is wrong 2013-05-16 15:19:53 +02:00
Björn Schießle
9d1e60325c allow admin to recover users files in case of password lost 2013-05-16 14:53:04 +02:00
Arthur Schiwon
9c3b83e28c Fix retrieval of users with multiple backends 2013-05-03 13:50:14 +02:00
Bart Visscher
d825669265 Merge pull request #3002 from owncloud/priorize_common_languages 
Priorize common languages.
 2013-04-26 06:30:59 -07:00
David Reagan
4bee02f75c Fixed comment in personal.js. Changed message text in changedisplayname.php. 2013-04-23 14:31:35 -07:00
David Reagan
7312cbec91 Made saving the display name work the same way as the email address. Fixed a few comparison operators. Increased the fadeOut time for the success and error messages. 2013-04-23 12:45:12 -07:00
kondou
7a2be0c5dc Make divider not selectable 
Very hacky
 2013-04-19 00:39:42 +02:00
kondou
79218be1d2 Priorize common languages. 2013-04-18 15:14:42 +02:00
Morris Jobke
867a527148 Merge pull request #2975 from owncloud/log-date 
use date and time instead of timestamp in log
 2013-04-17 06:49:46 -07:00
Bernhard Posselt
f7e29eabf2 fix admin log display and use a more readable format 2013-04-17 14:05:51 +02:00
David Reagan
0dd6f16e0b Removed extra id from jquery selectors. Remove console.log call. Removed commented code. 2013-04-16 13:22:04 -07:00
David Reagan
6d812ada05 Modified how the #lostpassword or #email fields save email addresses on the Personal settings page. It now saves one second after the last keyup event, instead of after a blur event. 2013-04-16 13:03:41 -07:00
raghunayyar
5228eb8a18 Add span tag while enabling or disbling apps as well. 2013-04-12 18:15:59 +05:30
Robin Appelman
1abc264873 Add the quota change listeners to newly added user entries in the user list 2013-04-10 14:12:54 +02:00
Bart Visscher
46a552fd56 Merge pull request #2738 from Kondou-ger/fix_alert_issues 
Fixed things in alert-messages
 2013-04-06 08:24:43 -07:00
kondou
de2e546617 Translate 'Error' in core 2013-04-06 16:52:55 +02:00
kondou
32f96e19e5 Fix Typo 2013-04-05 19:06:58 +02:00
kondou
8d63b7d9bf Fix #2693 
When removing a group response.data.action becomes 'remove', thus the if
shows an empty notification.
 2013-04-05 18:52:14 +02:00
root
74b02db337 Fixed things in alert-messages 
Two parameters for OC.dialogs.alert, otherwise one will be "undefined".

Also fixed missing translation.
 2013-04-05 01:56:32 +02:00
Bernhard Posselt
8ed9be5408 Merge pull request #2597 from kabum/lesslog 
Make it possible to show less log entries again
 2013-03-29 07:22:43 -07:00
Bernhard Posselt
7c0999bd27 Merge pull request #2448 from owncloud/userlist_available_groups 
User list: Keep array of available groups. Should fix #873
 2013-03-29 07:19:09 -07:00
Morris Jobke
866ca51d83 fix typo and remove animation 2013-03-28 16:11:46 +01:00
Morris Jobke
f19fd30278 convert js call to css rule 2013-03-28 15:43:14 +01:00
Morris Jobke
df74c0e43a apply code review hints 2013-03-28 15:02:31 +01:00
Arthur Schiwon
942cdff240 Users: use DisplayName in the Display Name col when appending users 2013-03-27 18:52:15 +01:00
Morris Jobke
7c8a0a486b add copyright note 2013-03-27 16:53:51 +01:00
Morris Jobke
97d73d41a8 remove animation 2013-03-27 15:19:28 +01:00
Morris Jobke
d3ca97dd2f Make it possible to show less log entries again - fix owncloud/core#1593 
* show "less" button only if there are more than 3 entries
 * only "remove" logs till last 3 entries
 2013-03-27 15:14:09 +01:00
Brice Maron
24d471af29 Improve detection of installations errors 2013-03-23 13:47:42 +01:00
Thomas Tanghus
06a7d39024 User list: Keep array of available groups. Should fix #873 2013-03-19 14:49:02 +01:00
Thomas Tanghus
c13487332a User list: Avoid dupes and better sorting. Fix #2420 2013-03-19 02:48:08 +01:00
Frank Karlitschek
36a1bcb732 Merge pull request #2061 from owncloud/app-text 
Add the description as text and not as html
 2013-03-04 00:01:26 -08:00
Frank Karlitschek
d70912e72b Merge pull request #2060 from owncloud/escapeGroupname 
Sanitize uid, group and quota
 2013-03-04 00:00:47 -08:00
Lukas Reschke
0252479e3e Add the description as text and not as html 2013-03-04 00:19:07 +01:00
Lukas Reschke
86a7202cda Sanitize uid, group and quota 2013-03-04 00:11:46 +01:00
Lukas Reschke
962b7a7c80 Add log as text and not as HTML 2013-03-03 23:46:08 +01:00
Arthur Schiwon
60d4fdda57 sort users according to display name 2013-02-26 22:56:55 +01:00
Qingping Hou
195b52cb63 Merge branch 'master' of github.com:owncloud/core into issue_1776 
Conflicts:
	core/templates/layout.user.php
 2013-02-25 17:16:03 -05:00
Qingping Hou
c111a3aa24 add span tag to displayname on expand button 2013-02-25 15:40:57 -05:00
Qingping Hou
278a6f5b41 update oldDisplayName value on displayName change 
This patch fixes a bug that can be reproduced in following way:

1. change displayName
2. clear text in displayName input click change again

Then you will get an error and previous displayName will be restored.

Expected behavior should restore the new updated displayName.
 2013-02-24 18:13:25 -05:00
Qingping Hou
2f3c5d8afc when user changes displayName, also update it on expand button 2013-02-24 18:07:35 -05:00
Thomas Tanghus
2268596e1a Fetch displayname in userlist ajax requests. Refs #1681 2013-02-22 14:51:21 +01:00
Lukas Reschke
a984a27fa0 Sanitize user input 2013-02-18 08:04:35 +01:00
Lukas Reschke
5624f1b838 Merge pull request #1701 from owncloud/XSS-fixes 
Sanitize HTML
 2013-02-14 10:50:46 -08:00
Lukas Reschke
c7094197bf Sanitize HTML 2013-02-14 18:15:14 +01:00
Thomas Mueller
c5d716effe fixing javascript errors IE8 in apps management 2013-02-14 15:47:48 +01:00
Thomas Mueller
022993c098 fixing javascript errors IE8 in user management 2013-02-14 12:59:59 +01:00
Thomas Mueller
9d6f74c65e missing piece after merge 2013-02-13 10:59:41 +01:00
Robin Appelman
e68e5cc849 Split editable select code used for quota selection into a jquery plugin 2013-02-11 15:18:14 +01:00
Lukas Reschke
18fa8e2753 json_encode the appid 2013-02-09 15:06:35 +01:00
Björn Schießle
9d73e7eb1e let the user change his display name, if supported by the back-end 2013-02-06 11:38:03 +01:00
Thomas Tanghus
cda0780d4b Remove superfluous append 2013-02-05 14:15:17 +01:00
Jan-Christoph Borchardt
2ec0c491d4 remove superfluous enabled-app class again 2013-02-05 11:30:18 +01:00
Jan-Christoph Borchardt
4059959c5f Merge branch 'master' into fix_addNavigation 2013-02-05 11:09:38 +01:00
Thomas Müller
04b97a1906 Merge pull request #1229 from owncloud/from_live_to_on 
replace live() with on() in core js
 2013-02-03 21:55:54 -08:00
Thomas Tanghus
88ad1e5fbd Make app icon linkable when enabling app. 2013-02-03 16:02:25 +01:00
blizzz
88f4aced38 Merge pull request #1404 from owncloud/fixing-1276-master 
fix #1276 - use registerLoadedCallback()
 2013-02-01 03:13:23 -08:00
Thomas Mueller
cc73568d68 Updateing -> Updating 2013-02-01 00:51:00 +01:00
Thomas Mueller
402263bd5c fix #1276 - use registerLoadedCallback() 2013-02-01 00:33:14 +01:00
Thomas Mueller
b1da1db0eb Merge branch 'master' into from_live_to_on 
Conflicts:
	apps/files_external/js/google.js
 2013-01-31 23:34:12 +01:00
Jan-Christoph Borchardt
3d5c7ca245 Merge branch 'master' into navigation 2013-01-31 19:28:25 +01:00
Thomas Mueller
85a12970c7 update on translation string 2013-01-31 14:11:31 +01:00
Jan-Christoph Borchardt
c801b86bc2 Merge pull request #1359 from raghunayyar/navigation 
No Image Repetition on Enabling Apps in Navigation Bar
 2013-01-31 05:01:20 -08:00
Thomas Mueller
3af09f2acf l10n support for the error dialog added 2013-01-31 10:43:59 +01:00
raghunayyar
b978cc8b28 Shorter, Cleaner JS in apps.js 2013-01-31 11:52:56 +05:30
Jörn Friedrich Dreyer
de00111c1f use on instead of live in users.js 2013-01-30 17:49:02 +01:00
Jörn Friedrich Dreyer
22812c5f0d replace live() with on() in core js 2013-01-30 17:00:54 +01:00
raghunayyar
0dfbd53a6e Reduced Styling and Image loads as from src and not backgorund. 2013-01-30 19:12:51 +05:30
Frank Karlitschek
66cab77b6d merge master 
Merge branch 'master' into improved_appsmanagement

Conflicts:
	settings/apps.php
	settings/templates/apps.php
 2013-01-30 14:36:17 +01:00
Lukas Reschke
250c565d2b Merge pull request #1360 from owncloud/display_name 
introduction of display names
 2013-01-29 14:05:54 -08:00
Björn Schießle
6659798197 only change display name if the display name from the current user was changed; add correct display name to new user 2013-01-29 22:33:46 +01:00
Björn Schießle
56c6e6a334 remove debug output 2013-01-29 22:20:47 +01:00
Björn Schießle
e613a68274 remove dubug output 2013-01-29 21:30:04 +01:00
raghunayyar
d620495e92 No Image Repetition on Enabling Apps in Navigation Bar 2013-01-30 00:54:23 +05:30
Björn Schießle
f3a99f4869 show display name in input field 2013-01-28 17:01:37 +01:00
Björn Schießle
e0f2ed2757 interface and API to change display names 2013-01-28 14:09:11 +01:00
Thomas Müller
276d98b9dd Merge pull request #1059 from owncloud/fixing-998-master 
Fixing 998 master
 2013-01-26 04:15:40 -08:00
Lukas Reschke
48949ba04a Move appid to external file 2013-01-23 11:21:34 +01:00
Lukas Reschke
d2383338de External JSON for the Apps 2013-01-21 22:18:42 +01:00
Lukas Reschke
3ed7d5d521 Move isadmin to external file 2013-01-21 21:25:38 +01:00
Frank Karlitschek
a27f92a17a we are getting closer. updating is not working yet. 2013-01-21 20:40:23 +01:00
Thomas Mueller
afb5de955e Merge branch 'master' into fixing-998-master 
Conflicts:
	apps/files/ajax/upload.php
	apps/files/js/files.js
 2013-01-18 23:22:34 +01:00
Lukas Reschke
954b559d48 Merge pull request #994 from owncloud/enhanced_multiSelect 
Enhanced multiSelect
 2013-01-11 10:23:04 -08:00
Lukas Reschke
466cdab680 Add security section to admin menu 
Currently it only allows the admin to enable or disable the HTTPS
enforcement, but in the future it could be expanded to further options.

The HTTPS enforcement only allows the admin to enforce it, if he is
connected via HTTPS. (To prevent admins to enable it without a proper
SSL setup)
 2013-01-11 14:18:51 +01:00
Thomas Mueller
b5d1dfcdc9 javascript syntax error fixed on the way 2013-01-04 23:38:07 +01:00
Thomas Mueller
594d388ad9 new javascript notification functions used within users.js 2013-01-04 23:37:21 +01:00
Thomas Tanghus
5f795d3aac Users: Show selected groups first in list. 2012-12-21 06:18:45 +01:00
Thomas Tanghus
1d55829ba6 multiSelect: Modified users.js to only update other multiSelects. 2012-12-21 00:54:31 +01:00
Thomas Müller
cc9061d20d adding missing translations for various strings + fixing tool tip on delete 2012-12-20 09:59:09 +01:00
Bart Visscher
68562dafb4 More whitespace fixes 2012-12-15 00:43:46 +01:00
Georg Ehrke
e5af24d084 use attr instead of data 2012-11-29 13:56:07 +01:00
Georg Ehrke
1d1ab2a911 Revert "fix group and subadmin managing for 'ajax-loaded' users" 
This reverts commit a5774229a1.
 2012-11-29 13:37:37 +01:00
Georg Ehrke
4c83a4c918 add a client side check 2012-11-28 18:40:58 +01:00
Georg Ehrke
a5774229a1 fix group and subadmin managing for 'ajax-loaded' users 2012-11-28 18:40:00 +01:00
Georg Ehrke
ab13702770 make some checks server-side 2012-11-28 18:15:40 +01:00
Bart Visscher
343e9d8621 Better check and handing of user deletion 2012-11-14 21:52:28 +01:00
Bart Visscher
4eff27ed42 Always have the username as string in user admin 2012-11-14 21:52:28 +01:00
Bart Visscher
85209a0a00 Cleanup user settings js 2012-11-14 21:52:28 +01:00
Brice Maron
910a25adbd Fix deleting multiple user w-o reloading V2 2012-11-12 20:29:06 +00:00
Brice Maron
4c06c25c6c Fix delete link when new user is added 2012-11-08 20:17:16 +00:00
Brice Maron
fbc3123d8e Correct more data vs attr to fix #189 2012-11-07 23:51:00 +00:00
Bart Visscher
1bdd0c949b Move and fix app setting navigation detect 2012-10-29 15:04:55 +01:00
Bart Visscher
0120f3fd62 Merge branch 'routing' 
Conflicts:
	core/lostpassword/index.php
	core/lostpassword/resetpassword.php
 2012-10-27 11:58:02 +02:00
Robin Appelman
da57fbc93a show/hide navigation entries after enabling/disabling app 2012-10-26 20:13:24 +02:00
Bart Visscher
6081bfa2bc Merge branch 'master' into routing 
Conflicts:
	lib/search/provider/file.php
	settings/ajax/changepassword.php
	settings/settings.php
 2012-10-17 16:38:11 +02:00
Frank Karlitschek
c701bed2e3 fix a lot of small layout bugs and make the apps page overall prettier plus add ratings finally 2012-10-08 15:49:48 +02:00
Frank Karlitschek
306bfb44d3 no garbage on the screen please 2012-10-08 13:33:52 +02:00
Bart Visscher
f3a211c03c Implement routing on javascript side 2012-10-05 09:42:36 +02:00
Bart Visscher
bb136b9adf Make the settings ajax calls use the router 2012-10-02 18:00:23 +02:00
Sam Tuke
b765e883f3 Fixed bug with duplicate entries for installed 3rd party apps in settings->apps 
Added method getAppstoreApps to OC_App
Added minor documentation
 2012-09-18 14:35:27 +01:00
Bart Visscher
a8de0af273 Add 'var' before some global js vars 2012-09-05 22:26:09 +02:00
Bart Visscher
9329af921d Add missing ; to js code 2012-09-05 22:26:09 +02:00
Thomas Mueller
10bd64debd translation support enhanced 2012-09-01 13:23:37 +02:00
Robin Appelman
b5234a4f34 allow html inside app descriptions 2012-08-30 22:17:54 +02:00
Michael Gapczynski
42a291286b Fix incorrect Javascript for changing Share API settings 2012-08-27 20:45:36 -04:00
Michael Gapczynski
9cd55508c3 Add Share API settings to admin page 2012-08-27 20:39:31 -04:00
Michael Gapczynski
59cf1d19e5 setbackgroundjobsmode.php got lost somewhere - switched call to use the perferred OC.AppConfig.setValue() instead 2012-08-26 22:05:34 -04:00
Georg Ehrke
80374c7cb2 fix UI bug with subadmins 2012-08-25 14:35:24 +02:00
Georg Ehrke
ced234a81a rename subadmin to group admin 2012-08-17 16:00:24 +02:00
Michael Gapczynski
9d2ae5fa1f Add infinite scrolling to Settings -> Users, still a little buggy 2012-08-11 16:25:27 -04:00
Michael Gapczynski
baa0b4d530 Cast subadmin groups as strings 2012-08-11 16:25:27 -04:00
Jakob Sack
1ce2cd73ff Add first version of backgroundjobs settings 2012-08-09 10:41:10 +02:00
Thomas Tanghus
97853a1ae5 Restructure JS code and small fixes. 2012-08-04 23:48:36 +02:00
Michael Gapczynski
f95ca36b49 Listen to correct undo click for undoing deleting users 2012-08-04 17:03:36 -04:00
Michael Gapczynski
1ec27399a7 Show delete tipsy for users 2012-08-04 17:00:16 -04:00
Michael Gapczynski
002ad4ba16 Tweak users delete notification 2012-08-04 16:44:26 -04:00
Thomas Tanghus
24af2e8078 Load OCS apps in an ajax call to avoid blocking the WUI. 2012-08-04 20:16:32 +02:00
Alessandro Cosentino
226af11f33 reset version number when not specified - again bug oc-1433 2012-08-04 13:08:55 -04:00
Georg Ehrke
1bccc80996 hide morelog button if there are no more log entries - bugfix for oc-1398 2012-08-04 17:38:31 +02:00
Georg Ehrke
47e4793c30 little fix for previous commit 2012-08-01 18:04:06 +02:00
Georg Ehrke
8766b3286b fix a subadmin UI bug 2012-08-01 18:03:08 +02:00
Michael Gapczynski
7050f0fa67 Cast groups as string, fixes bug oc-1309. Thanks to nderambure. 2012-07-26 23:54:25 -04:00
Georg Ehrke
88f66460a3 some js improvements for subadmins 2012-07-21 13:10:51 +02:00
Georg Ehrke
bf9b6e9ccc don't show label 'add group' for subadmins and remove some debug code 2012-07-20 17:18:40 +02:00
Georg Ehrke
4700222ea9 Merge branch 'master' into subadmin 2012-07-15 16:33:17 +02:00
Georg Ehrke
e707e94857 subadmins can now add users 2012-07-15 16:31:28 +02:00
Michael Gapczynski
b455149bae Fix undo delete user 2012-07-14 16:57:16 -04:00
Michael Gapczynski
8890a41280 Fix setting custom quota size for users, bug fix for oc-1128 2012-07-11 18:25:08 -04:00
Sam Tuke
825d92d59c Added undo functionality to delete user procedure on user settings page 2012-07-04 14:30:42 +01:00
Michael Gapczynski
7ceba61413 Revert "bugfix for #1098 (assigning a group to a user, the group appears incrementally many times the more you assign it)" 
This reverts commit 265d7e50f5.
 2012-07-01 11:29:02 -04:00