summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #14495 from owncloud/update-mailmap-01Thomas Müller2015-03-26843-6291/+16123
|\
| * Update license headersJenkins for ownCloud2015-03-26841-6255/+16060
| * detect MIT licensed files and ignore them for nowThomas Müller2015-03-261-1/+18
| * properly break after the first comment ends + allow to pass in one file/folde...Thomas Müller2015-03-261-25/+29
| * Updating email of nickvergessen and georgThomas Müller2015-03-261-5/+6
| * fixing ignorance of 'Not Committed Yet'Thomas Müller2015-03-261-1/+4
| * Updating .mailmapThomas Müller2015-03-261-4/+6
* | Merge pull request #15226 from owncloud/fix-upload-placeholderJoas Schilling2015-03-261-1/+1
|\ \
| * | Revert "add https:// placeholder for From Link feature. closes #13255"Robin McCorkell2015-03-261-1/+1
* | | Merge pull request #15224 from owncloud/issue/15191-app-code-checker-error-listJoas Schilling2015-03-261-2/+3
|\ \ \ | |/ / |/| |
| * | Correctly only send the errors of the current file to the eventJoas Schilling2015-03-261-2/+3
* | | Merge pull request #15218 from owncloud/revert-oc-etag-masterThomas Müller2015-03-263-48/+2
|\ \ \ | |/ / |/| |
| * | Revert "adding OC-ETag header"Vincent Petry2015-03-262-20/+2
| * | Revert "adding unit tests"Vincent Petry2015-03-262-33/+5
|/ /
* | Merge pull request #15212 from owncloud/log-widthMorris Jobke2015-03-263-3/+7
|\ \
| * | force log messages to break to alleviate horizontal scroll on Admin pageJan-Christoph Borchardt2015-03-263-3/+7
* | | Merge pull request #15168 from owncloud/oc-etag-masterVincent Petry2015-03-263-2/+48
|\ \ \
| * | | adding unit testsThomas Müller2015-03-262-5/+33
| * | | adding OC-ETag headerThomas Müller2015-03-242-2/+20
* | | | Merge pull request #14125 from dratini0/masterLukas Reschke2015-03-261-1/+7
|\ \ \ \
| * | | | Removed simplified X-accel-redirect even furtherdratini02015-03-231-6/+1
| * | | | Changed the disputed while loop to a single if.dratini02015-03-231-2/+2
| * | | | Extending the X-accel redirect functionality with a more scalable approach.dratini02015-02-111-1/+10
| * | | | Revert "Fix: X-Accel-Redirect did not support custom data dir and local mounts"dratini02015-02-111-1/+1
| * | | | Revert "removed a little duplication"dratini02015-02-111-1/+3
* | | | | Merge pull request #15206 from owncloud/mark-dot-files-grayThomas Müller2015-03-262-1/+24
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Show hidden files (dot files) in grayMorris Jobke2015-03-262-1/+24
| | |_|/ | |/| |
* | | | update 3rdparty submoduleMorris Jobke2015-03-261-0/+0
* | | | Merge pull request #15195 from owncloud/reanimate-add-guzzleMorris Jobke2015-03-2627-230/+4869
|\ \ \ \
| * | | | Add wrapper for GuzzleLukas Reschke2015-03-2527-230/+4869
* | | | | Merge pull request #15194 from owncloud/fix-15146Thomas Müller2015-03-261-0/+2
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Do not use APCu when apc.enabled is Off.Andreas Fischer2015-03-251-0/+2
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-03-2684-76/+336
* | | | | Merge pull request #15203 from owncloud/revert-15201-webdav-ng-bugfixMorris Jobke2015-03-261-5/+0
|\ \ \ \ \
| * | | | | Revert "FIX for webdav.mediencenter.t-online.de"Morris Jobke2015-03-261-5/+0
|/ / / / /
* | | | | Merge pull request #15170 from owncloud/middleclickbreadcrumbMorris Jobke2015-03-262-4/+4
|\ \ \ \ \
| * | | | | Fix breadcrumb click JS unit testVincent Petry2015-03-251-2/+2
| * | | | | Fix middle click on breadcrumbVincent Petry2015-03-241-2/+2
* | | | | | Merge pull request #15201 from owncloud/webdav-ng-bugfixOliver Kohl D.Sc.2015-03-251-0/+5
|\ \ \ \ \ \
| * | | | | | FIX for webdav.mediencenter.t-online.de Oliver Kohl D.Sc.2015-03-251-0/+5
|/ / / / / /
* | | | | | Merge pull request #15187 from owncloud/connectioncheck-feedbackVincent Petry2015-03-253-10/+1
|\ \ \ \ \ \
| * | | | | | only show connection checks results if there are errors, fix #11476Jan-Christoph Borchardt2015-03-253-10/+1
| | |/ / / / | |/| | | |
* | | | | | Merge pull request #15185 from owncloud/fix-14775-masterVincent Petry2015-03-251-0/+1
|\ \ \ \ \ \
| * | | | | | tearDown the file system before reinitializing - fixes #14775Thomas Müller2015-03-251-0/+1
* | | | | | | Merge pull request #15190 from owncloud/hide-update-notification-on-mobileMorris Jobke2015-03-251-0/+5
|\ \ \ \ \ \ \
| * | | | | | | do not show update notification on mobile, fix overlapping of header menus, f...Jan-Christoph Borchardt2015-03-251-0/+5
| | |/ / / / / | |/| | | | |
* | | | | | | Merge pull request #15183 from owncloud/active-usermenu-entryVincent Petry2015-03-251-2/+7
|\ \ \ \ \ \ \
| * | | | | | | highlight active user menu entryJan-Christoph Borchardt2015-03-251-2/+7
| |/ / / / / /
* | | | | | | Merge pull request #15180 from owncloud/ext-tabbingMorris Jobke2015-03-251-30/+21
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | |
| * | | | | | Use individual timers for separate config rowsRobin McCorkell2015-03-241-30/+21