aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
| | |_|/ / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge pull request #7107 from nextcloud/revert-6645Morris Jobke2017-11-081-16/+0
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Revert "Only allow colons in db host for IPv6 addresses"Morris Jobke2017-11-081-16/+0
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Merge pull request #7064 from nextcloud/popover-fixRoeland Jago Douma2017-11-085-94/+79
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | Fixed sharing popover and removed unused old codeJohn Molakvoæ (skjnldsv)2017-11-073-44/+3
| * | | | | | | | Reduce spread of css selector for a.actionJohn Molakvoæ (skjnldsv)2017-11-071-41/+44
| * | | | | | | | Radio support tooJohn Molakvoæ (skjnldsv)2017-11-041-0/+6
| * | | | | | | | Fix popover icon sizeJohn Molakvoæ (skjnldsv)2017-11-041-6/+9
| * | | | | | | | Fix popover layoutJohn Molakvoæ (skjnldsv)2017-11-041-9/+23
* | | | | | | | | [tx-robot] updated from transifexNextcloud bot2017-11-0842-86/+2086
* | | | | | | | | Merge pull request #7042 from nextcloud/bugfix/noid/ensure_unique_uid_for_cal...Lukas Reschke2017-11-073-8/+115
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | ensure uid for calendar objects is uniqueGeorg Ehrke2017-11-063-8/+115
* | | | | | | | | | Merge pull request #6552 from nextcloud/notifications-add-highlight-definitionMorris Jobke2017-11-071-0/+25
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Notifications: Add highlight type definitionJulius Härtl2017-10-031-0/+25
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-15 16:01:08 +0000