summaryrefslogtreecommitdiffstats
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* [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
|\
| * 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 than...Bjoern Schiessle2014-09-261-1/+1
| * 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 tha...Bjoern Schiessle2014-09-261-1/+12
| * call \OCP\Share::getItemsSharedWithUser() to get exclude list, this way all c...Bjoern Schiessle2014-09-251-29/+5
| * 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
| * 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 owncloud/fixing-unhandled-exception-cleanTmp-m...Lukas Reschke2014-09-261-3/+21
|\ \
| * | 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 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 memoryRobin Appelman2014-09-241-7/+12
* | | | Merge pull request #10934 from owncloud/datadir-write-setupVincent Petry2014-09-254-28/+42
|\ \ \ \ | |_|/ / |/| | |
| * | | 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
* | | | Merge pull request #11225 from owncloud/showLoginAgainInsteadOfJSONThomas Müller2014-09-241-1/+3
|\ \ \ \ | |_|/ / |/| | |
| * | | Show login again instead of JSON if CSRF check failsLukas Reschke2014-09-231-1/+3
* | | | Merge pull request #11229 from kofemann/for-upstreamLukas Reschke2014-09-241-9/+8
|\ \ \ \
| * | | | user/backed: use pow of two for backed action constantsTigran Mkrtchyan2014-09-231-9/+8
* | | | | [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
|\ \ \ \ \
| * | | | | fix error message templateMorris Jobke2014-09-171-0/+1
| * | | | | Do not show exception to the end-userLukas Reschke2014-09-175-62/+40
* | | | | | Merge pull request #7051 from owncloud/postsetupajaxcheckVincent Petry2014-09-231-47/+0
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Moved WebDAV and internet checks to client side JSVincent Petry2014-09-231-47/+0
* | | | | | Merge pull request #11222 from owncloud/store-users-timezone-masterThomas Müller2014-09-233-17/+29
|\ \ \ \ \ \
| * | | | | | enhance formatDate function to accept an optional argument containing the tim...Thomas Müller2014-09-222-9/+21
| * | | | | | send browsers timezone back tp the server on loginThomas Müller2014-09-221-8/+8
| | |_|/ / / | |/| | | |
* | | | | | Merge pull request #11241 from owncloud/use-lower-caseThomas Müller2014-09-231-1/+1
|\ \ \ \ \ \
| * | | | | | Use only lower-case lettersLukas Reschke2014-09-221-1/+1
* | | | | | | Merge pull request #11032 from owncloud/harden-redirectLukas Reschke2014-09-236-94/+207
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |