summaryrefslogtreecommitdiffstats
Commit message (Collapse)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 stable7
| * Backport of #17723 to stable7Arthur Schiwon2015-07-202-156/+164
| | | | | | | | fix runtime caching in ldap's user manager, fixes #17631
* | Merge pull request #17368 from owncloud/fix_16740_7.0Morris Jobke2015-07-201-2/+2
|\ \ | |/ |/| [stable7] owner is stored as 'uid_owner', not as 'owner' in the oc_share table
| * 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
|\ \ | | | | | | [stable7] Proper error handling
| * | [updater] mark failure in redMorris Jobke2015-07-061-1/+2
| | |
| * | [updater] propagate error case properlyMorris Jobke2015-07-062-12/+25
| | | | | | | | | | | | | | | | | | * add $success to the updateEnd hook * add new return code for a update failure * add exception class to failure hook message
| * | 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
|\ \ \ | | | | | | | | [stable7] Only rescan versions once in trashbin
| * | | Only rescan versions once in trashbinVincent Petry2015-07-141-3/+13
|/ / / | | | | | | | | | | | | Whenever versions need to be rescanned, only do it once per PHP request. Happens whenever multiple files need to be expired.
* | | Merge pull request #17416 from ↵Morris Jobke2015-07-091-1/+5
|\ \ \ | |/ / |/| | | | | | | | owncloud/issue-17260-NaN-when-creating-new-user-and-group Return correct user count when the group has none
| * | 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
|\ | | | | [Stable7] Oracle workaround for adding a column with not-null default value
| * 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
|\ \ | | | | | | [stable7] Delete OCS ID from DB if none is specified
| * | Bump versionsLukas Reschke2015-07-026-6/+6
| | |
| * | Delete OCS ID from DB if none is specifiedLukas Reschke2015-07-021-0/+2
| | | | | | | | | | | | | | | | | | If no OCS ID is specified in appinfo.xml and an app update is triggered and a OCS ID is stored in the DB we should clean the value. Ref https://github.com/owncloud/activity/issues/320#issuecomment-117937748
* | | Merge pull request #17314 from owncloud/stable7-remove-ocs-idsMorris Jobke2015-07-026-6/+0
|\ \ \ | |/ / |/| | [stable7] Remove OCS IDs
| * | [stable7] Remove OCS IDsLukas Reschke2015-07-026-6/+0
|/ / | | | | | | | | | | While making the AppStore ready for 8.1 I also deleted some dummy entries which means that these IDs do not resolve anymore. We should remove them to prevent errors such as https://github.com/owncloud/core/issues/17307 Ref https://github.com/owncloud/activity/issues/320#issuecomment-117691867
* | 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 stable7
| * 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
|\ | | | | [stable7] [config.sample.php] set correct default value for skeletondirectory
| * [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
|\ | | | | [stable7] [sharing] handle shares of users that aren't available anymore
| * [sharing] handle shares of users that aren't available anymoreMorris Jobke2015-06-231-1/+7
| | | | | | | | | | * properly handle the case where an abandoned share is left and simply skip it
* | 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 stable7
| * Backport of #16890 to stable7Arthur Schiwon2015-06-182-5/+10
| | | | | | | | | | | | | | | | | | the user is gone, userExists will not bring him back. But the user's folder needs to be deleted anyway delete user test to take getHome into account to ensure it is also deleted subsequently Conflicts: apps/user_ldap/tests/user_ldap.php
* | Merge pull request #17096 from owncloud/stable7-fix-deleted-usersJoas Schilling2015-06-231-1/+7
|\ \ | | | | | | [Stable7] fix deleted users during upgrade migration
| * | 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
|\ \ \ | | | | | | | | Disallow cookie auth for cors requests stable7
| * | | 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 cli
| * | | 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
|\ \ \ | | | | | | | | [stable7] Allow multiple whitespace in type hints in AppFramework
| * | | AppFramework annotation whitespace unit testRobin McCorkell2015-06-221-0/+14
| | | |
| * | | Allow multiple whitespace in type hints in AppFrameworkRobin McCorkell2015-06-221-1/+1
|/ / / | | | | | | | | | | | | | | | Type hints such as `@param bool $doSomething` will now correctly get parsed, allowing for alignment of docblock parameters if the app developer so wishes.
* | | Merge pull request #17021 from owncloud/stable7-verify-pathThomas Müller2015-06-191-0/+4
|\ \ \ | |/ / |/| | [stable7] Verify if path exists
| * | Verify if path existsLukas Reschke2015-06-181-0/+4
|/ / | | | | | | We need to check if the path exists and throw an error instead of handling this situation ungraciously.
* | Merge pull request #16991 from owncloud/stable7-verify-if-path-existsMorris Jobke2015-06-171-0/+7
|\ \ | | | | | | [stable7] Verify if path exists
| * | Throw nicer error message instead 500Lukas Reschke2015-06-171-1/+3
| | |
| * | Verify if path existsLukas Reschke2015-06-171-0/+5
|/ / | | | | | | We need to verify if the specified path exists to gracefully prevent errors.
* | Merge pull request #16969 from owncloud/stable7-backport-15549Morris Jobke2015-06-171-1/+8
|\ \ | | | | | | [Stable7] don't update identical values
| * | clarify the duplication of the $params arrayJens-Christian Fischer2015-06-161-1/+2
| | |
| * | don't update identical valuesJens-Christian Fischer2015-06-161-1/+7
|/ / | | | | | | | | | | | | | | | | | | | | The UPDATE oc_filecache statement blindly overwrites identical data. Databases like Postgres that create a new row on an update and mark the old one as dead will suffer from the previous behaviour, as millions of "new" rows are created in the database. This patch changes the WHERE clause to test for identical values and not updating if the values in the DB are identical to the ones being passed.
* | Merge pull request #16864 from owncloud/backport-concatenation-7Thomas Müller2015-06-111-3/+3
|\ \ | | | | | | [stable7] Don't use command concatenation
| * | Don't use command concatenationLukas Reschke2015-06-101-3/+3
| | | | | | | | | | | | Possibly fixes https://github.com/owncloud/core/issues/16853
generated by cgit v1.2.3 (git 2.39.1) at 2025-03-28 11:09:06 +0000