Commit Graph

39347 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
blizzz de953b4d74 Merge pull request #5090 from nextcloud/try-fixing-missing-background-jobs-on-app-update
Register the autoloading earlier so we can load the background jobs
2017-05-26 10:43:08 +02:00
Nextcloud bot c1925ddfd0
[tx-robot] updated from transifex 2017-05-26 00:08:16 +00:00
Nicolai Ehemann 619afd499e Always enable Zip64 extension for zipstreamer
Signed-off-by: Nicolai Ehemann <en@enlightened.de>
2017-05-25 22:30:03 +02:00
rakekniven ee80f02a46 l10n change
See https://www.transifex.com/nextcloud/nextcloud/translate/#nb_NO/sharebymail/108178153
2017-05-25 14:23:56 +02:00
Nextcloud bot a46d2f1d39
[tx-robot] updated from transifex 2017-05-25 00:08:04 +00:00
Arthur Schiwon bd5d12528f
make sure used ldap connection resource is always up to date
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-05-25 00:45:48 +02:00
bline 8c89bf7c59
moved to something a little less invasive. back to passing CR around.
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-05-25 00:36:51 +02:00
bline 8829d84949
special case for controlPagedResultResponse. It would be nice if there was a generic way to pass by reference with call_user_func_array..
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-05-25 00:34:52 +02:00
Patrik Kernstock dba8927011 Fix #5059 by adding sanity checks before using var
Signed-off-by: Patrik Kernstock <info@pkern.at>
2017-05-24 15:08:29 +02:00
Joas Schilling 3f29c55914
Register the autoloading earlier so we can load the background jobs
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-05-24 12:58:10 +02:00
Nextcloud bot 6cc26efbc5
[tx-robot] updated from transifex 2017-05-24 00:08:22 +00:00
Roeland Jago Douma 91315f63cf
Copy permalink directly on click
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-05-23 13:44:42 +02:00
Roeland Jago Douma 30ac7ec2bf Merge pull request #5004 from nextcloud/bugfix/fix_replacing_4mbunicode_for_calendar_properties_table
fix replacing of 4MB Unicode Chars in cal props table
2017-05-23 13:26:10 +02:00
Roeland Jago Douma 250db249b5 Merge pull request #5042 from nextcloud/external-get-for-group-sql-type
use the correct param type when getting external storages for groups
2017-05-23 11:36:20 +02:00
Roeland Jago Douma 3aee260737 Merge pull request #4969 from nextcloud/fix-broken-activity-avatars-with-external-users
Fix username and avatar for external users
2017-05-23 08:33:49 +02:00
Nextcloud bot 9c8a838624
[tx-robot] updated from transifex 2017-05-23 00:08:29 +00:00
Robin Appelman 0baeec170e
use the correct param type when getting external storages for groups
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-05-22 17:39:56 +02:00
Joas Schilling 1efd961476 Merge pull request #5010 from nextcloud/fix-starting-lower-case-letter-in-tooltip-of-theming-app
Fix starting lower case letter in tooltip of Theming app
2017-05-22 15:03:18 +02:00