wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
39471 commits 157 branches 562 tags 714 MiB
Commit graph

39471 commits

This branch
This branch
All branches
Author SHA1 Message Date
Morris Jobke
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
Morris Jobke
b58928b4c1 Also use IMailer interface to generate the email template 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-06-06 10:47:48 -05:00
Morris Jobke
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
Robin Appelman
340fdc1e70
reword sessions to security in personal settings 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-06-06 15:25:28 +02:00
Morris Jobke
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
Morris Jobke
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
Morris Jobke
edec9ade80 Update autoloader 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-06-06 08:04:26 -05:00
Joas Schilling
3af8abb098
Allow to overwrite the email template again 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-06-06 14:23:03 +02:00
Joas Schilling
3ed8ad1584
Bring back the description for app passwords 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-06-06 13:44:37 +02:00
Joas Schilling
f39fdaf46e
adjust the test 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-06-06 11:42:48 +02:00
Bjoern Schiessle
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
Morris Jobke
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
Nextcloud bot
bb884c341f
[tx-robot] updated from transifex 2017-06-06 00:08:45 +00:00
Nextcloud bot
f901861f81
[tx-robot] updated from transifex 2017-06-05 00:08:29 +00:00
Morris Jobke
529d8122bb Merge pull request #4791 from nextcloud/permalink_copy_on_click 
Copy permalink directly on click
 2017-06-04 12:18:53 -05:00
Nextcloud bot
f03d6f225e
[tx-robot] updated from transifex 2017-06-04 00:08:29 +00:00
Nextcloud bot
5d39f700e4
[tx-robot] updated from transifex 2017-06-03 00:09:00 +00:00
blizzz
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
blizzz
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
Joas Schilling
19041ed1a8
Also cover the settings endpoint 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-06-02 12:31:37 +02:00
Björn Schießle
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
Joas Schilling
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
Nextcloud bot
c70de161cf
[tx-robot] updated from transifex 2017-06-02 00:08:30 +00:00
Arthur Schiwon
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
Joas Schilling
d4f3d85e3c Merge pull request #5110 from nextcloud/rakekniven-patch-1 
l10n change
 2017-06-01 11:58:16 +02:00
Arthur Schiwon
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
Nextcloud bot
8801b68d45
[tx-robot] updated from transifex 2017-06-01 00:08:38 +00:00
Arthur Schiwon
2bbd5147e7
remove check, user_webdavauth is not an app anymore for long 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2017-06-01 01:33:04 +02:00
blizzz
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
rakekniven
f2d999aa70 Update setupchecks.js 
Fixed typo and removed doclink symbol.
Reported at transifex

Update util.php

Another l10n improvement from transifex.

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-05-31 13:41:45 +02:00
Morris Jobke
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
Joas Schilling
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
Nextcloud bot
5f9cc5a2d5
[tx-robot] updated from transifex 2017-05-31 00:08:48 +00:00
Joas Schilling
1d227d83c0 Merge pull request #5116 from McNetic/zipstreamer 
Always enable Zip64 extension for zipstreamer
 2017-05-30 12:37:01 +02:00
Joas Schilling
bd19eef2ae Merge pull request #5135 from patschi/remove-appmenu-limit 
Remove appmenu limit
 2017-05-30 11:51:10 +02:00
Christoph Wurst
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
Nextcloud bot
b9b7f8bede
[tx-robot] updated from transifex 2017-05-30 00:08:44 +00:00
Bjoern Schiessle
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
comradekingu
864b21dd46 no "mail" or mid sentence "E-mail" 2017-05-29 18:16:09 +02:00
Nextcloud bot
4be17dff0f
[tx-robot] updated from transifex 2017-05-29 00:08:33 +00:00
Lukas Reschke
caccb9ca9c Merge pull request #5126 from nextcloud/setting-the-same-email-shouldnt-trigger-activity 
Don't trigger activity when the email didn't change
 2017-05-28 18:25:09 +01:00
Nextcloud bot
4f2b26d246
[tx-robot] updated from transifex 2017-05-28 00:08:14 +00:00
Nextcloud bot
e3e3e8edf2
[tx-robot] updated from transifex 2017-05-27 00:08:32 +00:00
Patrik Kernstock
65d52a1ddf Closed #5121, remove appmenu limit 
Signed-off-by: Patrik Kernstock <info@pkern.at>
 2017-05-26 19:39:22 +02:00
Arthur Schiwon
b79f9cadc2
fix paging 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2017-05-26 13:44:43 +02:00
Joas Schilling
7ef6f065ca
Don't trigger activity when the email didn't change 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-05-26 12:49:12 +02:00
Björn Schießle
53c8e98f69 Merge pull request #5095 from patschi/patch-1 
Fix #5059 by adding sanity checks before using var
 2017-05-26 12:10:57 +02:00
Arthur Schiwon
a619d349bf
add convenience script to run all tests at once 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2017-05-26 11:31:26 +02:00
Arthur Schiwon
f11d998371
Make IDE happy 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2017-05-26 11:30:43 +02:00
Arthur Schiwon
10ef98a3b1
add missing INotificationManager when creating User backend, LDAP 
UserManager

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2017-05-26 11:25:54 +02:00