summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | [3rdparty] Bump symfony/event-dispatcher to 2.7.7Roeland Jago Douma2015-11-251-0/+0
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge pull request #20730 from owncloud/fix-errorpage-buttonThomas Müller2015-11-252-5/+6
|\ \ \ \ \ \ \ \
| * | | | | | | | update page: fix heading whitespace and unbold less important sectionsJan-Christoph Borchardt2015-11-252-5/+4
| * | | | | | | | fix error page button text when label too longJan-Christoph Borchardt2015-11-251-0/+2
* | | | | | | | | Merge pull request #20703 from owncloud/share2.0_fileowner_columnThomas Müller2015-11-252-1/+15
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | [Sharing 2.0] Add a new db column for the file ownerRoeland Jago Douma2015-11-252-1/+15
* | | | | | | | | | Merge pull request #20691 from owncloud/share2.0_di_fixesThomas Müller2015-11-2510-464/+394
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | [Sharing 2.0] Use the rootfolder to get the path of a shareRoeland Jago Douma2015-11-243-49/+65
| * | | | | | | | | | [Sharing 2.0] Fix phpdoc etcRoeland Jago Douma2015-11-246-46/+53
| * | | | | | | | | | [Sharing 2.0] Move authentication to the OCS APIRoeland Jago Douma2015-11-243-62/+147
| * | | | | | | | | | [Sharing 2.0] Default share provider only generic DIRoeland Jago Douma2015-11-243-153/+117
| * | | | | | | | | | [Sharing 2.0] Removed unused DI stuffRoeland Jago Douma2015-11-244-176/+34
* | | | | | | | | | | Merge pull request #20705 from owncloud/fix_20648Thomas Müller2015-11-251-2/+2
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Fix overriding function from 3rdparty warningRoeland Jago Douma2015-11-241-2/+2
* | | | | | | | | | | Merge pull request #20439 from owncloud/etag-propagate-in-storageThomas Müller2015-11-2526-945/+339
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | update testsRobin Appelman2015-11-195-41/+12
| * | | | | | | | | | take the etag of child mounts into account for the folder etagRobin Appelman2015-11-1921-815/+243
| * | | | | | | | | | Fix scanning of incomplete foldersRobin Appelman2015-11-191-1/+1
| * | | | | | | | | | use relative pathRobin Appelman2015-11-191-1/+1
| * | | | | | | | | | fix fileinfo for non existing filesRobin Appelman2015-11-191-0/+4
| * | | | | | | | | | Some more cleanup for getFIleInfo/getDirectoryContentRobin Appelman2015-11-192-39/+42
| * | | | | | | | | | Split getting cache entry and checking update to a seperate methodRobin Appelman2015-11-191-58/+46
* | | | | | | | | | | Merge pull request #20724 from owncloud/symfony-processThomas Müller2015-11-251-0/+0
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | [3rdparty] Bump symfony/process to 2.7.7Roeland Jago Douma2015-11-251-0/+0
|/ / / / / / / / / / /
* | | | | | | | | | | Merge pull request #20673 from owncloud/symfony_routingThomas Müller2015-11-251-0/+0
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | [3rdparty] Bump symfony/routingRoeland Jago Douma2015-11-251-0/+0
|/ / / / / / / / / / /
* | | | / / / / / / / [tx-robot] updated from transifexJenkins for ownCloud2015-11-25116-126/+254
| |_|_|/ / / / / / / |/| | | | | | | | |
* | | | | | | | | | Merge pull request #20636 from owncloud/savre-3.0Thomas Müller2015-11-2414-167/+227
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fix for parsing pretty printed Webdav responsesVincent Petry2015-11-242-9/+29
| * | | | | | | | | | Adjust sabre changes in coreThomas Müller2015-11-2411-158/+198
| * | | | | | | | | | Update sabre/dav to 3.0.5 including dependenciesThomas Müller2015-11-241-0/+0
| | |_|_|_|_|/ / / / | |/| | | | | | | |
* | | | | | | | | | Merge pull request #20692 from owncloud/federation_auto_add_serversThomas Müller2015-11-248-5/+175
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / |/| | | | | | | | |
| * | | | | | | | | Remove invalid use statementThomas Müller2015-11-241-1/+0
| * | | | | | | | | always store server url without a trailing slashBjörn Schießle2015-11-242-3/+20
| * | | | | | | | | use hooks to auto add server to the list of trusted servers once a federated ...Björn Schießle2015-11-246-1/+155
* | | | | | | | | | Merge pull request #18294 from esakol/issue17173Thomas Müller2015-11-241-39/+67
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fix RHDS ldap paged search, Issue #17173Mario Kolling2015-11-091-39/+67
* | | | | | | | | | | Merge pull request #20595 from owncloud/fix-double-slashesThomas Müller2015-11-241-1/+5
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Avoid double slashes in URL when trying to add an remote shareblizzz2015-11-181-1/+5
* | | | | | | | | | | | Merge pull request #18999 from owncloud/ext-config-listadminThomas Müller2015-11-249-220/+377
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Defer initialisation of data until after complete constructionRobin McCorkell2015-11-222-22/+39
| * | | | | | | | | | | Clear highlight on RSA public key generationRobin McCorkell2015-11-211-1/+1
| * | | | | | | | | | | Only set value if it exists in the StorageConfigRobin McCorkell2015-11-211-2/+5
| * | | | | | | | | | | Reset mountpoint input field when creating new mountRobin McCorkell2015-11-211-0/+1
| * | | | | | | | | | | Fix JS unit testsRobin McCorkell2015-11-212-4/+6
| * | | | | | | | | | | Fix external storage priority logicRobin McCorkell2015-11-211-1/+1
| * | | | | | | | | | | Load applicable users/groups correctlyRobin McCorkell2015-11-211-0/+13
| * | | | | | | | | | | Display applicable global storages in personal mount listRobin McCorkell2015-11-216-57/+187
| * | | | | | | | | | | Render external storages list in JSRobin McCorkell2015-11-213-149/+140
* | | | | | | | | | | | Merge pull request #20574 from owncloud/files_external_list_commandRobin Appelman2015-11-242-0/+265
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / |/| | | | | | | | | | |