929882a32a
[tx-robot] updated from transifex
2014-05-30 01:55:11 -04:00
5cd0fd2559
Merge pull request #8700 from owncloud/design-smallfixes
...
Design detail fixes
2014-05-29 21:54:15 +02:00
368006c7af
[tx-robot] updated from transifex
2014-05-29 01:54:40 -04:00
dc83b17f49
Fix double "saved" message when changing email settings
2014-05-28 11:50:55 +02:00
80641cae72
[tx-robot] updated from transifex
2014-05-28 01:56:09 -04:00
e70ed36d8e
Merge pull request #8740 from owncloud/l10n-forgotten-tags
...
reverts 188c543
2014-05-27 14:47:21 +02:00
1a22478446
reverts 188c543 and translates only mail
2014-05-27 12:58:46 +02:00
17276af6ad
Merge pull request #8733 from owncloud/l10n-forgotten-tags
...
unwrapped strings fix
2014-05-27 11:55:33 +02:00
a756666585
[tx-robot] updated from transifex
2014-05-27 01:54:54 -04:00
188c5435d8
unwrapped strings fix
2014-05-27 03:48:24 +02:00
790c0e8e7c
[tx-robot] updated from transifex
2014-05-26 01:55:36 -04:00
3029029afd
[tx-robot] updated from transifex
2014-05-25 01:54:35 -04:00
2afdd1bf1a
[tx-robot] updated from transifex
2014-05-24 01:55:34 -04:00
c6c4bb62e1
move saved notification for mail server, so it's smaller
2014-05-23 18:09:45 +02:00
b1ccfcde9e
fix border-radius in settings to 3px
2014-05-23 18:07:25 +02:00
12338e0ef0
allow admin to disable sharing for specific groups of users
2014-05-22 10:43:44 +02:00
40fc1d5b4b
[tx-robot] updated from transifex
2014-05-20 01:54:53 -04:00
30f1ec2521
Merge branch 'master' into test_annotations_working
...
Conflicts:
lib/private/util.php
2014-05-19 21:42:30 +02:00
d52252998a
[tx-robot] updated from transifex
2014-05-19 01:54:46 -04:00
a7509e5fd9
[tx-robot] updated from transifex
2014-05-18 01:55:01 -04:00
a1b356c7b6
[tx-robot] updated from transifex
2014-05-17 01:57:38 -04:00
b52cb8f557
Merge pull request #8604 from owncloud/sharing_encforce_password
...
allow admin to enforce passwords for public link shares
2014-05-16 12:23:01 -04:00
b6e14af861
allow admin to enforce passwords for public link shares
2014-05-16 17:41:09 +02:00
1fb0d5412c
Merge pull request #6260 from owncloud/jan-navigation-filesidebar
...
Files app navigation sidebar
2014-05-16 13:00:35 +02:00
43d6650d19
[tx-robot] updated from transifex
2014-05-16 01:55:55 -04:00
9ccb3279dd
Added app navigation for files app
...
- Added links to trashbin and shared dir
- Moved "WebDAV" settings block to the app nav's settings section
- Added sidebar support in trashbin app as well
2014-05-15 17:51:04 +02:00
3daaf6ba4f
Merge pull request #8597 from owncloud/l10n-fix-typo
...
fix typo encryption
2014-05-15 10:05:37 +02:00
d9d684197a
[tx-robot] updated from transifex
2014-05-15 01:55:53 -04:00
5291f47c66
fix typo encryption
2014-05-15 01:29:14 +02:00
dab3cb65cf
Merge pull request #8522 from owncloud/sharing_ux_improvements
...
Sharing ux improvements
2014-05-14 12:54:27 -04:00
b8de1e5d71
Merge pull request #8398 from owncloud/enc_backup_keys
...
backup the encryption key after the encryption was disabled
2014-05-13 09:25:16 -04:00
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
ec045b251c
hide input field if default expire date isn't activated
2014-05-13 11:28:25 +02:00
e0dd69e4e6
remove legacy aka deprecated code: OC_FilesystemView
2014-05-12 16:30:39 +02:00
f4e8de3cbb
[tx-robot] updated from transifex
2014-05-12 01:55:44 -04:00
b6d76e9985
[tx-robot] updated from transifex
2014-05-11 01:57:00 -04:00
b7981910f7
adopt new settings style
2014-05-09 22:53:01 +02:00
287c8981bc
Check if ReflectionMethod::getDocComment is working
2014-05-09 22:44:55 +02:00
283b483100
[tx-robot] updated from transifex
2014-05-07 01:55:48 -04:00
cf20de185c
[tx-robot] updated from transifex
2014-05-03 01:56:11 -04:00
17f5a18922
[tx-robot] updated from transifex
2014-05-01 01:56:01 -04:00
654a6e6c6a
[tx-robot] updated from transifex
2014-04-30 01:57:53 -04:00
b4a5093da8
[tx-robot] updated from transifex
2014-04-29 01:56:49 -04:00
e27dc5b6f9
Merge pull request #8309 from DavidPrevot/chosen
...
Adapt chosen (css) path
2014-04-28 12:34:40 +02:00
642f57c1d5
[tx-robot] updated from transifex
2014-04-28 01:56:24 -04:00
8e5c9eea3a
[tx-robot] updated from transifex
2014-04-27 01:54:54 -04:00
c591cf0836
[tx-robot] updated from transifex
2014-04-26 01:55:32 -04:00
ad1265da13
typo fix, by translators on transifex
2014-04-25 16:26:30 +02:00
3fc809dfd8
[tx-robot] updated from transifex
2014-04-25 01:56:28 -04:00
6650be9913
add setting to set default expire date
2014-04-24 13:34:31 +02:00
435672feaa
[tx-robot] updated from transifex
2014-04-24 01:55:33 -04:00
3f453d1641
[tx-robot] updated from transifex
2014-04-23 01:56:35 -04:00
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
54476c468c
fix spelling 'Allow user ...' -> 'Allow users ...'
2014-04-22 09:34:08 +02:00
a9b4fba528
[tx-robot] updated from transifex
2014-04-22 01:54:58 -04:00
e88731a477
Some more PHPDoc fixes
2014-04-21 15:44:54 +02:00
4fe5ca1908
[tx-robot] updated from transifex
2014-04-21 01:56:06 -04:00
eecd4bd18e
Use JS as content-type due to mimesniffing
2014-04-17 10:40:19 +02:00
23f2c48a43
[tx-robot] updated from transifex
2014-04-16 01:57:34 -04:00
1903895172
Make email display name change translatable again
2014-04-15 00:27:54 +02:00
2a2aabbdaf
[tx-robot] updated from transifex
2014-04-14 01:55:09 -04:00
982d2bcc5b
[tx-robot] updated from transifex
2014-04-13 01:55:12 -04:00
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
7c072510d3
[tx-robot] updated from transifex
2014-04-10 01:55:39 -04:00
e79a027e77
Always define sendmail_is_available
...
Fix #8048
2014-04-09 10:18:46 +02:00
796f719548
[tx-robot] updated from transifex
2014-04-09 01:56:49 -04:00
4ad4b9768c
[tx-robot] updated from transifex
2014-04-08 01:57:51 -04:00
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
e295d48fd4
[tx-robot] updated from transifex
2014-04-07 01:56:11 -04:00
286323f7a4
Fix some localization issues with file encryption/decription strings
2014-04-05 19:28:53 +02:00
33a2aa8865
Delete oauth.css
2014-04-04 22:38:16 +02:00
b2f8e34388
Remove uneeded file
...
This file seems not to be actually used anywhere.
2014-04-04 22:14:51 +02:00
0805f678cc
[tx-robot] updated from transifex
2014-04-04 01:57:01 -04:00
20f26068e7
Merge pull request #7476 from owncloud/type-hinting
...
Type hinting
2014-04-03 20:02:27 +02:00
5301056ab1
fix h3 style, move out from settings to apps CSS
2014-04-02 09:18:33 +02:00
73dd5ff26c
[tx-robot] updated from transifex
2014-04-02 01:56:39 -04:00
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
a179335775
Merge pull request #7940 from owncloud/settings-userlistajaxcallfix
...
Fixed user list offset call
2014-04-01 14:17:05 +02:00
5807681c09
Merge pull request #7975 from owncloud/fix-7973-master-2
...
remove pl_PL - fixes #7973
2014-04-01 12:38:47 +02:00
18acfa8bb3
Merge pull request #7915 from owncloud/replace-personalblock
...
Replace personalblock with .section
2014-04-01 11:20:16 +02:00
7a4a836abe
[tx-robot] updated from transifex
2014-04-01 01:56:15 -04:00
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
fe2c6f4e6d
remove pl_PL - fixes #7973
2014-03-31 18:03:42 +02:00
ab696edba6
Merge pull request #7916 from owncloud/fix-input-sizes
...
Fix input sizes
2014-03-31 15:56:19 +02:00
2be2a5d2c5
external storage: fix merge conflict, indentation
2014-03-31 13:12:04 +02:00
881c66df52
Removes highlighting of selected items, padding from apps management.
2014-03-30 15:48:47 +05:30
bfb0b9a044
[tx-robot] updated from transifex
2014-03-30 01:55:42 -04:00
915fa3da74
[tx-robot] updated from transifex
2014-03-29 01:55:44 -04:00
82f98fb3d3
Fixed user list offset call
2014-03-28 18:12:34 +01:00
5fa8f7cf12
Merge pull request #7107 from owncloud/load-apps-proper-master
...
Load apps proper master
2014-03-28 10:33:55 +01:00
ccc55f40e6
[tx-robot] updated from transifex
2014-03-28 01:55:47 -04:00
53b1e4a00b
remove additional radio button width declaration
2014-03-27 17:13:12 +01:00
5b2abb32a6
remove CSS rules for personalblock, remove it from core
2014-03-27 17:00:47 +01:00
69be5bdbd8
replace personalblock fieldset with section div in admin and personal settings
2014-03-27 17:00:47 +01:00
ed0cba0ff4
[tx-robot] updated from transifex
2014-03-27 01:56:30 -04:00
1816f43722
Merge pull request #7864 from owncloud/routing-performance
...
Routing performance
2014-03-25 23:00:36 +01:00
4900ad9119
update type hint in PHPDoc
2014-03-25 22:59:42 +01:00
5111fad006
Merge pull request #7689 from owncloud/last_cron_log
...
Log last cron execution
2014-03-25 19:17:36 +01:00
f9279ac77a
killing some more calls to OC_App::loadApps(); - because we load all apps in handleRequest()
2014-03-25 17:42:41 +01:00
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
b92dad992f
[tx-robot] updated from transifex
2014-03-25 01:55:34 -04:00
3eb5898f7b
use \OC_Mail::validateAddress() to validate the email address - fixes #7862
2014-03-24 15:35:07 +01:00
3d8ce8104f
Adds Style changes to app-navigation in core/css/apps.css
2014-03-24 17:59:53 +05:30
abdc823bb6
[tx-robot] updated from transifex
2014-03-24 01:55:51 -04:00
0245e64cec
[tx-robot] updated from transifex
2014-03-22 01:56:09 -04:00
e6b4d28229
Move success/error squircles to settings
2014-03-21 20:27:22 +01:00
dda7129a24
Merge branch 'master' of https://github.com/owncloud/core into last_cron_log
2014-03-21 20:23:31 +01:00
bcf388d3c5
[tx-robot] updated from transifex
2014-03-21 01:55:35 -04:00
59d1ee565e
Makes #app-navigation a part of app management.
2014-03-20 13:34:50 +05:30
3aa8647634
[tx-robot] updated from transifex
2014-03-20 01:56:42 -04:00
7b1d52f5b9
[tx-robot] updated from transifex
2014-03-19 01:55:39 -04:00
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
518903c6eb
[tx-robot] updated from transifex
2014-03-17 01:56:06 -04:00
c89aa6d5fe
[tx-robot] updated from transifex
2014-03-16 03:13:21 -04:00
b2e929d580
[tx-robot] updated from transifex
2014-03-15 02:14:22 -04:00
4b802aa7cb
[tx-robot] updated from transifex
2014-03-13 17:12:37 -04:00
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
1295e54173
[tx-robot] updated from transifex
2014-03-13 01:55:50 -04:00
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
556c6eca23
Use OC_Util::formatDate()
2014-03-12 17:53:39 +01:00
c5440fa133
Move cron status to the right of the heading
2014-03-12 17:29:26 +01:00
8fafee31ef
Use $.hide() instead of .hidden for now
...
.inlineblock ranks higher than .hidden
2014-03-12 15:42:29 +01:00
dd97d532be
Remove OC.Router usage
2014-03-12 15:31:48 +01:00
1c82b4751e
Merge branch 'master' into hide_remove_image_avatar
2014-03-12 15:29:26 +01:00
547b563464
Log last cron execution
...
Fixes #2012
2014-03-12 15:20:51 +01:00
efbca04ab4
Use command -v to check for sendmail
...
Fix #7559
2014-03-12 11:47:21 +01:00
8320b8eb7a
[tx-robot] updated from transifex
2014-03-12 01:57:17 -04:00
5713b0dedb
Authentification -> Authentication
2014-03-11 16:24:50 +01:00
b0ec38e202
[tx-robot] updated from transifex
2014-03-11 01:59:39 -04:00
32b29c9d73
Merge branch 'master' into fix-7307
...
Conflicts:
core/js/router.js
settings/js/admin.js
2014-03-06 00:15:08 +01:00
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
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
5b8cde48dc
Add button to send a test mail after changing the email settings
...
Fix #7175
2014-03-05 10:01:34 +01:00
af2c2b3a16
update wording of email field
2014-03-04 10:22:54 +01:00
5f711912a1
remove OC.Router.registerLoadedCallback()
2014-03-02 23:45:23 +01:00
1291303c5a
Replace OC.Router.generate() with OC.generateUrl()
2014-03-02 22:30:24 +01:00
8951328a87
More PHPDoc updates
2014-02-28 21:03:43 +01:00
3c11dc0006
Merge branch 'master' into hide_remove_image_avatar
2014-02-28 19:28:29 +01:00
e78da036c1
profile image: relabel technical 'Abort' to more widely used 'Cancel'
2014-02-28 10:09:34 +01:00
86b3cdc132
close encryption session after decryption was finished
2014-02-26 17:18:38 +01:00
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
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
9847912257
Remove unused variables, add doc blocks and break lines
...
Fix #7166
2014-02-26 13:10:46 +01:00
593adab258
Fix scrutinizer issue in settings/js/apps.js
2014-02-26 11:41:32 +01:00
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
bc1c136cd6
coding style fixes: cut long lines, whitespace
2014-02-26 10:34:38 +01:00
331bd527a7
Hide SMTP options based on selected send mode
...
Fix #7166
2014-02-26 10:30:22 +01:00
1a561fced0
fix for coding style
2014-02-26 09:32:20 +01:00
e32acf933d
Highlight the selected app in app-settings
2014-02-26 04:03:41 +01:00
80481a1e41
Merge branch 'master' into mobile-header
2014-02-21 12:46:09 +01:00
Jenkins for ownCloud
Lukas Reschke
Joas Schilling
Volkan Gezer
Volkan Gezer
Vincent Petry
Jan-Christoph Borchardt
Bjoern Schiessle
Thomas Müller
Thomas Tanghus
David Prévot
Morris Jobke
blizzz
Bart Visscher
raghunayyar
kondou
Morris Jobke
Robin Appelman