42294612d7
Fix missing js merge on master
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-06-09 14:33:14 +02:00
0433c4e4cf
Merge pull request #5118 from nextcloud/use-language-of-recipient-not-admin
...
Use the language of the recipient not the actor
2017-06-09 11:34:08 +02:00
e99bcc496d
Merge pull request #5308 from nextcloud/fix_running_only_dav_tests
...
add missing parent::setUp that broke any other dav app test
2017-06-09 10:46:31 +02:00
628284a34c
[tx-robot] updated from transifex
2017-06-09 00:08:24 +00:00
a0c2e6e922
add missing parent::setUp that broke any other dav app test
...
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2017-06-08 19:26:36 +02:00
3384c5fb70
Merge pull request #5287 from nextcloud/personal-page-gs-mode
...
show input fields if they are not empty but disable them in global scale mode
2017-06-08 15:03:58 +02:00
a74901fce1
[tx-robot] updated from transifex
2017-06-08 00:08:26 +00:00
a753fbe818
Merge pull request #5185 from nextcloud/error-spam-in-log
...
Don't try to generate logs for chunking paths
2017-06-07 17:12:47 -05:00
e934e5104d
Merge pull request #5277 from nextcloud/fix-personal-settings-regression
...
Allow to change avatar when groups are disables
2017-06-07 11:43:02 -05:00
3ad4a2839f
Allow to change avatar when groups are disables
...
* password form overlaps upload button and doesn't allow to click it
* regression from #5259
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
make sure that we always clear all floating rules after the user settings parts
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-06-07 11:27:27 -05:00
1ad4268046
unify look of disabled display name / email address and the other input fields
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-06-07 18:07:53 +02:00
f5731e1ba4
show input fields if they are not empty but disable them in global scale mode
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-06-07 17:13:29 +02:00
3678be045e
Merge pull request #5267 from nextcloud/personal-sessions-renamwe
...
reword sessions to security in personal settings
2017-06-07 10:11:08 +02:00
a3c5d43cd5
[tx-robot] updated from transifex
2017-06-07 00:09:00 +00:00
72235064fb
Merge pull request #5259 from nextcloud/disable-groups-on-personal-page
...
allow admin to disable groups on personal page
2017-06-06 11:30:08 -05:00
4a3e118add
Merge pull request #5268 from nextcloud/allow-to-theme-emails
...
Allow to overwrite the email template again
2017-06-06 10:00:34 -05:00
340fdc1e70
reword sessions to security in personal settings
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-06-06 15:25:28 +02:00
15314b6f5b
Merge pull request #5223 from nextcloud/do-not-allow-to-set-invisible-fields
...
Don't allow the user to set fields they can't see
2017-06-06 08:06:39 -05:00
811f7b527a
Merge pull request #5265 from nextcloud/follow-up-5166-bring-back-description
...
Bring back the description for app passwords
2017-06-06 08:04:40 -05:00
edec9ade80
Update autoloader
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-06-06 08:04:26 -05:00
3af8abb098
Allow to overwrite the email template again
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-06-06 14:23:03 +02:00
3ed8ad1584
Bring back the description for app passwords
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-06-06 13:44:37 +02:00
f39fdaf46e
adjust the test
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-06-06 11:42:48 +02:00
28e1a9da6c
allow admin to disable groups on personal page
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-06-06 09:58:52 +02:00
c092b33466
Merge pull request #5166 from nextcloud/feature/merge-sessions-app-passwords-list
...
Combine sessions and app passwords view into one single view
2017-06-05 23:04:06 -05:00
bb884c341f
[tx-robot] updated from transifex
2017-06-06 00:08:45 +00:00
f901861f81
[tx-robot] updated from transifex
2017-06-05 00:08:29 +00:00
529d8122bb
Merge pull request #4791 from nextcloud/permalink_copy_on_click
...
Copy permalink directly on click
2017-06-04 12:18:53 -05:00
f03d6f225e
[tx-robot] updated from transifex
2017-06-04 00:08:29 +00:00
5d39f700e4
[tx-robot] updated from transifex
2017-06-03 00:09:00 +00:00
2e2d406bf5
Merge pull request #5213 from nextcloud/fix-change-hook
...
Trigger changeUser hook only on real changes
2017-06-02 13:14:33 +02:00
45305c762d
Merge pull request #5209 from nextcloud/fix-install-mysql-mb4
...
fix install on mb4 enabled mariadb/mysql
2017-06-02 13:10:28 +02:00
19041ed1a8
Also cover the settings endpoint
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-06-02 12:31:37 +02:00
74fccf20c8
Merge pull request #5084 from nextcloud/useful-gs-settings
...
add new config switched for the global scale architecture
2017-06-02 10:58:43 +02:00
0e26ba4c2a
Don't allow the user to set fields they can't see
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-06-02 10:09:42 +02:00
c70de161cf
[tx-robot] updated from transifex
2017-06-02 00:08:30 +00:00
18a8f3654b
fix install on mb4 enabled mariadb/mysql
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-06-01 13:44:18 +02:00
d4f3d85e3c
Merge pull request #5110 from nextcloud/rakekniven-patch-1
...
l10n change
2017-06-01 11:58:16 +02:00
999455c1aa
emit changeUser only if there really was a change (quota, displayname)
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-06-01 11:34:17 +02:00
8801b68d45
[tx-robot] updated from transifex
2017-06-01 00:08:38 +00:00
8318b2a137
Merge pull request #5104 from nextcloud/ldap-attempt-reconnect
...
Contd: Add layer on top of LDAP methods to catch server disconnects and attempt re-connection
2017-06-01 01:20:57 +02:00
a0f16c69ac
Merge pull request #5160 from nextcloud/comradekingu-patch-1
...
no "mail" or mid sentence "E-mail"
2017-05-31 11:16:51 +02:00
97e41015b3
Don't try to generate logs for chunking paths
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-05-31 11:10:42 +02:00
5f9cc5a2d5
[tx-robot] updated from transifex
2017-05-31 00:08:48 +00:00
1d227d83c0
Merge pull request #5116 from McNetic/zipstreamer
...
Always enable Zip64 extension for zipstreamer
2017-05-30 12:37:01 +02:00
bd19eef2ae
Merge pull request #5135 from patschi/remove-appmenu-limit
...
Remove appmenu limit
2017-05-30 11:51:10 +02:00
593f6281dc
Combine sessions and app passwords view into one single view
...
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2017-05-30 09:54:10 +02:00
b9b7f8bede
[tx-robot] updated from transifex
2017-05-30 00:08:44 +00:00
7c2d473d76
add new config switched for the global scale architecture
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-05-29 18:19:28 +02:00
864b21dd46
no "mail" or mid sentence "E-mail"
2017-05-29 18:16:09 +02:00
Joas Schilling
Lukas Reschke
Björn Schießle
Nextcloud bot
Georg Ehrke
Morris Jobke
Robin Appelman
blizzz
Christoph Wurst
comradekingu