Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #19699 from owncloud/hutchic-issue-18241-reload-page-link | Thomas Müller | 2015-10-14 | 1 | -1/+1 |
|\ | |||||
| * | refs #18241 Make the 'please reload this page' a clickable link | Colin Hutchinson | 2015-10-10 | 1 | -1/+1 |
* | | Merge pull request #19701 from owncloud/trash-restoreactioninline | Thomas Müller | 2015-10-14 | 1 | -13/+21 |
|\ \ | |||||
| * | | Make trashbin's "Restore" an inline action | Vincent Petry | 2015-10-12 | 1 | -13/+21 |
* | | | Merge pull request #19727 from owncloud/fix_19678 | Thomas Müller | 2015-10-14 | 1 | -2/+2 |
|\ \ \ | |||||
| * | | | Return path instead of itemsource | Roeland Jago Douma | 2015-10-13 | 1 | -2/+2 |
* | | | | Merge pull request #19730 from owncloud/fix_17560 | Thomas Müller | 2015-10-14 | 2 | -0/+57 |
|\ \ \ \ | |||||
| * | | | | Squash collection shares | Roeland Jago Douma | 2015-10-13 | 2 | -0/+57 |
| |/ / / | |||||
* | | | | Merge pull request #19733 from owncloud/remove-controls-whennotneeded | Thomas Müller | 2015-10-14 | 4 | -9/+9 |
|\ \ \ \ | |||||
| * | | | | Remove controls for file lists that don't need it | Vincent Petry | 2015-10-13 | 4 | -9/+9 |
* | | | | | Merge pull request #19744 from owncloud/admin-checkboxes | Thomas Müller | 2015-10-14 | 3 | -19/+19 |
|\ \ \ \ \ | |||||
| * | | | | | apply new checkbox style to admin settings | Hendrik Leppelsack | 2015-10-14 | 3 | -19/+19 |
* | | | | | | Merge pull request #19757 from owncloud/remove-empty-box-during-update | Thomas Müller | 2015-10-14 | 1 | -0/+1 |
|\ \ \ \ \ \ | |||||
| * | | | | | | [update] show default error message if empty message | Morris Jobke | 2015-10-14 | 1 | -0/+1 |
| |/ / / / / | |||||
* | | | | | | Merge pull request #19756 from owncloud/the-future | Thomas Müller | 2015-10-14 | 2 | -4/+4 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | |||||
| * | | | | | Master is now 9.0.0 development | Joas Schilling | 2015-10-14 | 2 | -4/+4 |
* | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-10-14 | 26 | -162/+562 |
|/ / / / / | |||||
* | | | | | Merge pull request #19746 from owncloud/reference-v2-instead-of-v1 | Morris Jobke | 2015-10-13 | 2 | -27/+27 |
|\ \ \ \ \ | |||||
| * | | | | | Reference v2 in the provider list | Lukas Reschke | 2015-10-13 | 2 | -27/+27 |
|/ / / / / | |||||
* | | | | | Merge pull request #19739 from owncloud/do-not-leak-exception-data | Thomas Müller | 2015-10-13 | 3 | -15/+64 |
|\ \ \ \ \ | |||||
| * | | | | | Do not print exception message | Lukas Reschke | 2015-10-13 | 3 | -15/+64 |
* | | | | | | Merge pull request #19635 from owncloud/fix-ldap-value-limitation | Thomas Müller | 2015-10-13 | 7 | -52/+59 |
|\ \ \ \ \ \ | |||||
| * | | | | | | adjust fetchList with a single requested attribute accordingly | Arthur Schiwon | 2015-10-09 | 1 | -1/+3 |
| * | | | | | | adjust tests | Arthur Schiwon | 2015-10-09 | 2 | -4/+4 |
| * | | | | | | fix primary group retrieval | Arthur Schiwon | 2015-10-09 | 1 | -1/+1 |
| * | | | | | | treat dn as any other attribute when building the search() return array | Arthur Schiwon | 2015-10-08 | 3 | -6/+6 |
| * | | | | | | adjust handling changed return array structure from search() and fetchList() | Arthur Schiwon | 2015-10-08 | 4 | -13/+33 |
| * | | | | | | allow an attribute to return more than one value | Arthur Schiwon | 2015-10-07 | 2 | -29/+14 |
* | | | | | | | Merge pull request #19735 from owncloud/extstorage-signature | Thomas Müller | 2015-10-13 | 1 | -2/+3 |
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | |||||
| * | | | | | | Fix testDeleteStorage signature to match the one from the base class | Vincent Petry | 2015-10-13 | 1 | -2/+3 |
|/ / / / / / | |||||
* | | | | | | Merge pull request #19677 from owncloud/silently-fail-app-upgrade-exceptions-... | Thomas Müller | 2015-10-13 | 5 | -17/+23 |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | |||||
| * | | | | | Always pass in ILogger | Thomas Müller | 2015-10-09 | 5 | -11/+13 |
| * | | | | | Clean code | Thomas Müller | 2015-10-09 | 1 | -2/+2 |
| * | | | | | Catch exceptions during app upgrade - fixes #16240 | Thomas Müller | 2015-10-09 | 1 | -4/+8 |
* | | | | | | Merge pull request #19288 from RealRancor/restruct_config_sample_master | Thomas Müller | 2015-10-13 | 1 | -31/+31 |
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | |||||
| * | | | | | Restructure config.sample.php of master | RealRancor | 2015-10-13 | 1 | -31/+31 |
|/ / / / / | |||||
* | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-10-13 | 26 | -12/+86 |
* | | | | | Merge pull request #19723 from owncloud/strip-directory | Thomas Müller | 2015-10-13 | 2 | -5/+49 |
|\ \ \ \ \ | |||||
| * | | | | | Strip directory from scriptName | Lukas Reschke | 2015-10-12 | 2 | -5/+49 |
* | | | | | | Merge pull request #19719 from owncloud/edit-icon | Thomas Müller | 2015-10-13 | 3 | -0/+8 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | |||||
| * | | | | | add specific edit icon | Jan-Christoph Borchardt | 2015-10-13 | 3 | -0/+8 |
|/ / / / / | |||||
* | | | | | Merge pull request #19683 from owncloud/repair-donotrepairfoldermimetypes | Thomas Müller | 2015-10-12 | 2 | -2/+28 |
|\ \ \ \ \ | |||||
| * | | | | | Do not update mime types for folders with extension | Vincent Petry | 2015-10-09 | 2 | -2/+28 |
* | | | | | | Merge pull request #19708 from owncloud/revert-19628-files-canceluploaddebounce | Thomas Müller | 2015-10-12 | 1 | -5/+6 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Revert "Debounce cancel upload message" | Thomas Müller | 2015-10-12 | 1 | -5/+6 |
| | |_|_|/ / | |/| | | | | |||||
* | | | | | | Merge pull request #19703 from owncloud/revert-19702-trash-deletesectionposition | Thomas Müller | 2015-10-12 | 3 | -18/+14 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Revert "Move trashbin specific CSS that modifies sidebar" | Thomas Müller | 2015-10-12 | 3 | -18/+14 |
* | | | | | | | Merge pull request #19704 from owncloud/fix_17997 | Björn Schießle | 2015-10-12 | 2 | -0/+27 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | |||||
| * | | | | | | also detect files in a .part folder as part file | Bjoern Schiessle | 2015-10-12 | 2 | -0/+27 |
|/ / / / / / | |||||
* | | | | | | Merge pull request #19657 from owncloud/setup-transport | Thomas Müller | 2015-10-12 | 2 | -2/+5 |
|\ \ \ \ \ \ |