summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #20480 from owncloud/css-prefixesThomas Müller2015-12-077-41/+11
|\
| * remove unneeded css prefixesHendrik Leppelsack2015-11-237-41/+11
* | Merge pull request #20960 from owncloud/drop-OC_Util-getUrlContentThomas Müller2015-12-072-19/+12
|\ \
| * | Remove OC_Util::getUrlContent and replace by proper usage of public interfacesMorris Jobke2015-12-042-19/+12
* | | Merge pull request #11131 from owncloud/use-phpini-wrapperThomas Müller2015-12-0710-19/+20
|\ \ \
| * | | Replace new occurences of ini_get with IniWrapper methodsMorris Jobke2015-11-234-7/+9
| * | | Replacing ini_get instances with inigetwrapper usagesClark Tomlinson2015-11-238-12/+11
* | | | Merge pull request #20904 from owncloud/view-mime-filterThomas Müller2015-12-072-6/+37
|\ \ \ \
| * | | | Fix mimetype filter in getDirectoryContentRobin Appelman2015-12-032-6/+37
* | | | | Merge pull request #20949 from owncloud/fix_20892Thomas Müller2015-12-071-4/+2
|\ \ \ \ \
| * | | | | [Sharing] Properly check if a group already has accessRoeland Jago Douma2015-12-041-4/+2
* | | | | | Merge pull request #20954 from owncloud/settings_user_only_load_avatar_if_ava...Thomas Müller2015-12-074-15/+70
|\ \ \ \ \ \
| * | | | | | 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 #20957 from owncloud/use-correct-method-signatureThomas Müller2015-12-071-1/+1
|\ \ \ \ \ \
| * | | | | | Use correct method signatureLukas Reschke2015-12-041-1/+1
* | | | | | | Merge pull request #20959 from owncloud/drop-OC_App-setActiveNavigationEntryThomas Müller2015-12-075-35/+5
|\ \ \ \ \ \ \
| * | | | | | | remove OC_App::getActiveNavigationEntry - not unsed anymoreMorris Jobke2015-12-041-14/+0
| * | | | | | | Remove unused setActiveNavigationEntry of OC_App - it's also in OCP\AppMorris Jobke2015-12-045-21/+5
| | |/ / / / / | |/| | | | |
* | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-12-074-0/+8
* | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-12-068-2/+20
* | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-12-0530-18/+74
|/ / / / / /
* | | | | | Merge pull request #20370 from owncloud/external-db-configVincent Petry2015-12-0418-951/+1614
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | 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 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 '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 twiceRoeland Jago Douma2015-12-042-21/+41
|/ / / /
* | | | Merge pull request #20933 from owncloud/more-OC_Config-cleanupsThomas Müller2015-12-049-11/+12
|\ \ \ \
| * | | | 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 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
|\ \ \ \ \
| * | | | | 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 owncloud/dont-append-redirect-url-if-user-is-a...Thomas Müller2015-12-039-72/+283
|\ \ \ \ \
| * | | | | Show error templateLukas Reschke2015-11-309-72/+283
* | | | | | Merge pull request #20545 from owncloud/scan-storage-in-background-jobThomas Müller2015-12-039-146/+280
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Move files/ajax/scan.php to background jobLukas Reschke2015-11-289-146/+280
* | | | | | Merge pull request #20924 from owncloud/use-url-generator-to-generate-linkThomas Müller2015-12-031-2/+2
|\ \ \ \ \ \
| * | | | | | Use URLGenerator instead of hard-coded WEBROOTLukas Reschke2015-12-031-2/+2
* | | | | | | Merge pull request #20923 from owncloud/OC_Config-in-setupThomas Müller2015-12-032-4/+5
|\ \ \ \ \ \ \
| * | | | | | | 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
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | 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
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
generated by cgit v1.2.3 (git 2.39.1) at 2025-03-05 02:01:33 +0000