summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Display external storage GUI even if user mounting disabledRobin McCorkell2016-03-166-5/+14
* Merge pull request #23253 from owncloud/give-swift-more-timeThomas Müller2016-03-161-2/+3
|\
| * Give swift 15 seconds after startupMorris Jobke2016-03-161-2/+3
* | Merge pull request #23082 from owncloud/contacts_calendar_name_colorThomas Müller2016-03-161-0/+5
|\ \
| * | add title and color to birthday calendarGeorg Ehrke2016-03-101-0/+5
* | | Merge pull request #23300 from owncloud/smb-not-availableThomas Müller2016-03-161-14/+40
|\ \ \ | |_|/ |/| |
| * | handle connection errors as storage not available in smbRobin Appelman2016-03-161-14/+40
* | | Merge pull request #23108 from owncloud/set-encrypted-version-at-least-to-1Thomas Müller2016-03-162-1/+54
|\ \ \
| * | | Ensure that stored version is at least 1 for cross-storage copyLukas Reschke2016-03-162-1/+54
* | | | Merge pull request #22994 from owncloud/check-syntax-on-travisThomas Müller2016-03-162-0/+13
|\ \ \ \
| * | | | Execute PHP Parallel Linter on TravisLukas Reschke2016-03-162-0/+13
| |/ / /
* | | | Merge pull request #23189 from owncloud/require-at-least-libxml-2-7-0Thomas Müller2016-03-161-0/+8
|\ \ \ \ | |_|/ / |/| | |
| * | | Require at least libxml 2.7.0Lukas Reschke2016-03-121-0/+8
* | | | Merge pull request #23155 from owncloud/fed-unshare-withThomas Müller2016-03-162-1/+33
|\ \ \ \ | |_|/ / |/| | |
| * | | Specify the target user when unsharing a federated shareRobin Appelman2016-03-142-1/+33
* | | | [tx-robot] updated from transifexJenkins for ownCloud2016-03-1616-42/+126
* | | | Merge pull request #23157 from owncloud/remove-share-prop-entriesThomas Müller2016-03-153-0/+105
|\ \ \ \
| * | | | remove old share propagation entries from appconfigRobin Appelman2016-03-153-0/+105
* | | | | Merge pull request #23164 from owncloud/db-connection-precondition-fixThomas Müller2016-03-152-7/+25
|\ \ \ \ \
| * | | | | Prevent certain DBs throwing exceptions on same-value updatesRobin McCorkell2016-03-152-7/+25
* | | | | | Merge pull request #23250 from owncloud/fix-support-for-php7-in-htaccessThomas Müller2016-03-157-8/+135
|\ \ \ \ \ \
| * | | | | | always_populate_raw_post_data has been removed with PHP 7.0Lukas Reschke2016-03-151-1/+0
| * | | | | | Add support for custom values in integrity checkerLukas Reschke2016-03-155-7/+123
| * | | | | | Replace all required valuesLukas Reschke2016-03-151-1/+1
| * | | | | | Duplicate block for PHP 7Lukas Reschke2016-03-151-0/+12
* | | | | | | Merge pull request #23251 from owncloud/fix_22907Thomas Müller2016-03-152-2/+42
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | allow group shares, even if not all public keys are availableBjoern Schiessle2016-03-152-2/+42
| |/ / / / /
* | | | | | Merge pull request #23226 from owncloud/fix_23190Thomas Müller2016-03-153-8/+38
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Generate a valid URL for link notificationRoeland Jago Douma2016-03-153-8/+38
| |/ / / /
* | | | | Merge pull request #22998 from owncloud/delay-loading-the-scannerThomas Müller2016-03-152-5/+5
|\ \ \ \ \
| * | | | | Delay check till scanner is usedLukas Reschke2016-03-092-5/+5
* | | | | | Merge pull request #23039 from owncloud/invalid-share-storageThomas Müller2016-03-154-11/+36
|\ \ \ \ \ \
| * | | | | | move failedstorage to coreRobin Appelman2016-03-114-6/+6
| * | | | | | dont break when there is an invalid shareRobin Appelman2016-03-112-6/+31
* | | | | | | Merge pull request #23074 from owncloud/issue-22835-correctly-use-querybuilde...Thomas Müller2016-03-153-5/+5
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | Correctly escape join statements and use selectAliasJoas Schilling2016-03-103-5/+5
* | | | | | | Merge pull request #23243 from owncloud/revert-23171-masterLukas Reschke2016-03-151-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Revert "Removed unnecessary check 'installed' system value' call."Lukas Reschke2016-03-151-1/+1
|/ / / / / / /
* | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2016-03-1538-16/+142
* | | | | | | Merge pull request #23171 from maxolasersquad/masterThomas Müller2016-03-141-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Removed unnecessary check 'installed' system value' call.David Baucum2016-03-111-1/+1
* | | | | | | | Merge pull request #23225 from owncloud/Phiber2000-fix_logtimezoneThomas Müller2016-03-141-3/+5
|\ \ \ \ \ \ \ \
| * | | | | | | | fix broken logtimezonePhiber20002016-03-141-3/+5
* | | | | | | | | Merge pull request #22901 from owncloud/add-dav-authenticatedThomas Müller2016-03-142-1/+26
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Add DAV authenticated also to other scopesLukas Reschke2016-03-072-1/+26
* | | | | | | | | | Merge pull request #23124 from owncloud/improved-rewrite-ruleThomas Müller2016-03-141-1/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Improved rewrite ruleLukas Reschke2016-03-101-1/+1
* | | | | | | | | | | Merge pull request #23190 from owncloud/use-proper-url-for-search-resultsThomas Müller2016-03-141-4/+6
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Use proper URLs for search resultsLukas Reschke2016-03-121-4/+6
| | |_|_|_|_|_|_|_|/ / | |/| | | | | | | | |
* | | | | | | | | | | Merge pull request #23191 from owncloud/fix-external-dav-storageThomas Müller2016-03-141-1/+3
|\ \ \ \ \ \ \ \ \ \ \