summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | Fix placeholder typo in public link activityJoas Schilling2016-11-231-1/+1
| | |_|_|_|/ | |/| | | |
* | | | | | Merge pull request #2283 from nextcloud/no-padding-if-no-settings-areaJulius Härtl2016-11-232-0/+8
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Remove padding from apps navigation if there is no settings areaMorris Jobke2016-11-232-0/+8
* | | | | | Merge pull request #2233 from nextcloud/change-link-to-11Lukas Reschke2016-11-231-1/+1
|\ \ \ \ \ \
| * | | | | | Update link to the docs to 11Lukas Reschke2016-11-221-1/+1
* | | | | | | Merge pull request #2286 from nextcloud/ldap_password_pr-1Lukas Reschke2016-11-2315-6/+507
|\ \ \ \ \ \ \
| * | | | | | | Add testsLukas Reschke2016-11-237-1/+268
| * | | | | | | restore ldap_password_prroot2016-11-2311-6/+240
| | |/ / / / / | |/| | | | |
* | | | | | | Merge pull request #2247 from nextcloud/avatar-fallbackRoeland Jago Douma2016-11-232-5/+5
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | fix unit testsMorris Jobke2016-11-231-2/+2
| * | | | | | use ? instead of X for avatar name fallbackJan-Christoph Borchardt2016-11-221-3/+3
* | | | | | | Merge pull request #2242 from nextcloud/fix-installation-spinnerMorris Jobke2016-11-231-2/+2
|\ \ \ \ \ \ \
| * | | | | | | show installation spinner correctly, fix #2129Jan-Christoph Borchardt2016-11-221-2/+2
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge pull request #2281 from nextcloud/fix-translationMorris Jobke2016-11-232-4/+4
|\ \ \ \ \ \ \
| * | | | | | | Fix language typoJoas Schilling2016-11-232-4/+4
* | | | | | | | Merge pull request #2232 from nextcloud/imagescale-fixLukas Reschke2016-11-231-1/+3
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | |
| * | | | | | | Workaround for PHP bug when calling imagescaleJulius Haertl2016-11-221-1/+3
* | | | | | | | Merge pull request #2278 from nextcloud/filelist-share-visibleLukas Reschke2016-11-231-3/+9
|\ \ \ \ \ \ \ \
| * | | | | | | | improved style of shared entryMorris Jobke2016-11-231-3/+8
| * | | | | | | | make the share icon in the filelist visible againRobin Appelman2016-11-231-0/+1
| | |_|_|_|_|_|/ | |/| | | | | |
* | | | | | | | Merge pull request #2280 from nextcloud/do_not_escape_shareesLukas Reschke2016-11-231-9/+3
|\ \ \ \ \ \ \ \
| * | | | | | | | Do not escape shareesRoeland Jago Douma2016-11-231-9/+3
* | | | | | | | | Merge pull request #2240 from nextcloud/daita-encryption-init_on_master_keyLukas Reschke2016-11-234-0/+59
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | check if session is initializedBjoern Schiessle2016-11-235-3/+59
| * | | | | | | | | init Session/privateKeys on Master KeyMaxence Lange2016-11-221-0/+3
| | |_|_|_|/ / / / | |/| | | | | | |
* | | | | | | | | Merge pull request #2266 from nextcloud/avatar_imageMorris Jobke2016-11-232-7/+41
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | VCARDS don't hold binary dataRoeland Jago Douma2016-11-232-7/+41
| | |_|/ / / / / / | |/| | | | | | |
* | | | | | | | | Merge pull request #2275 from nextcloud/harden-cookiesLukas Reschke2016-11-233-3/+110
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | |
| * | | | | | | | Harden cookies more appropriateLukas Reschke2016-11-233-3/+110
| |/ / / / / / /
* | | | | | | | Merge pull request #2262 from nextcloud/specify-parameters-on-public-downloadLukas Reschke2016-11-231-3/+9
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Specify the parameters on public downloadJoas Schilling2016-11-221-3/+9
* | | | | | | | Merge pull request #2263 from nextcloud/remove91_migrationLukas Reschke2016-11-234-234/+0
|\ \ \ \ \ \ \ \
| * | | | | | | | Remove 9.1 migration steps in app dav (#25654)Thomas Müller2016-11-224-234/+0
| |/ / / / / / /
* | | | | | | | Merge pull request #2267 from nextcloud/issue-2254-react-to-remote-share-acti...Lukas Reschke2016-11-231-2/+3
|\ \ \ \ \ \ \ \
| * | | | | | | | Only do stuff when its a remote-share activityJoas Schilling2016-11-221-2/+3
| | |_|_|/ / / / | |/| | | | | |
* | | | | | | | Merge pull request #2239 from nextcloud/cleanup-settings-application-againJoas Schilling2016-11-231-136/+0
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Clean up the Application class againJoas Schilling2016-11-221-136/+0
| | |/ / / / / | |/| | | | |
* | | | | | | Merge pull request #2250 from nextcloud/check-if-data-is-definedJoas Schilling2016-11-221-1/+1
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | Check if data is definedLukas Reschke2016-11-221-1/+1
* | | | | | | Merge pull request #2251 from nextcloud/remove-superfluos-mail-input-fieldMorris Jobke2016-11-221-28/+0
|\ \ \ \ \ \ \
| * | | | | | | Remove superfluous email input fieldLukas Reschke2016-11-221-28/+0
|/ / / / / / /
* | | | | | | Merge pull request #2246 from nextcloud/display-name-for-files-and-tagging-ac...Lukas Reschke2016-11-222-8/+62
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | document new variableMorris Jobke2016-11-221-0/+3
| * | | | | | Use the display name for files activities againJoas Schilling2016-11-222-8/+59
| |/ / / / /
* | | | | | Merge pull request #2229 from nextcloud/select2-fix-bisLukas Reschke2016-11-222-5/+4
|\ \ \ \ \ \
| * | | | | | Fix select2 input on retina - fixes #2226Morris Jobke2016-11-221-3/+3
| * | | | | | Fix systemtagsfilelist unwanted margin and clean aera a bitJohn Molakvoæ2016-11-221-1/+1
| * | | | | | Remove unwanted paddingJohn Molakvoæ2016-11-221-1/+0
* | | | | | | Merge pull request #2241 from nextcloud/make-it-a-betaLukas Reschke2016-11-221-1/+1
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | |
| * | | | | | Make it 11.0 betaLukas Reschke2016-11-221-1/+1
|/ / / / / /