Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #14495 from owncloud/update-mailmap-01 | Thomas Müller | 2015-03-26 | 843 | -6291/+16123 |
|\ | | | | | Updating .mailmap | ||||
| * | Update license headers | Jenkins for ownCloud | 2015-03-26 | 841 | -6255/+16060 |
| | | |||||
| * | detect MIT licensed files and ignore them for now | Thomas Müller | 2015-03-26 | 1 | -1/+18 |
| | | |||||
| * | properly break after the first comment ends + allow to pass in one ↵ | Thomas Müller | 2015-03-26 | 1 | -25/+29 |
| | | | | | | | | file/folder via commandline argument | ||||
| * | Updating email of nickvergessen and georg | Thomas Müller | 2015-03-26 | 1 | -5/+6 |
| | | |||||
| * | fixing ignorance of 'Not Committed Yet' | Thomas Müller | 2015-03-26 | 1 | -1/+4 |
| | | |||||
| * | Updating .mailmap | Thomas Müller | 2015-03-26 | 1 | -4/+6 |
| | | |||||
* | | Merge pull request #15226 from owncloud/fix-upload-placeholder | Joas Schilling | 2015-03-26 | 1 | -1/+1 |
|\ \ | | | | | | | Fix placeholder in files upload | ||||
| * | | Revert "add https:// placeholder for From Link feature. closes #13255" | Robin McCorkell | 2015-03-26 | 1 | -1/+1 |
| | | | | | | | | | | | | This reverts commit 18b5966f3a7639c6190f58b0d94e05e67200d57a. | ||||
* | | | Merge pull request #15224 from owncloud/issue/15191-app-code-checker-error-list | Joas Schilling | 2015-03-26 | 1 | -2/+3 |
|\ \ \ | |/ / |/| | | Correctly only send the errors of the current file to the event | ||||
| * | | Correctly only send the errors of the current file to the event | Joas Schilling | 2015-03-26 | 1 | -2/+3 |
| | | | |||||
* | | | Merge pull request #15218 from owncloud/revert-oc-etag-master | Thomas Müller | 2015-03-26 | 3 | -48/+2 |
|\ \ \ | |/ / |/| | | Revert oc etag master | ||||
| * | | Revert "adding OC-ETag header" | Vincent Petry | 2015-03-26 | 2 | -20/+2 |
| | | | | | | | | | | | | This reverts commit 30ee8b6f998b4b2e27da92b3adcdbc4683d3bcde. | ||||
| * | | Revert "adding unit tests" | Vincent Petry | 2015-03-26 | 2 | -33/+5 |
|/ / | | | | | | | This reverts commit 8d327c94a844804d0e7af057866e552bd5aafd17. | ||||
* | | Merge pull request #15212 from owncloud/log-width | Morris Jobke | 2015-03-26 | 3 | -3/+7 |
|\ \ | | | | | | | force log messages to break to alleviate horizontal scroll on Admin page | ||||
| * | | force log messages to break to alleviate horizontal scroll on Admin page | Jan-Christoph Borchardt | 2015-03-26 | 3 | -3/+7 |
| | | | |||||
* | | | Merge pull request #15168 from owncloud/oc-etag-master | Vincent Petry | 2015-03-26 | 3 | -2/+48 |
|\ \ \ | | | | | | | | | adding OC-ETag header | ||||
| * | | | adding unit tests | Thomas Müller | 2015-03-26 | 2 | -5/+33 |
| | | | | |||||
| * | | | adding OC-ETag header | Thomas Müller | 2015-03-24 | 2 | -2/+20 |
| | | | | |||||
* | | | | Merge pull request #14125 from dratini0/master | Lukas Reschke | 2015-03-26 | 1 | -1/+7 |
|\ \ \ \ | | | | | | | | | | | [nginx] Extending X-Accel-Redirect support | ||||
| * | | | | Removed simplified X-accel-redirect even further | dratini0 | 2015-03-23 | 1 | -6/+1 |
| | | | | | |||||
| * | | | | Changed the disputed while loop to a single if. | dratini0 | 2015-03-23 | 1 | -2/+2 |
| | | | | | |||||
| * | | | | Extending the X-accel redirect functionality with a more scalable approach. | dratini0 | 2015-02-11 | 1 | -1/+10 |
| | | | | | |||||
| * | | | | Revert "Fix: X-Accel-Redirect did not support custom data dir and local mounts" | dratini0 | 2015-02-11 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | This reverts commit f2075f803fc59918cc20071cf174d6b5f81f5eed. | ||||
| * | | | | Revert "removed a little duplication" | dratini0 | 2015-02-11 | 1 | -1/+3 |
| | | | | | | | | | | | | | | | | | | | | This reverts commit 31970ee7409ff2ed303b728ea4fd6f8d10302649. | ||||
* | | | | | Merge pull request #15206 from owncloud/mark-dot-files-gray | Thomas Müller | 2015-03-26 | 2 | -1/+24 |
|\ \ \ \ \ | |_|_|_|/ |/| | | | | Show hidden files (dot files) in gray | ||||
| * | | | | Show hidden files (dot files) in gray | Morris Jobke | 2015-03-26 | 2 | -1/+24 |
| | |_|/ | |/| | | |||||
* | | | | update 3rdparty submodule | Morris Jobke | 2015-03-26 | 1 | -0/+0 |
| | | | | |||||
* | | | | Merge pull request #15195 from owncloud/reanimate-add-guzzle | Morris Jobke | 2015-03-26 | 27 | -230/+4869 |
|\ \ \ \ | | | | | | | | | | | Add wrapper for Guzzle | ||||
| * | | | | Add wrapper for Guzzle | Lukas Reschke | 2015-03-25 | 27 | -230/+4869 |
| | | | | | |||||
* | | | | | Merge pull request #15194 from owncloud/fix-15146 | Thomas Müller | 2015-03-26 | 1 | -0/+2 |
|\ \ \ \ \ | |_|/ / / |/| | | | | Do not use APCu when apc.enabled is Off. | ||||
| * | | | | Do not use APCu when apc.enabled is Off. | Andreas Fischer | 2015-03-25 | 1 | -0/+2 |
| | | | | | |||||
* | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-03-26 | 84 | -76/+336 |
| | | | | | |||||
* | | | | | Merge pull request #15203 from owncloud/revert-15201-webdav-ng-bugfix | Morris Jobke | 2015-03-26 | 1 | -5/+0 |
|\ \ \ \ \ | | | | | | | | | | | | | Revert "FIX for webdav.mediencenter.t-online.de" | ||||
| * | | | | | Revert "FIX for webdav.mediencenter.t-online.de" | Morris Jobke | 2015-03-26 | 1 | -5/+0 |
|/ / / / / | |||||
* | | | | | Merge pull request #15170 from owncloud/middleclickbreadcrumb | Morris Jobke | 2015-03-26 | 2 | -4/+4 |
|\ \ \ \ \ | | | | | | | | | | | | | Fix middle click on breadcrumb | ||||
| * | | | | | Fix breadcrumb click JS unit test | Vincent Petry | 2015-03-25 | 1 | -2/+2 |
| | | | | | | |||||
| * | | | | | Fix middle click on breadcrumb | Vincent Petry | 2015-03-24 | 1 | -2/+2 |
| | | | | | | |||||
* | | | | | | Merge pull request #15201 from owncloud/webdav-ng-bugfix | Oliver Kohl D.Sc. | 2015-03-25 | 1 | -0/+5 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | FIX for webdav.mediencenter.t-online.de https://webdav.mediencenter.t-online.de returns invalid response code. e.g. {"reqId":"f9a1c394b98108e4e5ca62bf47829c64","remoteAddr":"81.189.45.224","app":"PHP","message":"Undefined offset: 2 at \/var\/www\/owncloud\/3rdparty\/sabre\/dav\/lib\/Sabre\/DAV\/Client.php#569","level":3,"time":"2015-03-25T18:25:48+00:00","method":"GET","url":"\/index.php\/apps\/files\/ajax\/getstoragestats.php?dir=External%2FT-Cloud%2FTests"} e.g. {"reqId":"3407d66672b3cef206b0af883e49bff4","remoteAddr":"46.74.125.245","app":"PHP","message":"Undefined index: {DAV:}getlastmodified at \/var\/www\/owncloud\/lib\/private\/files\/storage\/dav.php#563","level":3,"time":"2015-03-25T16:33:21+00:00"} | ||||
| * | | | | | | FIX for webdav.mediencenter.t-online.de | Oliver Kohl D.Sc. | 2015-03-25 | 1 | -0/+5 |
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://webdav.mediencenter.t-online.de returns invalid response code. e.g. {"reqId":"f9a1c394b98108e4e5ca62bf47829c64","remoteAddr":"81.189.45.224","app":"PHP","message":"Undefined offset: 2 at \/var\/www\/owncloud\/3rdparty\/sabre\/dav\/lib\/Sabre\/DAV\/Client.php#569","level":3,"time":"2015-03-25T18:25:48+00:00","method":"GET","url":"\/index.php\/apps\/files\/ajax\/getstoragestats.php?dir=External%2FT-Cloud%2FTests"} e.g. {"reqId":"3407d66672b3cef206b0af883e49bff4","remoteAddr":"46.74.125.245","app":"PHP","message":"Undefined index: {DAV:}getlastmodified at \/var\/www\/owncloud\/lib\/private\/files\/storage\/dav.php#563","level":3,"time":"2015-03-25T16:33:21+00:00"} | ||||
* | | | | | | Merge pull request #15187 from owncloud/connectioncheck-feedback | Vincent Petry | 2015-03-25 | 3 | -10/+1 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | only show connection checks results if there are errors, fix #11476 | ||||
| * | | | | | | only show connection checks results if there are errors, fix #11476 | Jan-Christoph Borchardt | 2015-03-25 | 3 | -10/+1 |
| | |/ / / / | |/| | | | | |||||
* | | | | | | Merge pull request #15185 from owncloud/fix-14775-master | Vincent Petry | 2015-03-25 | 1 | -0/+1 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | tearDown the file system before reinitializing | ||||
| * | | | | | | tearDown the file system before reinitializing - fixes #14775 | Thomas Müller | 2015-03-25 | 1 | -0/+1 |
| | | | | | | | |||||
* | | | | | | | Merge pull request #15190 from owncloud/hide-update-notification-on-mobile | Morris Jobke | 2015-03-25 | 1 | -0/+5 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | do not show update notification on mobile, fix overlapping of header menus | ||||
| * | | | | | | | do not show update notification on mobile, fix overlapping of header menus, ↵ | Jan-Christoph Borchardt | 2015-03-25 | 1 | -0/+5 |
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | fix #10544 | ||||
* | | | | | | | Merge pull request #15183 from owncloud/active-usermenu-entry | Vincent Petry | 2015-03-25 | 1 | -2/+7 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | highlight active user menu entry | ||||
| * | | | | | | | highlight active user menu entry | Jan-Christoph Borchardt | 2015-03-25 | 1 | -2/+7 |
| |/ / / / / / | |||||
* | | | | | | | Merge pull request #15180 from owncloud/ext-tabbing | Morris Jobke | 2015-03-25 | 1 | -30/+21 |
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | | Use individual timers for separate config rows | ||||
| * | | | | | | Use individual timers for separate config rows | Robin McCorkell | 2015-03-24 | 1 | -30/+21 |
| | | | | | | |