Commit Graph

1414 Commits

Author SHA1 Message Date
Jenkins for ownCloud 7b1d52f5b9 [tx-robot] updated from transifex 2014-03-19 01:55:39 -04:00
Vincent Petry b75ca9fb50 Display admin option for public upload with encryption enabled
Now that public upload works with encryption, the admin option to toggle
it must be made visible.
2014-03-18 11:28:56 +01:00
Jenkins for ownCloud 518903c6eb [tx-robot] updated from transifex 2014-03-17 01:56:06 -04:00
Jenkins for ownCloud c89aa6d5fe [tx-robot] updated from transifex 2014-03-16 03:13:21 -04:00
Jenkins for ownCloud b2e929d580 [tx-robot] updated from transifex 2014-03-15 02:14:22 -04:00
Jenkins for ownCloud 4b802aa7cb [tx-robot] updated from transifex 2014-03-13 17:12:37 -04:00
Morris Jobke 3c03ff5bb5 Merge pull request #7340 from owncloud/hide_remove_image_avatar
Hide remove image, if there's no custom avatar
2014-03-13 13:20:00 +01:00
Jenkins for ownCloud 1295e54173 [tx-robot] updated from transifex 2014-03-13 01:55:50 -04:00
Vincent Petry 5fcfb2ef84 Merge pull request #7564 from owncloud/issue/7559
Hide QMail when not selected and hide SendMail when not available on the server
2014-03-12 18:32:38 +01:00
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
Joas Schilling efbca04ab4 Use command -v to check for sendmail
Fix #7559
2014-03-12 11:47:21 +01:00
Jenkins for ownCloud 8320b8eb7a [tx-robot] updated from transifex 2014-03-12 01:57:17 -04:00
Thomas Müller 5713b0dedb Authentification -> Authentication 2014-03-11 16:24:50 +01:00
Jenkins for ownCloud b0ec38e202 [tx-robot] updated from transifex 2014-03-11 01:59:39 -04: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 0285d5b6e2 Hide QMail when not selected and hide sendmail when not available on the server
Fix #7559
2014-03-05 14:53:20 +01:00
Joas Schilling d583d61b69 Merge pull request #7412 from owncloud/issue/7175
Add button to send a test mail after changing the email settings
2014-03-05 13:18:41 +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
Morris Jobke af2c2b3a16 update wording of email field 2014-03-04 10:22:54 +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 e78da036c1 profile image: relabel technical 'Abort' to more widely used 'Cancel' 2014-02-28 10:09:34 +01:00
Bjoern Schiessle 86b3cdc132 close encryption session after decryption was finished 2014-02-26 17:18:38 +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
Jan-Christoph Borchardt 1a561fced0 fix for coding style 2014-02-26 09:32:20 +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
Jan-Christoph Borchardt dafa8fc37e do not autocapitalize fields on mobile, fix user name input. Also disable autocorrect and specify autocomplete 2014-02-18 10:58:00 +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
Bjoern Schiessle f2f5769df7 catch errors during decryption 2014-02-17 10:03:57 +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