summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 7.0.8 beta 1v7.0.8beta1C Montero-Luque2015-07-221-2/+2
* Merge pull request #17765 from owncloud/backport-17723-stable7Morris Jobke2015-07-212-156/+164
|\
| * Backport of #17723 to stable7Arthur Schiwon2015-07-202-156/+164
* | Merge pull request #17368 from owncloud/fix_16740_7.0Morris Jobke2015-07-201-2/+2
|\ \ | |/ |/|
| * owner is stored as 'uid_owner', not as 'owner' in the oc_share tableBjoern Schiessle2015-07-031-2/+2
* | Merge pull request #17406 from owncloud/stable7-backport-17095Joas Schilling2015-07-163-13/+27
|\ \
| * | [updater] mark failure in redMorris Jobke2015-07-061-1/+2
| * | [updater] propagate error case properlyMorris Jobke2015-07-062-12/+25
| * | Added error message on initMountpoints exceptionMorris Jobke2015-07-061-1/+1
* | | Merge pull request #17630 from owncloud/stable7-rescanversionsonlyonceThomas Müller2015-07-141-3/+13
|\ \ \
| * | | Only rescan versions once in trashbinVincent Petry2015-07-141-3/+13
|/ / /
* | | Merge pull request #17416 from owncloud/issue-17260-NaN-when-creating-new-use...Morris Jobke2015-07-091-1/+5
|\ \ \ | |/ / |/| |
| * | Return correct user count when the group has noneJoas Schilling2015-07-061-1/+5
|/ /
* / 7.0.7v7.0.7C Montero-Luque2015-07-031-2/+2
|/
* Merge pull request #17208 from owncloud/stable7-fix-16812C. Montero Luque2015-07-021-0/+21
|\
| * Oracle-specific workaround for adding a column with not-null default valueVictor Dubiniuk2015-06-271-0/+21
* | Merge pull request #17319 from owncloud/stable7-clean-ocsidMorris Jobke2015-07-027-6/+8
|\ \
| * | Bump versionsLukas Reschke2015-07-026-6/+6
| * | Delete OCS ID from DB if none is specifiedLukas Reschke2015-07-021-0/+2
* | | Merge pull request #17314 from owncloud/stable7-remove-ocs-idsMorris Jobke2015-07-026-6/+0
|\ \ \ | |/ / |/| |
| * | [stable7] Remove OCS IDsLukas Reschke2015-07-026-6/+0
|/ /
* | 7.0.7RC1v7.0.7RC1C Montero-Luque2015-06-301-2/+2
* | Merge pull request #17234 from owncloud/oc-version-to-app-store-stable7Morris Jobke2015-06-294-15/+23
|\ \ | |/ |/|
| * Add oc version to app store requests in stable7Joas Schilling2015-06-294-15/+23
|/
* Merge pull request #17180 from owncloud/stable7-backport-17026Frank Karlitschek2015-06-251-1/+1
|\
| * [config.sample.php] set correct default value for skeletondirectoryMorris Jobke2015-06-251-1/+1
|/
* Merge pull request #17116 from owncloud/stable7-17115Morris Jobke2015-06-241-1/+7
|\
| * [sharing] handle shares of users that aren't available anymoreMorris Jobke2015-06-231-1/+7
* | version 7.0.7 betav7.0.7betaC Montero-Luque2015-06-231-2/+2
|/
* Merge pull request #17034 from owncloud/backport-16890-stable7Morris Jobke2015-06-232-5/+10
|\
| * Backport of #16890 to stable7Arthur Schiwon2015-06-182-5/+10
* | Merge pull request #17096 from owncloud/stable7-fix-deleted-usersJoas Schilling2015-06-231-1/+7
|\ \
| * | skip users that are not available anymore during sharing upgradeMorris Jobke2015-06-231-1/+7
* | | Merge pull request #16581 from owncloud/stable7-cors-no-cookie-authLukas Reschke2015-06-233-13/+113
|\ \ \
| * | | backport #16532 to stable7Bernhard Posselt2015-05-273-13/+113
* | | | Merge pull request #17020 from owncloud/stable7-proper-repair-step-infoThomas Müller2015-06-232-0/+4
|\ \ \ \ | |_|/ / |/| | |
| * | | Proper repair step info during upgrade on cliMorris Jobke2015-06-182-0/+4
| | |/ | |/|
* | | Merge pull request #17073 from owncloud/appframework-type-cast-stable7Morris Jobke2015-06-222-1/+15
|\ \ \
| * | | AppFramework annotation whitespace unit testRobin McCorkell2015-06-221-0/+14
| * | | Allow multiple whitespace in type hints in AppFrameworkRobin McCorkell2015-06-221-1/+1
|/ / /
* | | Merge pull request #17021 from owncloud/stable7-verify-pathThomas Müller2015-06-191-0/+4
|\ \ \ | |/ / |/| |
| * | Verify if path existsLukas Reschke2015-06-181-0/+4
|/ /
* | Merge pull request #16991 from owncloud/stable7-verify-if-path-existsMorris Jobke2015-06-171-0/+7
|\ \
| * | Throw nicer error message instead 500Lukas Reschke2015-06-171-1/+3
| * | Verify if path existsLukas Reschke2015-06-171-0/+5
|/ /
* | Merge pull request #16969 from owncloud/stable7-backport-15549Morris Jobke2015-06-171-1/+8
|\ \
| * | clarify the duplication of the $params arrayJens-Christian Fischer2015-06-161-1/+2
| * | don't update identical valuesJens-Christian Fischer2015-06-161-1/+7
|/ /
* | Merge pull request #16864 from owncloud/backport-concatenation-7Thomas Müller2015-06-111-3/+3
|\ \
| * | Don't use command concatenationLukas Reschke2015-06-101-3/+3