summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* [tx-robot] updated from transifexNextcloud bot2017-11-1274-372/+544
* [tx-robot] updated from transifexNextcloud bot2017-11-11390-580/+22656
* Merge pull request #7056 from nextcloud/oc-28415-enable-chunking-in-authentic...blizzz2017-11-106-17/+90
|\
| * Enable chunking for bigger files in authenticated web uploadVincent Petry2017-11-036-17/+90
* | Merge pull request #7057 from nextcloud/ldap-sync-splitLukas Reschke2017-11-1021-588/+1273
|\ \
| * | resolve DIArthur Schiwon2017-11-098-80/+115
| * | fix unit tests after rebaseArthur Schiwon2017-11-092-48/+67
| * | add Sync testArthur Schiwon2017-11-092-8/+136
| * | adjust testsArthur Schiwon2017-11-095-403/+413
| * | move LDAP user attributes "sync" to background (except for ajax jobs)Arthur Schiwon2017-11-0911-35/+418
| * | don't skip updating when ajax is set as background job modeArthur Schiwon2017-11-095-11/+92
| * | move ldap user sync to background (WIP)Arthur Schiwon2017-11-092-106/+135
* | | [tx-robot] updated from transifexNextcloud bot2017-11-10286-26/+23014
* | | Merge pull request #7112 from nextcloud/theming-imagemagick-hintMorris Jobke2017-11-094-0/+21
|\ \ \
| * | | Fix unit testsMorris Jobke2017-11-091-0/+4
| * | | Theming: add hint about favicon generationJulius Härtl2017-11-083-0/+17
* | | | Merge pull request #6736 from nextcloud/Dennis1993-patch-1Julius Härtl2017-11-091-4/+4
|\ \ \ \ | |_|/ / |/| | |
| * | | Properly center login pagePaulo moura2017-11-071-4/+4
* | | | [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 instancesMorris Jobke2017-11-0911-17/+17
* | | | | Merge pull request #7014 from nextcloud/rename-locksMorris Jobke2017-11-091-83/+86
|\ \ \ \ \
| * | | | | Unlock files even if an exception occurskorelstar2017-11-031-83/+86
* | | | | | Merge pull request #7046 from nextcloud/hide-summary-file-actions-when-select...Morris Jobke2017-11-092-0/+43
|\ \ \ \ \ \
| * | | | | | Hide summary file actions when a selected file does not matchDaniel Calviño Sánchez2017-11-022-0/+43
| | |_|_|_|/ | |/| | | |
* | | | | | Merge pull request #7027 from nextcloud/Rello-patch-1Morris Jobke2017-11-092-5/+25
|\ \ \ \ \ \
| * | | | | | Add the return which is being usedJoas Schilling2017-10-311-6/+9
| * | | | | | Mapping of m3u, m3u8, pls to audio streamsRello2017-10-312-0/+17
* | | | | | | Merge pull request #6846 from nextcloud/filelist-confict-pathMorris Jobke2017-11-091-14/+17
|\ \ \ \ \ \ \
| * | | | | | | never show '/' as path for conflicting file namesRobin Appelman2017-11-071-1/+3
| * | | | | | | still trigger conflict resolution for existing entries when the current entry...Robin Appelman2017-11-071-15/+16
* | | | | | | | Merge pull request #5568 from nextcloud/ldap-agent-credentials-safeLukas Reschke2017-11-096-20/+62
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | |
| * | | | | | | fix saving changes…Arthur Schiwon2017-10-271-1/+1
| * | | | | | | add some whitespace around credential elementsArthur Schiwon2017-10-271-0/+2
| * | | | | | | fix creating an empty configurationArthur Schiwon2017-10-271-3/+5
| * | | | | | | add save button for setting LDAP Agent DN and PasswordArthur Schiwon2017-10-273-4/+48
| * | | | | | | Fix regression: undesired writes to the DBArthur Schiwon2017-10-271-1/+1
| * | | | | | | LDAP: only write actually changes values to the DBArthur Schiwon2017-10-271-2/+8
| * | | | | | | first, remove the hackArthur Schiwon2017-10-272-12/+0
* | | | | | | | [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 fileidRobin Appelman2017-10-277-3/+115
| |/ / / / / / /
* | | | | | | | Merge pull request #7111 from nextcloud/login-button-ios-fLukas Reschke2017-11-091-0/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | 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 cachedRoeland Jago Douma2017-11-081-0/+4
* | | | | | | | | Merge pull request #6788 from staabm/masterLukas Reschke2017-11-0824-70/+70
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | 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 pageJulius Härtl2017-11-083-3/+3
| | |_|/ / / / / / / | |/| | | | | | | |