Commit Graph

1531 Commits

Author SHA1 Message Date
Volkan Gezer ad1265da13 typo fix, by translators on transifex 2014-04-25 16:26:30 +02:00
Jenkins for ownCloud 3fc809dfd8 [tx-robot] updated from transifex 2014-04-25 01:56:28 -04:00
Bjoern Schiessle 6650be9913 add setting to set default expire date 2014-04-24 13:34:31 +02:00
Jenkins for ownCloud 435672feaa [tx-robot] updated from transifex 2014-04-24 01:55:33 -04:00
Jenkins for ownCloud 3f453d1641 [tx-robot] updated from transifex 2014-04-23 01:56:35 -04:00
David Prévot eebb756c38 Adapt chosen (css) path
Avoid shipping duplicate files in 3rdparty/css.

3rdparty/css/chosen/ already contains chosen.css and chosen-sprite.png
so its useless to duplicate them in 3rdparty/css.

Taking the same approach as in apps/calendar/appinfo/app.php and
apps/files_external/settings.php.
2014-04-22 14:15:09 -04:00
Thomas Müller 54476c468c fix spelling 'Allow user ...' -> 'Allow users ...' 2014-04-22 09:34:08 +02:00
Jenkins for ownCloud a9b4fba528 [tx-robot] updated from transifex 2014-04-22 01:54:58 -04:00
Lukas Reschke e88731a477 Some more PHPDoc fixes 2014-04-21 15:44:54 +02:00
Jenkins for ownCloud 4fe5ca1908 [tx-robot] updated from transifex 2014-04-21 01:56:06 -04:00
Lukas Reschke eecd4bd18e Use JS as content-type due to mimesniffing 2014-04-17 10:40:19 +02:00
Jenkins for ownCloud 23f2c48a43 [tx-robot] updated from transifex 2014-04-16 01:57:34 -04:00
Volkan Gezer 1903895172 Make email display name change translatable again 2014-04-15 00:27:54 +02:00
Jenkins for ownCloud 2a2aabbdaf [tx-robot] updated from transifex 2014-04-14 01:55:09 -04:00
Jenkins for ownCloud 982d2bcc5b [tx-robot] updated from transifex 2014-04-13 01:55:12 -04: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
Jenkins for ownCloud 7c072510d3 [tx-robot] updated from transifex 2014-04-10 01:55:39 -04:00
Joas Schilling e79a027e77 Always define sendmail_is_available
Fix #8048
2014-04-09 10:18:46 +02:00
Jenkins for ownCloud 796f719548 [tx-robot] updated from transifex 2014-04-09 01:56:49 -04:00
Jenkins for ownCloud 4ad4b9768c [tx-robot] updated from transifex 2014-04-08 01:57:51 -04: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
Jenkins for ownCloud e295d48fd4 [tx-robot] updated from transifex 2014-04-07 01:56:11 -04:00
Volkan Gezer 286323f7a4 Fix some localization issues with file encryption/decription strings 2014-04-05 19:28:53 +02:00
Lukas Reschke 33a2aa8865 Delete oauth.css 2014-04-04 22:38:16 +02:00
Lukas Reschke b2f8e34388 Remove uneeded file
This file seems not to be actually used anywhere.
2014-04-04 22:14:51 +02:00
Jenkins for ownCloud 0805f678cc [tx-robot] updated from transifex 2014-04-04 01:57:01 -04:00
Thomas Müller 20f26068e7 Merge pull request #7476 from owncloud/type-hinting
Type hinting
2014-04-03 20:02:27 +02:00
Jan-Christoph Borchardt 5301056ab1 fix h3 style, move out from settings to apps CSS 2014-04-02 09:18:33 +02:00
Jenkins for ownCloud 73dd5ff26c [tx-robot] updated from transifex 2014-04-02 01:56:39 -04: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
blizzz a179335775 Merge pull request #7940 from owncloud/settings-userlistajaxcallfix
Fixed user list offset call
2014-04-01 14:17:05 +02:00
Vincent Petry 5807681c09 Merge pull request #7975 from owncloud/fix-7973-master-2
remove pl_PL - fixes #7973
2014-04-01 12:38:47 +02:00
Vincent Petry 18acfa8bb3 Merge pull request #7915 from owncloud/replace-personalblock
Replace personalblock with .section
2014-04-01 11:20:16 +02:00
Jenkins for ownCloud 7a4a836abe [tx-robot] updated from transifex 2014-04-01 01:56:15 -04:00
Bart Visscher 6b061c236d Merge branch 'master' into type-hinting
Conflicts:
	lib/private/image.php
	lib/private/l10n.php
	lib/private/request.php
	lib/private/share/mailnotifications.php
	lib/private/template/base.php
