Commit Graph

335 Commits

Author SHA1 Message Date
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