summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Add magical regex to catch browsersLukas Reschke2016-03-242-1/+15
* In case of exception we return an html page in case the client is a browserThomas Müller2016-03-247-3/+215
* Merge pull request #23511 from owncloud/sidebar-clickThomas Müller2016-03-242-4/+19
|\
| * sidebar click modificationErik Pellikka2016-03-242-4/+19
* | Merge pull request #23551 from owncloud/objectstoremissingvarThomas Müller2016-03-241-0/+4
|\ \
| * | add missing varJörn Friedrich Dreyer2016-03-241-0/+4
* | | Merge pull request #23342 from owncloud/fix-group-sharing-for-v1-caldav-and-c...Thomas Müller2016-03-2410-88/+212
|\ \ \ | |/ / |/| |
| * | Fix acls for calendar objects and cards - fixes #23273Thomas Müller2016-03-249-84/+192
| * | Return proper current-user-principal on v1 endpoints - fixes #23306Thomas Müller2016-03-241-0/+15
| * | Fix group shares on v1 caldav and carddav - fixes #23328Thomas Müller2016-03-243-4/+5
* | | Merge pull request #23542 from owncloud/catch-empty-app-path-oh-we-really-sho...Thomas Müller2016-03-241-3/+6
|\ \ \ | |_|/ |/| |
| * | getAppPath can return falseLukas Reschke2016-03-241-3/+6
| |/
* | Merge pull request #23530 from owncloud/fix-shibbolethVincent Petry2016-03-243-36/+242
|\ \ | |/ |/|
| * Check if request is sent from official ownCloud clientLukas Reschke2016-03-243-36/+242
|/
* [tx-robot] updated from transifexJenkins for ownCloud2016-03-24372-1018/+420
* Merge pull request #23515 from owncloud/issue-22695-wrong-menu-translationsThomas Müller2016-03-231-6/+4
|\
| * Fix the translations of the User menuJoas Schilling2016-03-231-6/+4
* | Merge pull request #23507 from owncloud/fix-23496-masterThomas Müller2016-03-231-2/+4
|\ \
| * | fixes #23496Thomas Müller2016-03-231-2/+4
* | | Merge pull request #23509 from owncloud/bump_polyfillThomas Müller2016-03-231-0/+0
|\ \ \
| * | | [3rdparty] Bump symfony/polyfill packagesRoeland Jago Douma2016-03-231-0/+0
|/ / /
* | | Merge pull request #22506 from owncloud/node-get-from-cacheThomas Müller2016-03-236-66/+131
|\ \ \
| * | | properly use fileinfo objectsRobin Appelman2016-03-212-34/+75
| * | | set watch policy in testRobin Appelman2016-03-212-9/+39
| * | | improve reuse in getUserFolderRobin Appelman2016-03-211-6/+6
| * | | pass the fileinfo to the node if availableRobin Appelman2016-03-213-17/+10
| * | | Query the cache when checking if a node existsRobin Appelman2016-03-211-2/+3
* | | | Merge pull request #23434 from owncloud/symfony-event-dispatcherThomas Müller2016-03-231-0/+0
|\ \ \ \
| * | | | [3rdparty] Bump symfony/event-dispatcherRoeland Jago Douma2016-03-231-0/+0
* | | | | Merge pull request #23431 from owncloud/use-dav-sabre-plugin-for-browser-2Thomas Müller2016-03-233-14/+29
|\ \ \ \ \
| * | | | | Fix display of vcard and calendar object details page in browser pluginThomas Müller2016-03-233-14/+29
* | | | | | Merge pull request #23142 from owncloud/request_propertiesThomas Müller2016-03-231-1/+8
|\ \ \ \ \ \
| * | | | | | Fix warning in request.phpRoeland Jago Douma2016-03-231-1/+8
* | | | | | | Merge pull request #22895 from owncloud/cleanup_default_share_providerThomas Müller2016-03-232-147/+16
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | Remove dead functionRoeland Jago Douma2016-03-231-24/+0
| * | | | | | Remove support for old shares in the default share providerRoeland Jago Douma2016-03-232-123/+16
| |/ / / / /
* | | | | | Merge pull request #23362 from owncloud/fix-l10n-for-themesThomas Müller2016-03-236-19/+67
|\ \ \ \ \ \
| * | | | | | Inject server root - allows proper testing and separation of concernsMorris Jobke2016-03-185-24/+30
| * | | | | | Read available l10n files also from theme folderMorris Jobke2016-03-173-7/+49
* | | | | | | Merge pull request #23463 from owncloud/lets-consistently-use-no-refererThomas Müller2016-03-2314-55/+55
|\ \ \ \ \ \ \
| * | | | | | | Consistently use rel=noreferrerLukas Reschke2016-03-2014-55/+55
* | | | | | | | Merge pull request #23495 from owncloud/disable-paste-zoneThomas Müller2016-03-233-0/+3
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | |
| * | | | | | | Disable pastezone for jquery.fileuploadLukas Reschke2016-03-223-0/+3
* | | | | | | | Merge pull request #23474 from owncloud/RealRancor-exclude_lost_and_foundThomas Müller2016-03-231-1/+2
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | |
| * | | | | | | Merge branch 'exclude_lost_and_found' of https://github.com/RealRancor/core i...Lukas Reschke2016-03-221-1/+2
| |\ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | |
| | * | | | | | Exclude lost+found dir in integrity checkRealRancor2016-03-191-1/+2
* | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2016-03-2394-172/+34
* | | | | | | | Merge pull request #23485 from owncloud/composer_allow_ocpThomas Müller2016-03-223-1/+5
|\ \ \ \ \ \ \ \
| * | | | | | | | Move IServerContainter to PSR-4Roeland Jago Douma2016-03-221-0/+0
| * | | | | | | | Allos OCP classes to be PSR-4 as wellRoeland Jago Douma2016-03-222-1/+5