aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #22446 from owncloud/3rdparty-adjustmentThomas Müller2016-02-171-0/+0
|\ | | | | Add new patchwork references
| * Add new patchwork referencesLukas Reschke2016-02-171-0/+0
| | | | | | | | CI for https://github.com/owncloud/3rdparty/pull/249
* | Merge pull request #22340 from owncloud/allow-licensephp-for-app-repos-aswellThomas Müller2016-02-171-9/+53
|\ \ | | | | | | Allow license.php for app repos aswell
| * | Check the mailmap file of core as wellJoas Schilling2016-02-171-1/+28
| | |
| * | Allow the script to run for different git rootsJoas Schilling2016-02-171-8/+25
| | |
* | | Merge pull request #16783 from owncloud/handle-redirects-globalThomas Müller2016-02-179-20/+130
|\ \ \ | | | | | | | | Adding global error handler for ajax calls which run into redirection…
| * | | Send 401 header for OC_JSON::checkLoggedIn()Lukas Reschke2016-02-161-0/+1
| | | |
| * | | Catch auth coming from JS in OCSLukas Reschke2016-02-151-2/+9
| | | |
| * | | Add handler for global ajax errorsVincent Petry2016-02-157-22/+117
| | | |
| * | | Adding global error handler for ajax calls which run into redirections or ↵Thomas Müller2016-02-151-0/+7
| | | | | | | | | | | | | | | | unauthorized responses
* | | | Merge pull request #22468 from owncloud/files_external-globalThomas Müller2016-02-179-272/+3
|\ \ \ \ | | | | | | | | | | remove global credentials
| * | | | remove global credentialsRobin Appelman2016-02-179-272/+3
| | | | |
* | | | | Merge pull request #22470 from owncloud/minimum-phpunit-4.4Thomas Müller2016-02-173-173/+4
|\ \ \ \ \ | |/ / / / |/| | | | Minimum phpunit 4.4
| * | | | Kill no longer used autotest.cmdThomas Müller2016-02-171-169/+0
| | | | |
| * | | | We require minimum PHPUnit 4.4Thomas Müller2016-02-172-4/+4
|/ / / /
* | | | Merge pull request #22445 from owncloud/files-client-sendpropfindheadersThomas Müller2016-02-172-17/+14
|\ \ \ \ | |_|_|/ |/| | | Files DAV client send propfind headers
| * | | Fix redundant headers in files dav clientVincent Petry2016-02-161-12/+7
| | | | | | | | | | | | | | | | | | | | The defaultHeaders are already injected with the xhrProvider, so no need to pass them again a second time.
| * | | Update davclient library for propfind headersVincent Petry2016-02-161-5/+7
| | | |
* | | | Merge pull request #22452 from owncloud/fix_22441Thomas Müller2016-02-172-0/+43
|\ \ \ \ | | | | | | | | | | Unlock sharee input field when sharing fails
| * | | | Do not clear sharee input on failed shareRoeland Jago Douma2016-02-171-2/+2
| | | | |
| * | | | Unlock sharee input field when sharing failsRoeland Jago Douma2016-02-172-0/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #22441 When addShares fails (for whatever reason) we should unlock the sharee input field so the user does not have to reload the page.
* | | | | Merge pull request #22451 from owncloud/use-proper-user-folderThomas Müller2016-02-172-7/+11
|\ \ \ \ \ | | | | | | | | | | | | Handles null as return code and uses proper UserFolder in trashbin
| * | | | | Handles null as return code and uses proper UserFolder in trashbinMorris Jobke2016-02-162-7/+11
| | |_|_|/ | |/| | |
* | | | | Merge pull request #22437 from owncloud/fix_14095Thomas Müller2016-02-171-1/+1
|\ \ \ \ \ | | | | | | | | | | | | Allow searching for single character users to share with
| * | | | | Allow searching for single userRoeland Jago Douma2016-02-161-1/+1
| |/ / / /
* | | | | Merge pull request #22435 from owncloud/trashbin-hook-nouserThomas Müller2016-02-171-2/+5
|\ \ \ \ \ | | | | | | | | | | | | Don't resize trash when no user
| * | | | | Don't resize trash when no userVincent Petry2016-02-161-2/+5
| | |_|/ / | |/| | | | | | | | | | | | | Happens when overwriting files on federated shares.
* | | | | Merge pull request #22419 from ↵Thomas Müller2016-02-171-1/+10
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | owncloud/issue-20663-console-add-user-group-with-shares Make sure to init the users Filesystem so we can add group shares
| * | | | | Make sure to init the users Filesystem so we can add group sharesJoas Schilling2016-02-161-1/+10
| | | | | |
* | | | | | Merge pull request #22299 from owncloud/erikpel-css-fixThomas Müller2016-02-171-1/+4
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | App navigation scrolling (Possible fix for #22158)
| * | | | | Fixes #22158Erik Pellikka2016-02-161-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | changed 620px to calc(100vh - 100px);
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2016-02-17374-74/+2840
| |_|_|/ / |/| | | |
* | | | | Merge pull request #22432 from owncloud/files_external-backendsThomas Müller2016-02-164-185/+4
|\ \ \ \ \ | |_|_|/ / |/| | | | remove login credentails and user provided backends
| * | | | remove login credentails and user provided backendsRobin Appelman2016-02-164-185/+4
| | |/ / | |/| |
* | | | Merge pull request #22429 from owncloud/fix-coverage-reportingThomas Müller2016-02-161-11/+12
|\ \ \ \ | | | | | | | | | | Fix coverage reporting
| * | | | Fix coverage reportingThomas Müller2016-02-161-11/+12
| | | | |
* | | | | Merge pull request #22430 from owncloud/add-new-apps-to-transifexThomas Müller2016-02-16194-0/+1172
|\ \ \ \ \ | |/ / / / |/| | | | Adding transifex to new core apps
| * | | | [tx-robot] updated from transifexJenkins for ownCloud2016-02-16188-0/+1142
| | | | |
| * | | | Adding transifex to new core appsThomas Müller2016-02-166-0/+30
|/ / / /
* | | | Merge pull request #22413 from owncloud/kill-coverage-on-scrutinizerThomas Müller2016-02-162-4/+59
|\ \ \ \ | | | | | | | | | | No more code coverage on scrutinizer
| * | | | Add script to generate coverage badgesThomas Müller2016-02-161-0/+59
| | | | |
| * | | | No more code coverage on scrutinizerThomas Müller2016-02-161-4/+0
| | | | |
* | | | | Merge pull request #22416 from owncloud/fix_22402Thomas Müller2016-02-162-42/+15
|\ \ \ \ \ | | | | | | | | | | | | Return proper error string if sharing for this user is disabled
| * | | | | Return proper error string if sharing for this user is disabledRoeland Jago Douma2016-02-162-42/+15
| | | | | | | | | | | | | | | | | | | | | | | | Fixes #22402
* | | | | | Merge pull request #22338 from owncloud/fix_22247Thomas Müller2016-02-162-9/+10
|\ \ \ \ \ \ | | | | | | | | | | | | | | Allow more characters in filenames
| * | | | | | Fix unit testsRoeland Jago Douma2016-02-121-7/+7
| | | | | | |
| * | | | | | More characters are allowed on POSIX systemsRoeland Jago Douma2016-02-121-2/+3
| | | | | | |
* | | | | | | Merge pull request #22417 from owncloud/issue-22389-duplicate-output-messageMorris Jobke2016-02-161-4/+0
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | Remove inaccurate "is already enabled" message
| * | | | | | Remove inaccurate "is already enabled" messageJoas Schilling2016-02-161-4/+0
|/ / / / / /
* | | | | | Merge pull request #22398 from owncloud/fix-card-propertiesThomas Müller2016-02-164-15/+18
|\ \ \ \ \ \ | | | | | | | | | | | | | | Queries on the cards table by uri require the addressbook as well
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-15 15:27:54 +0000