summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #19699 from owncloud/hutchic-issue-18241-reload-page-linkThomas Müller2015-10-141-1/+1
|\
| * refs #18241 Make the 'please reload this page' a clickable linkColin Hutchinson2015-10-101-1/+1
* | Merge pull request #19701 from owncloud/trash-restoreactioninlineThomas Müller2015-10-141-13/+21
|\ \
| * | Make trashbin's "Restore" an inline actionVincent Petry2015-10-121-13/+21
* | | Merge pull request #19727 from owncloud/fix_19678Thomas Müller2015-10-141-2/+2
|\ \ \
| * | | Return path instead of itemsourceRoeland Jago Douma2015-10-131-2/+2
* | | | Merge pull request #19730 from owncloud/fix_17560Thomas Müller2015-10-142-0/+57
|\ \ \ \
| * | | | Squash collection sharesRoeland Jago Douma2015-10-132-0/+57
| |/ / /
* | | | Merge pull request #19733 from owncloud/remove-controls-whennotneededThomas Müller2015-10-144-9/+9
|\ \ \ \
| * | | | Remove controls for file lists that don't need itVincent Petry2015-10-134-9/+9
* | | | | Merge pull request #19744 from owncloud/admin-checkboxesThomas Müller2015-10-143-19/+19
|\ \ \ \ \
| * | | | | apply new checkbox style to admin settingsHendrik Leppelsack2015-10-143-19/+19
* | | | | | Merge pull request #19757 from owncloud/remove-empty-box-during-updateThomas Müller2015-10-141-0/+1
|\ \ \ \ \ \
| * | | | | | [update] show default error message if empty messageMorris Jobke2015-10-141-0/+1
| |/ / / / /
* | | | | | Merge pull request #19756 from owncloud/the-futureThomas Müller2015-10-142-4/+4
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Master is now 9.0.0 developmentJoas Schilling2015-10-142-4/+4
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-10-1426-162/+562
|/ / / / /
* | | | | Merge pull request #19746 from owncloud/reference-v2-instead-of-v1Morris Jobke2015-10-132-27/+27
|\ \ \ \ \
| * | | | | Reference v2 in the provider listLukas Reschke2015-10-132-27/+27
|/ / / / /
* | | | | Merge pull request #19739 from owncloud/do-not-leak-exception-dataThomas Müller2015-10-133-15/+64
|\ \ \ \ \
| * | | | | Do not print exception messageLukas Reschke2015-10-133-15/+64
* | | | | | Merge pull request #19635 from owncloud/fix-ldap-value-limitationThomas Müller2015-10-137-52/+59
|\ \ \ \ \ \
| * | | | | | adjust fetchList with a single requested attribute accordinglyArthur Schiwon2015-10-091-1/+3
| * | | | | | adjust testsArthur Schiwon2015-10-092-4/+4
| * | | | | | fix primary group retrievalArthur Schiwon2015-10-091-1/+1
| * | | | | | treat dn as any other attribute when building the search() return arrayArthur Schiwon2015-10-083-6/+6
| * | | | | | adjust handling changed return array structure from search() and fetchList()Arthur Schiwon2015-10-084-13/+33
| * | | | | | allow an attribute to return more than one valueArthur Schiwon2015-10-072-29/+14
* | | | | | | Merge pull request #19735 from owncloud/extstorage-signatureThomas Müller2015-10-131-2/+3
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | Fix testDeleteStorage signature to match the one from the base classVincent Petry2015-10-131-2/+3
|/ / / / / /
* | | | | | Merge pull request #19677 from owncloud/silently-fail-app-upgrade-exceptions-...Thomas Müller2015-10-135-17/+23
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Always pass in ILoggerThomas Müller2015-10-095-11/+13
| * | | | | Clean codeThomas Müller2015-10-091-2/+2
| * | | | | Catch exceptions during app upgrade - fixes #16240Thomas Müller2015-10-091-4/+8
* | | | | | Merge pull request #19288 from RealRancor/restruct_config_sample_masterThomas Müller2015-10-131-31/+31
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Restructure config.sample.php of masterRealRancor2015-10-131-31/+31
|/ / / / /
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-10-1326-12/+86
* | | | | Merge pull request #19723 from owncloud/strip-directoryThomas Müller2015-10-132-5/+49
|\ \ \ \ \
| * | | | | Strip directory from scriptNameLukas Reschke2015-10-122-5/+49
* | | | | | Merge pull request #19719 from owncloud/edit-iconThomas Müller2015-10-133-0/+8
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | add specific edit iconJan-Christoph Borchardt2015-10-133-0/+8
|/ / / / /
* | | | | Merge pull request #19683 from owncloud/repair-donotrepairfoldermimetypesThomas Müller2015-10-122-2/+28
|\ \ \ \ \
| * | | | | Do not update mime types for folders with extensionVincent Petry2015-10-092-2/+28
* | | | | | Merge pull request #19708 from owncloud/revert-19628-files-canceluploaddebounceThomas Müller2015-10-121-5/+6
|\ \ \ \ \ \
| * | | | | | Revert "Debounce cancel upload message"Thomas Müller2015-10-121-5/+6
| | |_|_|/ / | |/| | | |
* | | | | | Merge pull request #19703 from owncloud/revert-19702-trash-deletesectionpositionThomas Müller2015-10-123-18/+14
|\ \ \ \ \ \
| * | | | | | Revert "Move trashbin specific CSS that modifies sidebar"Thomas Müller2015-10-123-18/+14
* | | | | | | Merge pull request #19704 from owncloud/fix_17997Björn Schießle2015-10-122-0/+27
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | also detect files in a .part folder as part fileBjoern Schiessle2015-10-122-0/+27
|/ / / / / /
* | | | | | Merge pull request #19657 from owncloud/setup-transportThomas Müller2015-10-122-2/+5
|\ \ \ \ \ \