summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #7057 from nextcloud/ldap-sync-splitLukas Reschke2017-11-1021-588/+1273
|\ | | | | Bring LDAP user attribute updates ("sync") to the background
| * resolve DIArthur Schiwon2017-11-098-80/+115
| | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
| * fix unit tests after rebaseArthur Schiwon2017-11-092-48/+67
| | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
| * add Sync testArthur Schiwon2017-11-092-8/+136
| | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
| * adjust testsArthur Schiwon2017-11-095-403/+413
| | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
| * move LDAP user attributes "sync" to background (except for ajax jobs)Arthur Schiwon2017-11-0911-35/+418
| | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
| * don't skip updating when ajax is set as background job modeArthur Schiwon2017-11-095-11/+92
| | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
| * move ldap user sync to background (WIP)Arthur Schiwon2017-11-092-106/+135
| | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* | [tx-robot] updated from transifexNextcloud bot2017-11-10286-26/+23014
| |
* | Merge pull request #7112 from nextcloud/theming-imagemagick-hintMorris Jobke2017-11-094-0/+21
|\ \ | | | | | | Theming: add hint about favicon generation
| * | Fix unit testsMorris Jobke2017-11-091-0/+4
| | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * | Theming: add hint about favicon generationJulius Härtl2017-11-083-0/+17
| | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | | Merge pull request #6736 from nextcloud/Dennis1993-patch-1Julius Härtl2017-11-091-4/+4
|\ \ \ | |_|/ |/| | Move login page more to the top
| * | Properly center login pagePaulo moura2017-11-071-4/+4
| | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | [tx-robot] updated from transifexNextcloud bot2017-11-0958-56/+2
| | |
* | | Merge pull request #7117 from nextcloud/fix-welcome-stringMorris Jobke2017-11-0911-17/+17
|\ \ \ | | | | | | | | Fix welcome text for better grammar in themed instances
| * | | Fix welcome text for better grammar in themed instancesMorris Jobke2017-11-0911-17/+17
| | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | Merge pull request #7014 from nextcloud/rename-locksMorris Jobke2017-11-091-83/+86
|\ \ \ \ | | | | | | | | | | Unlock files even if an exception occurs while renaming
| * | | | Unlock files even if an exception occurskorelstar2017-11-031-83/+86
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Kristof Hamann <korelstar@users.noreply.github.com>
* | | | | Merge pull request #7046 from ↵Morris Jobke2017-11-092-0/+43
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | nextcloud/hide-summary-file-actions-when-selected-file-does-not-match Hide summary file actions when a selected file does not match
| * | | | | Hide summary file actions when a selected file does not matchDaniel Calviño Sánchez2017-11-022-0/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When several files are selected and one of them can not be deleted the "Delete" file action is not shown in the summary. This commit extends that behaviour too to the other file actions in the summary ("Move or copy" and "Download"), so now an action is shown in the summary only if it can be executed on all the currently selected files. Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
* | | | | | Merge pull request #7027 from nextcloud/Rello-patch-1Morris Jobke2017-11-092-5/+25
|\ \ \ \ \ \ | | | | | | | | | | | | | | Rello patch 1
| * | | | | | Add the return which is being usedJoas Schilling2017-10-311-6/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | | | | Mapping of m3u, m3u8, pls to audio streamsRello2017-10-312-0/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-Off-By: Rello <Rello@users.noreply.github.com>
* | | | | | | Merge pull request #6846 from nextcloud/filelist-confict-pathMorris Jobke2017-11-091-14/+17
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | still trigger conflict resolution for existing entries when the curre…
| * | | | | | | never show '/' as path for conflicting file namesRobin Appelman2017-11-071-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
| * | | | | | | still trigger conflict resolution for existing entries when the current ↵Robin Appelman2017-11-071-15/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | entry doesn't need it Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | | | | | | Merge pull request #5568 from nextcloud/ldap-agent-credentials-safeLukas Reschke2017-11-096-20/+62
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | | Ldap agent credentials save
| * | | | | | | fix saving changes…Arthur Schiwon2017-10-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
| * | | | | | | add some whitespace around credential elementsArthur Schiwon2017-10-271-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (…in a stupid way) Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
| * | | | | | | fix creating an empty configurationArthur Schiwon2017-10-271-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
| * | | | | | | add save button for setting LDAP Agent DN and PasswordArthur Schiwon2017-10-273-4/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
| * | | | | | | Fix regression: undesired writes to the DBArthur Schiwon2017-10-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
| * | | | | | | LDAP: only write actually changes values to the DBArthur Schiwon2017-10-271-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
| * | | | | | | first, remove the hackArthur Schiwon2017-10-272-12/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* | | | | | | | [tx-robot] updated from transifexNextcloud bot2017-11-09314-1398/+2834
| | | | | | | |
* | | | | | | | Merge pull request #6220 from nextcloud/cached-mount-info-filepathLukas Reschke2017-11-097-3/+115
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Allow getting the filepath when getting cached mounts by fileid
| * | | | | | | | Allow getting the filepath when getting cached mounts by fileidRobin Appelman2017-10-277-3/+115
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | | | | | | Merge pull request #7111 from nextcloud/login-button-ios-fLukas Reschke2017-11-091-0/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Fix login appearance for ios webkit engine
| * | | | | | | | Fix login appearance for ios webkit engineJohn Molakvoæ2017-11-081-0/+1
| | |_|_|_|_|_|/ | |/| | | | | |
* | | | | | | | Merge pull request #7109 from nextcloud/fix_6898Morris Jobke2017-11-081-0/+4
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | If for some reason the json can't be decoded it is not cached
| * | | | | | | | If for some reason the json can't be decoded it is not cachedRoeland Jago Douma2017-11-081-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Should fix #6898 Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | | | | | | Merge pull request #6788 from staabm/masterLukas Reschke2017-11-0824-70/+70
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Prevent XSS in links which open a new browser window
| * | | | | | | | | Prevent XSS in links which open a new browser windowMarkus Staab2017-10-1924-70/+70
| | | | | | | | | |
* | | | | | | | | | Merge pull request #7110 from nextcloud/fix-flow-redirectLukas Reschke2017-11-083-3/+3
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Theming: theme flow redirection page
| * | | | | | | | | | Theming: theme flow redirection pageJulius Härtl2017-11-083-3/+3
| | |_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | | | | | | | | | Merge pull request #7107 from nextcloud/revert-6645Morris Jobke2017-11-081-16/+0
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | Revert "Only allow colons in db host for IPv6 addresses"
| * | | | | | | | | Revert "Only allow colons in db host for IPv6 addresses"Morris Jobke2017-11-081-16/+0
| | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 1287d6ddb303fc9b088b8a6837490042a1540dc6. Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | | | | | | Merge pull request #7064 from nextcloud/popover-fixRoeland Jago Douma2017-11-085-94/+79
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | Fix popover layout
| * | | | | | | | Fixed sharing popover and removed unused old codeJohn Molakvoæ (skjnldsv)2017-11-073-44/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-24 02:20:16 +0000