summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Do not request an avatar if there is noneRoeland Jago Douma2015-12-041-2/+6
|
* Only try to load avatars in the user list if there is anyRoeland Jago Douma2015-12-043-13/+64
|
* Merge pull request #20370 from owncloud/external-db-configVincent Petry2015-12-0418-951/+1614
|\ | | | | Move files_external mount config to the database
| * db config backend for files_externalRobin Appelman2015-12-0418-951/+1614
|/
* Merge pull request #20947 from owncloud/delete-users-from-system-addressbookThomas Müller2015-12-041-0/+12
|\ | | | | Delete no longer existing users from system addressbook
| * Delete no longer existing users from system addressbookThomas Müller2015-12-041-0/+12
| |
* | Merge pull request #20946 from robinkanters/patch-1Thomas Müller2015-12-041-1/+1
|\ \ | |/ |/| Fixed small typo in README
| * Fixed small typo in 'Access'Robin Kanters2015-12-041-1/+1
| |
* | Merge pull request #20943 from owncloud/load_avatar_onceVincent Petry2015-12-042-21/+41
|\ \ | |/ |/| [Avatars] JS should not load same avatar twice
| * [Avatars] JS should not load same avatar twiceRoeland Jago Douma2015-12-042-21/+41
|/ | | | | | | | | Old code first dit an ajax request to the avatar. Then a new image object with the same src was created and since we do not cache avatars yet :( this resulted in 2 sequential requests to the exact same URL Now if you set the displayname it will first set the placeholder and then load the avatar in the background. Only once this time!
* Merge pull request #20933 from owncloud/more-OC_Config-cleanupsThomas Müller2015-12-049-11/+12
|\ | | | | More cleanups of OC_Config usage
| * More cleanups of OC_Config usageMorris Jobke2015-12-039-11/+12
| |
* | Merge pull request #20931 from owncloud/dav-fixnamespaceoutputThomas Müller2015-12-042-2/+2
|\ \ | | | | | | Fix namespace XML output of files and tags dav
| * | Fix namespace XML output of files and tags davVincent Petry2015-12-032-2/+2
| |/
* | [tx-robot] updated from transifexJenkins for ownCloud2015-12-0496-84/+58
| |
* | Merge pull request #20907 from owncloud/integration_tests_for_capabilitiesThomas Müller2015-12-034-1/+92
|\ \ | | | | | | Added capabilities context and tests
| * | Changed fail for assertEquals and removed fields which weren't checkedSergio Bertolin2015-12-032-11/+12
| | |
| * | Added capabilities context and testsSergio Bertolin2015-12-024-1/+91
| | |
* | | Merge pull request #20807 from ↵Thomas Müller2015-12-039-72/+283
|\ \ \ | | | | | | | | | | | | | | | | owncloud/dont-append-redirect-url-if-user-is-already-logged-in Don't append redirect URL if user is logged-in
| * | | Show error templateLukas Reschke2015-11-309-72/+283
| | | | | | | | | | | | | | | | Otherwise this leads to an endless redirection in case of a CSRF exception. Also sets user expectation right.
* | | | Merge pull request #20545 from owncloud/scan-storage-in-background-jobThomas Müller2015-12-039-146/+280
|\ \ \ \ | |_|_|/ |/| | | Move files/ajax/scan.php to background job
| * | | Move files/ajax/scan.php to background jobLukas Reschke2015-11-289-146/+280
| | | | | | | | | | | | | | | | The background job will now be executed in chunks of 500 users all 10 minutes.
* | | | Merge pull request #20924 from owncloud/use-url-generator-to-generate-linkThomas Müller2015-12-031-2/+2
|\ \ \ \ | | | | | | | | | | Use URLGenerator instead of hard-coded WEBROOT
| * | | | Use URLGenerator instead of hard-coded WEBROOTLukas Reschke2015-12-031-2/+2
| | | | | | | | | | | | | | | | | | | | Fixes https://github.com/owncloud/core/issues/20922
* | | | | Merge pull request #20923 from owncloud/OC_Config-in-setupThomas Müller2015-12-032-4/+5
|\ \ \ \ \ | | | | | | | | | | | | Replace OC_Config in setup
| * | | | | Replace OC_Config in setupMorris Jobke2015-12-032-4/+5
| | | | | |
* | | | | | Merge pull request #20921 from owncloud/last-OC_Config-removals-in-testsThomas Müller2015-12-031-8/+9
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Reduce OC_Config usage in tests/
| * | | | | last change of OC_Config to the proper interface in tests/Morris Jobke2015-12-031-3/+4
| | | | | |
| * | | | | Reduce OC_Config usage in tests/Morris Jobke2015-12-031-5/+5
| | | | | |
* | | | | | Merge pull request #19461 from owncloud/reuse_codeThomas Müller2015-12-032-43/+129
|\ \ \ \ \ \ | |/ / / / / |/| | | | | reuse code
| * | | | | add unit tests for OC_Util::add* methodsMorris Jobke2015-11-231-0/+91
| | | | | |
| * | | | | reuse codeIndividual IT Services2015-11-231-43/+38
| | | | | |
* | | | | | Merge pull request #20729 from owncloud/issue_20599Thomas Müller2015-12-038-13/+183
|\ \ \ \ \ \ | | | | | | | | | | | | | | Add different storage status error codes managed by StoragedNotAvailableExc…
| * | | | | | Fix code from commentsJesús Macias2015-12-034-27/+15
| | | | | | |
| * | | | | | Fix duplicate use in storage controllerJesús Macias2015-12-031-1/+0
| | | | | | |
| * | | | | | Migrate storate status code to storagenotavailablexceptionJesús Macias2015-12-034-11/+12
| | | | | | |
| * | | | | | Fix code from PR commentsJesús Macias2015-12-036-29/+14
| | | | | | |
| * | | | | | Change exception catch orderJesús Macias2015-12-031-5/+5
| | | | | | |
| * | | | | | Delete unnecessary storage status constansJesús Macias2015-12-031-4/+0
| | | | | | |
| * | | | | | Add new external storage exceptions for different errorsJesús Macias2015-12-035-38/+201
| | | | | | |
| * | | | | | Add different storage status codes managed by StoragedNotAvailableExceptionJesús Macias2015-12-032-4/+42
| | | | | | |
* | | | | | | Merge pull request #20916 from ↵Thomas Müller2015-12-032-0/+27
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | owncloud/integration_test_download_public_share_by_range Added test case about downloading by range a public shared file
| * | | | | | Added test case about downloading by range a public shared fileSergio Bertolin2015-12-032-0/+27
| | | | | | |
* | | | | | | Merge pull request #20914 from owncloud/drop-more-OC_Config-from-testsLukas Reschke2015-12-032-6/+8
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | Replace more of OC_Config in tests with IConfig calls
| * | | | | | Replace OC_Config in tests with IConfig callsMorris Jobke2015-12-032-6/+8
|/ / / / / /
* | | | | | Merge pull request #20902 from owncloud/drop-OC_Config-from-testsThomas Müller2015-12-035-35/+45
|\ \ \ \ \ \ | | | | | | | | | | | | | | Replace OC_Config in tests with IConfig calls
| * | | | | | Replace OC_Config in tests with IConfig callsMorris Jobke2015-12-025-35/+45
| | | | | | |
* | | | | | | Merge pull request #20871 from owncloud/bump_doctrine_depsThomas Müller2015-12-031-0/+0
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | [3rdparty] Bump doctrine/dbal deps
| * | | | | | | [3rdparty] Bump doctrine/dbal depsRoeland Jago Douma2015-12-031-0/+0
| | | | | | | |
* | | | | | | | Merge pull request #20872 from owncloud/systemtags-better-not-found-exceptionThomas Müller2015-12-036-10/+60
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Systemtags better not found exception
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-07 22:41:14 +0000