summaryrefslogtreecommitdiffstats
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2014-10-011-1/+1
|
* Merge pull request #11356 from owncloud/redirect-only-to-the-same-domainLukas Reschke2014-10-011-2/+4
|\ | | | | Redirect only to absolute URL
| * Redirect only to absolute URLLukas Reschke2014-09-291-2/+4
| | | | | | | | We do not want to redirect to other domains using the "?redirect_url=" feature. Please notice, that the ownCloud project does not consider open redirectors as security issue.
* | Merge pull request #11303 from owncloud/addFilelockToConfigLukas Reschke2014-10-012-83/+89
|\ \ | | | | | | Add flock to config
| * | Add flock to configLukas Reschke2014-09-302-83/+89
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds a file lock to the config in hope that this prevents race conditions as reported in https://github.com/owncloud/core/issues/11070 Testplan: - [ ] Delete config.php and make it read-only => Error is thrown that it is not writeable - [ ] Installation still works - [ ] Changing config settings works (i.e. using the SMTP config switches in the administration menu) - [ ] Your PC didn't blow up - [ ] Installing the news app and the "Disable AppCode checker" app did not destroy your installation Only skip the main config Otherwise read only additional configs might not be processed Test on tmpdir
* | | Merge pull request #11365 from owncloud/fix-phpdocMorris Jobke2014-09-301-4/+4
|\ \ \ | | | | | | | | Fix PHPDoc
| * | | Fix PHPDocLukas Reschke2014-09-301-4/+4
| | | |
* | | | Merge pull request #11366 from owncloud/invalid-docMorris Jobke2014-09-301-3/+3
|\ \ \ \ | |_|/ / |/| | | Remove invalid PHPDoc
| * | | Remove invalid PHPDocLukas Reschke2014-09-301-3/+3
| |/ / | | | | | | | | | Despite the documentation this function does not read values from the cookie
* / / [tx-robot] updated from transifexJenkins for ownCloud2014-09-302-0/+9
|/ /
* | Merge pull request #10107 from owncloud/sharing_group_sharesLukas Reschke2014-09-294-364/+398
|\ \ | | | | | | [sharing] group shares
| * | some small fixed, suggested by scrutinizerBjoern Schiessle2014-09-293-6/+5
| | |
| * | on unshare only unshare childrens if there is no other parent availableBjoern Schiessle2014-09-262-15/+63
| | |
| * | only create a new share entry, if the user needs a different target name ↵Bjoern Schiessle2014-09-261-1/+1
| | | | | | | | | | | | than the group share
| * | for group shares we don't need a extra db entry of groupTarget equals itemTargetBjoern Schiessle2014-09-261-3/+3
| | |
| * | for group shares only the parent has the up-to-date permission. Make sure ↵Bjoern Schiessle2014-09-261-1/+12
| | | | | | | | | | | | that we always use this permission, except if the user permission is '0' because in this case the user unshared the group share from self
| * | call \OCP\Share::getItemsSharedWithUser() to get exclude list, this way all ↵Bjoern Schiessle2014-09-251-29/+5
| | | | | | | | | | | | checks are executed, e.g. to check if the share is really visible
| * | always select permissions, used in getItems()Bjoern Schiessle2014-09-251-2/+3
| | |
| * | some small fixesBjoern Schiessle2014-09-252-7/+2
| | |
| * | only add a new row if it isn't a unique share, otherwise update the existing rowBjoern Schiessle2014-09-241-1/+1
| | |
| * | mark exclude list as deprecated. It neither used by the files app nor by theBjoern Schiessle2014-09-241-1/+1
| | | | | | | | | | | | | | | calendar or contacts app. It doesn't make sense to build a exclude list by the share API, the apps knows best which are valid targets.
| * | fix add user to group to work with grouped sharesBjoern Schiessle2014-09-241-10/+18
| | |
| * | generateTarget() will always find a unique targetBjoern Schiessle2014-09-242-96/+80
| | |
| * | unit tests for grouping of shares pointing to the same sourceBjoern Schiessle2014-09-221-1/+1
| | |
| * | group shares and combine permissionsBjoern Schiessle2014-09-221-237/+249
| | |
* | | Remove dead codeLukas Reschke2014-09-292-18/+0
| |/ |/|
* | [tx-robot] updated from transifexJenkins for ownCloud2014-09-291-0/+1
| |
* | [tx-robot] updated from transifexJenkins for ownCloud2014-09-282-1/+3
| |
* | [tx-robot] updated from transifexJenkins for ownCloud2014-09-2712-0/+12
| |
* | Merge pull request #11311 from ↵Lukas Reschke2014-09-261-3/+21
|\ \ | | | | | | | | | | | | owncloud/fixing-unhandled-exception-cleanTmp-master catch and log exception in OC_Helper::cleanTmp()
| * | catch and log exception in OC_Helper::cleanTmp()Thomas Müller2014-09-261-3/+21
| | |
* | | Merge pull request #11285 from owncloud/dav-permissions-createThomas Müller2014-09-263-1/+17
|\ \ \ | |/ / |/| | Fix dav permissions for folders
| * | Fix dav permissions for folders without create permissionsRobin Appelman2014-09-251-1/+1
| | |
| * | Expose creatable permissions trough fileinfoRobin Appelman2014-09-252-0/+16
| | |
* | | [tx-robot] updated from transifexJenkins for ownCloud2014-09-261-1/+2
| | |
* | | Merge pull request #11282 from owncloud/scanner-memory-stable7Robin Appelman2014-09-251-7/+12
|\ \ \ | | | | | | | | Don't keep the full info of all children in memory
| * | | Don't keep the full info of all children in memoryRobin Appelman2014-09-241-7/+12
| | | |
* | | | Merge pull request #10934 from owncloud/datadir-write-setupVincent Petry2014-09-254-28/+42
|\ \ \ \ | |_|/ / |/| | | Don't complain about non-writable datadirs before we're installed
| * | | Check for writable datadir during setupRobin Appelman2014-09-181-3/+13
| | | |
| * | | Don't complain about non-writable datadirs before we're installedRobin Appelman2014-09-181-17/+19
| | | |
| * | | Inject config into checkserver and cleanup testsRobin Appelman2014-09-183-10/+12
| | | |
* | | | [tx-robot] updated from transifexJenkins for ownCloud2014-09-255-8/+29
| | | |
* | | | Clarify possible preview providers for type OfficeLukas Reschke2014-09-241-2/+6
| | | | | | | | | | | | | | | | a
* | | | Merge pull request #11225 from owncloud/showLoginAgainInsteadOfJSONThomas Müller2014-09-241-1/+3
|\ \ \ \ | |_|/ / |/| | | Show login again instead of JSON if CSRF check fails
| * | | Show login again instead of JSON if CSRF check failsLukas Reschke2014-09-231-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously a JSON error page was shown to the user in-case the CSRF token was not valid. This was confusing and prevented people from login. With this at least the login page is shown again and not a JSON error message. I consider this as sufficient since adding a new error page just for this sake would uneededly make lib/base.php even more cluttered and this is a edge-case which optimally should anyways not happen that often. This can be tested by opening the login page, then clearing the cookies, and trying to login.
* | | | Merge pull request #11229 from kofemann/for-upstreamLukas Reschke2014-09-241-9/+8
|\ \ \ \ | | | | | | | | | | user/backed: use pow of two for backed action constants
| * | | | user/backed: use pow of two for backed action constantsTigran Mkrtchyan2014-09-231-9/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the current implementation limits number of possible backed actions to 8 as it uses pow of 16 for constants. This change introduces pow of two and allows up-to 32 actions to be defined. The old values are preserved for backward compatibility.
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-09-2452-101/+10
| | | | |
* | | | | Merge pull request #11019 from owncloud/do-not-show-exception-to-enduserLukas Reschke2014-09-235-62/+40
|\ \ \ \ \ | | | | | | | | | | | | Do not show exception to the end-user - use a proper error page instead
| * | | | | fix error message templateMorris Jobke2014-09-171-0/+1
| | | | | |