2014-03-31 21:38:54 +02:00
Thomas Müller fe2c6f4e6d remove pl_PL - fixes #7973 2014-03-31 18:03:42 +02:00
Morris Jobke ab696edba6 Merge pull request #7916 from owncloud/fix-input-sizes
Fix input sizes
2014-03-31 15:56:19 +02:00
Jan-Christoph Borchardt 2be2a5d2c5 external storage: fix merge conflict, indentation 2014-03-31 13:12:04 +02:00
raghunayyar 881c66df52 Removes highlighting of selected items, padding from apps management. 2014-03-30 15:48:47 +05:30
Jenkins for ownCloud bfb0b9a044 [tx-robot] updated from transifex 2014-03-30 01:55:42 -04:00
Jenkins for ownCloud 915fa3da74 [tx-robot] updated from transifex 2014-03-29 01:55:44 -04:00
Vincent Petry 82f98fb3d3 Fixed user list offset call 2014-03-28 18:12:34 +01:00
Thomas Müller 5fa8f7cf12 Merge pull request #7107 from owncloud/load-apps-proper-master
Load apps proper master
2014-03-28 10:33:55 +01:00
Jenkins for ownCloud ccc55f40e6 [tx-robot] updated from transifex 2014-03-28 01:55:47 -04:00
Jan-Christoph Borchardt 53b1e4a00b remove additional radio button width declaration 2014-03-27 17:13:12 +01:00
Jan-Christoph Borchardt 5b2abb32a6 remove CSS rules for personalblock, remove it from core 2014-03-27 17:00:47 +01:00
Jan-Christoph Borchardt 69be5bdbd8 replace personalblock fieldset with section div in admin and personal settings 2014-03-27 17:00:47 +01:00
Jenkins for ownCloud ed0cba0ff4 [tx-robot] updated from transifex 2014-03-27 01:56:30 -04:00
Thomas Müller 1816f43722 Merge pull request #7864 from owncloud/routing-performance
Routing performance
2014-03-25 23:00:36 +01:00
Thomas Müller 4900ad9119 update type hint in PHPDoc 2014-03-25 22:59:42 +01:00
Vincent Petry 5111fad006 Merge pull request #7689 from owncloud/last_cron_log
Log last cron execution
2014-03-25 19:17:36 +01:00
Thomas Müller f9279ac77a killing some more calls to OC_App::loadApps(); - because we load all apps in handleRequest() 2014-03-25 17:42:41 +01:00
Thomas Müller 531c9564b3 Merge pull request #7861 from owncloud/idn-domains-support-on-emails-master
idn have to be converted before being used
2014-03-25 12:38:32 +01:00
Jenkins for ownCloud b92dad992f [tx-robot] updated from transifex 2014-03-25 01:55:34 -04:00
Thomas Müller 3eb5898f7b use \OC_Mail::validateAddress() to validate the email address - fixes #7862 2014-03-24 15:35:07 +01:00
raghunayyar 3d8ce8104f Adds Style changes to app-navigation in core/css/apps.css 2014-03-24 17:59:53 +05:30
Jenkins for ownCloud abdc823bb6 [tx-robot] updated from transifex 2014-03-24 01:55:51 -04:00
Jenkins for ownCloud 0245e64cec [tx-robot] updated from transifex 2014-03-22 01:56:09 -04:00
kondou e6b4d28229 Move success/error squircles to settings 2014-03-21 20:27:22 +01:00
kondou dda7129a24 Merge branch 'master' of https://github.com/owncloud/core into last_cron_log 2014-03-21 20:23:31 +01:00
Jenkins for ownCloud bcf388d3c5 [tx-robot] updated from transifex 2014-03-21 01:55:35 -04:00
raghunayyar 59d1ee565e Makes #app-navigation a part of app management. 2014-03-20 13:34:50 +05:30
Jenkins for ownCloud 3aa8647634 [tx-robot] updated from transifex 2014-03-20 01:56:42 -04:00
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 556c6eca23 Use OC_Util::formatDate() 2014-03-12 17:53:39 +01:00
kondou c5440fa133 Move cron status to the right of the heading 2014-03-12 17:29:26 +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
kondou 547b563464 Log last cron execution
Fixes #2012
2014-03-12 15:20:51 +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
Bart Visscher 8951328a87 More PHPDoc updates 2014-02-28 21:03:43 +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