Arthur Schiwon
|
3ba8b337a4
|
fix unit tests after rebase
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
|
2017-11-09 11:10:59 +01:00 |
|
Arthur Schiwon
|
8113f26eed
|
add Sync test
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
|
2017-11-09 11:10:58 +01:00 |
|
Arthur Schiwon
|
fc6b3902af
|
adjust tests
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
|
2017-11-09 11:10:58 +01:00 |
|
Arthur Schiwon
|
59c05d5447
|
move LDAP user attributes "sync" to background (except for ajax jobs)
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
|
2017-11-09 11:10:56 +01:00 |
|
Arthur Schiwon
|
ef3cd32916
|
don't skip updating when ajax is set as background job mode
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
|
2017-11-09 11:10:04 +01:00 |
|
Arthur Schiwon
|
c6f1af9896
|
move ldap user sync to background (WIP)
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
|
2017-11-09 11:09:59 +01:00 |
Nextcloud bot
|
723a25a315
|
[tx-robot] updated from transifex
|
2017-11-09 09:12:41 +00:00 |
Morris Jobke
|
e6ad00b33d
|
Merge pull request #7117 from nextcloud/fix-welcome-string
Fix welcome text for better grammar in themed instances
|
2017-11-09 10:03:59 +01:00 |
|
Morris Jobke
|
5d8421135e
|
Merge pull request #7014 from nextcloud/rename-locks
Unlock files even if an exception occurs while renaming
|
2017-11-09 09:47:36 +01:00 |
|
Morris Jobke
|
e0aaca1726
|
Merge pull request #7046 from nextcloud/hide-summary-file-actions-when-selected-file-does-not-match
Hide summary file actions when a selected file does not match
|
2017-11-09 09:45:55 +01:00 |
|
Morris Jobke
|
eab2b3b7ae
|
Merge pull request #7027 from nextcloud/Rello-patch-1
Rello patch 1
|
2017-11-09 09:41:01 +01:00 |
|
Morris Jobke
|
6b3975c23a
|
Merge pull request #6846 from nextcloud/filelist-confict-path
still trigger conflict resolution for existing entries when the curre…
|
2017-11-09 09:33:59 +01:00 |
|
Morris Jobke
|
a0aef6ab1b
|
Fix welcome text for better grammar in themed instances
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
|
2017-11-09 09:27:38 +01:00 |
Lukas Reschke
|
2bfa1ce5c3
|
Merge pull request #5568 from nextcloud/ldap-agent-credentials-safe
Ldap agent credentials save
|
2017-11-09 09:26:51 +01:00 |
|
Nextcloud bot
|
aa525d89e8
|
[tx-robot] updated from transifex
|
2017-11-09 01:09:13 +00:00 |
|
Lukas Reschke
|
989a8a3668
|
Merge pull request #6220 from nextcloud/cached-mount-info-filepath
Allow getting the filepath when getting cached mounts by fileid
|
2017-11-09 00:04:25 +01:00 |
|
Lukas Reschke
|
f9d8eb2a2e
|
Merge pull request #7111 from nextcloud/login-button-ios-f
Fix login appearance for ios webkit engine
|
2017-11-09 00:00:07 +01:00 |
|
Morris Jobke
|
e0784c66ed
|
Merge pull request #7109 from nextcloud/fix_6898
If for some reason the json can't be decoded it is not cached
|
2017-11-08 23:33:02 +01:00 |
|
Lukas Reschke
|
8c915baa34
|
Merge pull request #6788 from staabm/master
Prevent XSS in links which open a new browser window
|
2017-11-08 18:55:35 +01:00 |
|
Lukas Reschke
|
d948626736
|
Merge pull request #7110 from nextcloud/fix-flow-redirect
Theming: theme flow redirection page
|
2017-11-08 17:45:38 +01:00 |
|
Morris Jobke
|
5651fdf10c
|
Merge pull request #7107 from nextcloud/revert-6645
Revert "Only allow colons in db host for IPv6 addresses"
|
2017-11-08 17:06:01 +01:00 |
Julius Härtl
|
cd1bfea8c4
|
Theming: theme flow redirection page
Signed-off-by: Julius Härtl <jus@bitgrid.net>
|
2017-11-08 14:56:32 +01:00 |
John Molakvoæ
|
d44cbe3793
|
Fix login appearance for ios webkit engine
|
2017-11-08 13:27:07 +01:00 |
Roeland Jago Douma
|
497cd7fa4e
|
Merge pull request #7064 from nextcloud/popover-fix
Fix popover layout
|
2017-11-08 12:47:58 +01:00 |
Roeland Jago Douma
|
448fa4f59e
|
If for some reason the json can't be decoded it is not cached
Should fix #6898
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
|
2017-11-08 12:37:35 +01:00 |
|
Morris Jobke
|
732c951ae1
|
Revert "Only allow colons in db host for IPv6 addresses"
This reverts commit 1287d6ddb3.
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
|
2017-11-08 10:47:35 +01:00 |
|
Nextcloud bot
|
79c9439c50
|
[tx-robot] updated from transifex
|
2017-11-08 01:09:21 +00:00 |
|
Lukas Reschke
|
b754a2e385
|
Merge pull request #7042 from nextcloud/bugfix/noid/ensure_unique_uid_for_calendar_objects
ensure uid for calendar objects is unique
|
2017-11-07 21:55:09 +01:00 |
|
Morris Jobke
|
0913bc2157
|
Merge pull request #6552 from nextcloud/notifications-add-highlight-definition
Notifications: Add highlight type definition
|
2017-11-07 20:34:05 +01:00 |
John Molakvoæ (skjnldsv)
|
b44581e15d
|
Fixed sharing popover and removed unused old code
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
|
2017-11-07 18:20:59 +01:00 |
|
Morris Jobke
|
19069f2b9c
|
Merge pull request #6988 from starypatyk/stable12-mount-cache-performance
Improve performance of UserMountCache with external storage folders
|
2017-11-07 17:32:06 +01:00 |
|
John Molakvoæ (skjnldsv)
|
bce00d8b3d
|
Reduce spread of css selector for a.action
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
|
2017-11-07 16:32:20 +01:00 |
|
Roeland Jago Douma
|
469db9fbb9
|
Merge pull request #7073 from nextcloud/no-whitepage-of-death
Show proper error page even if the config.php has syntax errors
|
2017-11-07 16:28:06 +01:00 |
|
Roeland Jago Douma
|
f55732a18f
|
Merge pull request #7075 from nextcloud/remove-unused-variables
Remove unused variables
|
2017-11-07 16:18:40 +01:00 |
|
Roeland Jago Douma
|
8566f8b8ee
|
Merge pull request #7094 from nextcloud/theming-capabilities-element
Theming: expose element color though capabilities API
|
2017-11-07 16:12:51 +01:00 |
Robin Appelman
|
8eaf1956bb
|
never show '/' as path for conflicting file names
Signed-off-by: Robin Appelman <robin@icewind.nl>
|
2017-11-07 15:01:56 +01:00 |
|
Robin Appelman
|
7ea06dacb1
|
still trigger conflict resolution for existing entries when the current entry doesn't need it
Signed-off-by: Robin Appelman <robin@icewind.nl>
|
2017-11-07 14:46:29 +01:00 |
|
Morris Jobke
|
aa789989bf
|
Merge pull request #6926 from nextcloud/license-remove-invalid-mail
Remove invalid mail addresses when updating the license header
|
2017-11-07 13:49:00 +01:00 |
|
Morris Jobke
|
4866314ce0
|
Run updated license header updater
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
|
2017-11-07 13:47:42 +01:00 |
|
Julius Härtl
|
00956c00b2
|
Theming: expose element color though capabilities API
Signed-off-by: Julius Härtl <jus@bitgrid.net>
|
2017-11-07 12:31:23 +01:00 |
|
Julius Härtl
|
7006b739b0
|
Remove brackets for invalid mail addresses when updating the license header
Signed-off-by: Julius Härtl <jus@bitgrid.net>
|
2017-11-07 10:50:42 +01:00 |
|
Morris Jobke
|
44f9779f9f
|
Merge pull request #7059 from kyrofa/bugfix/5532/loading_indicator
core: hide spinner for initial install
|
2017-11-07 10:47:56 +01:00 |
|
Morris Jobke
|
f9e70c2ab6
|
Merge pull request #7020 from Fiech/master
Extended list of sensitive configuration values (2)
|
2017-11-07 10:27:53 +01:00 |
|
Nextcloud bot
|
f9b7109de3
|
[tx-robot] updated from transifex
|
2017-11-07 01:08:57 +00:00 |
|
Morris Jobke
|
ebe75fb4ba
|
Merge pull request #7087 from nextcloud/change-email-of-georg
Change georgehrke's email
|
2017-11-06 21:04:40 +01:00 |
|
Morris Jobke
|
271a2692bd
|
Merge pull request #7066 from nextcloud/appmenu-fix
Fix header app menu
|
2017-11-06 21:03:46 +01:00 |
|
Morris Jobke
|
31c5c2a592
|
Change @georgehrke's email
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
|
2017-11-06 20:38:59 +01:00 |
|
Morris Jobke
|
da6c2c9da1
|
Merge pull request #7083 from nextcloud/update-license-headers
Update license headers
|
2017-11-06 18:48:04 +01:00 |
|
Morris Jobke
|
0eebff152a
|
Update license headers
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
|
2017-11-06 16:56:19 +01:00 |
|
Morris Jobke
|
5ed05219d7
|
Merge pull request #7076 from nextcloud/s3-valid-bucket-name
Better error message for invalid bucket names
|
2017-11-06 16:16:28 +01:00 |