summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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 ↵Thomas Müller2015-03-261-25/+29
| | | | file/folder via commandline argument
* 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
|
* 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 Guzzle
| * 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.
| * | 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"
| * | | 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 middle click on breadcrumb
| * | | 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 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-251-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-feedbackVincent Petry2015-03-253-10/+1
|\ \ \ \ | | | | | | | | | | only show connection checks results if there are errors, fix #11476
| * | | | 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
| * | | | 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
| * | | | | do not show update notification on mobile, fix overlapping of header menus, ↵Jan-Christoph Borchardt2015-03-251-0/+5
| | |/ / / | |/| | | | | | | | | | | | | fix #10544
* | | | | Merge pull request #15183 from owncloud/active-usermenu-entryVincent Petry2015-03-251-2/+7
|\ \ \ \ \ | | | | | | | | | | | | highlight active user menu entry
| * | | | | 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 rows
| * | | | Use individual timers for separate config rowsRobin McCorkell2015-03-241-30/+21
| | | | |
* | | | | Merge pull request #15179 from owncloud/trash-recreatetrashfolderafterfulldeleteVincent Petry2015-03-251-0/+2
|\ \ \ \ \ | |_|/ / / |/| | | | Recreate trashbin folder after full deletion
| * | | | Recreate trashbin folder after full deletionVincent Petry2015-03-241-0/+2
| | |_|/ | |/| |
* | | | Merge pull request #14970 from owncloud/sidebar-enhancementsJan-Christoph Borchardt2015-03-252-2/+10
|\ \ \ \ | |_|_|/ |/| | | sidebar fixes
| * | | double padding to account for Deleted files entry, issue with FirefoxJan-Christoph Borchardt2015-03-241-0/+4
| | | |
| * | | fix position of 'Deleted files' sidebar entry, fix #10815Jan-Christoph Borchardt2015-03-182-2/+5
| | | |
| * | | add bottom padding to sidebar, fix last element being hidden below settings, ↵Jan-Christoph Borchardt2015-03-171-0/+1
| | | | | | | | | | | | | | | | fix #13264
* | | | Merge pull request #15181 from owncloud/simple-fixThomas Müller2015-03-251-1/+1
|\ \ \ \ | | | | | | | | | | Make the link to issue template bold
| * | | | Make the link to issue template boldDaniel Hansson2015-03-251-1/+1
| | | | | | | | | | | | | | | Makes it easier to see the issue template link. And hopefully more we don't have to tell everybody that much that they should use it.
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-03-25138-866/+174
|/ / / /
* | | | Merge pull request #15171 from owncloud/sabre-logforbiddenasdebugThomas Müller2015-03-241-0/+3
|\ \ \ \ | | | | | | | | | | Log forbidden in debug level
| * | | | Log forbidden in debug levelVincent Petry2015-03-241-0/+3
| | |/ / | |/| |
* | | | Merge pull request #14949 from owncloud/sabre-2.1.3Lukas Reschke2015-03-242-1/+2
|\ \ \ \ | |_|_|/ |/| | | Update sabre-2.1.3 thirdparty submodule
| * | | Update 3rd party ref for sabre 2.1.3Vincent Petry2015-03-191-0/+0
| | | |
| * | | Fix Principal connector overrideVincent Petry2015-03-171-1/+2
| | | |
| * | | Update sabre-2.1.3 thirdparty submoduleVincent Petry2015-03-171-0/+0
| | | |
* | | | Merge pull request #15055 from owncloud/share-activity-groupingMorris Jobke2015-03-241-0/+14
|\ \ \ \ | | | | | | | | | | Group sharing activities by user/group and file respectively
| * | | | Group sharing activities by user/group and file respectivelyJoas Schilling2015-03-201-0/+14
| | | | |
* | | | | Merge pull request #15160 from owncloud/deduplicate-external-manager-testsMorris Jobke2015-03-242-154/+67
|\ \ \ \ \ | | | | | | | | | | | | Deduplicate external manager tests
| * | | | | Merge the two tests into oneJoas Schilling2015-03-242-154/+67
| | | | | |
* | | | | | Merge pull request #14919 from rullzer/files_thumbnail_fixMorris Jobke2015-03-243-15/+53
|\ \ \ \ \ \ | | | | | | | | | | | | | | Files thumbnail fix
| * | | | | | No longer directly output OC_Image for thumbnailsRoeland Jago Douma2015-03-243-15/+53
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Only use public interfaces - Injected IPreview * Added unit tests