summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2014-04-08248-4684/+13590
|
* Merge pull request #8102 from owncloud/fix-appconfig-masterThomas Müller2014-04-083-4/+41
|\ | | | | Fix appconfig master
| * using array_key_exists() instead of isset() - required because in case the ↵Thomas Müller2014-04-071-1/+1
| | | | | | | | value is null isset is returning false
| * fixing undefined exception classesThomas Müller2014-04-071-3/+3
| |
| * unit test testSetAppValueIfSetToNull() addedThomas Müller2014-04-071-0/+37
| |
* | Merge pull request #8089 from bantu/autotest-checkout-pathspecJörn Friedrich Dreyer2014-04-071-1/+1
|\ \ | |/ |/| Use git checkout on directory as some files may not be in git resulting ...
| * Use git checkout on directory as some files may not be in git resulting in, ↵Andreas Fischer2014-04-071-1/+1
| | | | | | | | | | | | | | e.g.: error: pathspec 'tests/data/lorem-copy.txt' did not match any file(s) known to git. error: pathspec 'tests/data/testimage-copy.png' did not match any file(s) known to git.
* | Merge pull request #8065 from owncloud/avatar-highdpiThomas Müller2014-04-071-3/+3
|\ \ | | | | | | use high resolution avatars on highdpi screens
| * | use high resolution avatars on highdpi screensRobin Appelman2014-04-041-3/+3
| | |
* | | Merge pull request #8091 from owncloud/jshint-globals-oc-t-nJörn Friedrich Dreyer2014-04-072-1/+5
|\ \ \ | | | | | | | | adding ownCloud globals to jshintrc: OC, t, n
| * | | ignore underscore.js in scrutinizer.ymlThomas Müller2014-04-071-0/+1
| | | |
| * | | Merge branch 'master' into jshint-globals-oc-t-nThomas Müller2014-04-079-69/+1424
| |\ \ \ | |/ / / |/| | | | | | | | | | | Conflicts: .jshintrc
* | | | Merge pull request #8088 from owncloud/fix-personal.jsThomas Müller2014-04-075-52/+1396
|\ \ \ \ | | | | | | | | | | reduce code duplication, fix parse error, prevent page reload on hitting...
| * | | | adding underscore.jsThomas Müller2014-04-071-0/+1344
| | | | |
| * | | | reduce code duplication, fix parse error, prevent page reload on hitting ↵Thomas Müller2014-04-074-52/+52
| | | | | | | | | | | | | | | | | | | | enter while changing the display name - refs #8085
* | | | | Merge pull request #7599 from owncloud/public-pathinfoicewind19912014-04-071-6/+14
|\ \ \ \ \ | | | | | | | | | | | | Allow using pathinfo based public.php paths
| * | | | | Allow using pathinfo based public.php pathsRobin Appelman2014-03-061-6/+14
| | | | | |
* | | | | | Merge pull request #8083 from owncloud/fix-link-to-syncThomas Müller2014-04-071-2/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | Remove wrong whitespace from URL and use HTTPS
| * | | | | | Switch to HTTPSLukas Reschke2014-04-061-1/+1
| | | | | | |
| * | | | | | Remove wrong whitespace from URL and use HTTPSLukas Reschke2014-04-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The whitespace caused the generated links to begin with a whitespace (e.g. `<a href=" http://owncloud.org/sync-clients/" target="_blank">`) Additionally I switched the link to HTTPS.
* | | | | | | Merge pull request #8086 from owncloud/fix_copy_conflict_translations_in_jsThomas Müller2014-04-072-10/+13
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | Fix copy conflict dialog translation
| * | | | | | translations for oc-dialogs reside in codeJörn Friedrich Dreyer2014-04-071-10/+10
| | | | | | |
| * | | | | | Fix copy conflict dialog translationJörn Friedrich Dreyer2014-04-072-2/+5
| | |_|/ / / | |/| | | |
| | | | * | adding ownCloud globals to jshintrc: OC, t, nThomas Müller2014-04-071-1/+4
| |_|_|/ / |/| | | |
* | | | | Merge pull request #6221 from leo-b/ldap_get_all_groupsblizzz2014-04-073-3/+49
|\ \ \ \ \ | |/ / / / |/| | | | fix updateGroups background job for ldap servers with > 1000 groups
| * | | | adapt description of paging size configurationAlexander Bergolth2014-03-281-1/+1
| | | | |
| * | | | change default ldap paging size to 500Alexander Bergolth2014-03-281-1/+1
| | | | |
| * | | | make getGroupsChunk() protected instead of privateAlexander Bergolth2014-03-131-1/+1
| | | | |
| * | | | adapt coding styleAlexander Bergolth2014-03-131-15/+15
| | | | |
| * | | | fix another oversight... sigh..root2014-03-051-1/+1
| | | | |
| * | | | getGroups(): fix overall max search limit for paged searchesroot2014-03-041-3/+3
| | | | |
| * | | | getGroups() $limit was not handled correctlyroot2014-03-041-2/+7
| | | | |
| * | | | revert updateGroups job to use getGroups() instead of getAllGroups()root2014-03-041-1/+1
| | | | |
| * | | | merge functionality of getAllGroups into getGroupsroot2014-03-041-15/+18
| | | | |
| * | | | Merge branch 'ldap_paging_chunksize' into ldap_get_all_groupsroot2014-03-042-1/+5
| |\ \ \ \
| | * | | | add ldap_paging_size config optionroot2014-03-042-1/+5
| | | | | |
| * | | | | use getAllGroup() in the updateGroups background jobroot2014-03-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | needed in active directory deployments with > 1000 groups
| * | | | | add getAllGroups() that uses a paged search if availableroot2014-03-041-0/+34
| |/ / / / | | | | | | | | | | | | | | | | | | | | this circumvents server side search limits (active directory has a limit of 1000 by default)
* | | | | Merge pull request #8017 from Raydiation/masterblizzz2014-04-071-7/+7
|\ \ \ \ \ | | | | | | | | | | | | Remove dependency on container, removing service locator antipattern
| * | | | | Remove dependency on container, removing service locator antipatternBernhard Posselt2014-04-021-7/+7
| | | | | |
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-04-0734-351/+459
| | | | | |
* | | | | | Merge pull request #8064 from owncloud/remove-not-existing-functionsLukas Reschke2014-04-061-27/+0
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | Removed two unused functions
| * | | | | Removed two unused functionsLukas Reschke2014-04-041-27/+0
| | |_|_|/ | |/| | | | | | | | These two functions were actually not usable and only a todo since ages. I think it's better to remove it than having dead and unmaintained code.
* | | | | Update README.mdVolkan Gezer2014-04-061-1/+1
| | | | | | | | | | | | | | | Update to the correct link (version 6.0)
* | | | | Update README.mdVolkan Gezer2014-04-061-1/+1
| | | | |
* | | | | Update README.mdVolkan Gezer2014-04-061-1/+1
| | | | | | | | | | | | | | | Change version.
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-04-0630-123/+146
| | | | |
* | | | | Merge pull request #8072 from owncloud/slideshow-buttonsjbtbnl2014-04-061-1/+1
|\ \ \ \ \ | | | | | | | | | | | | Fix slideshow buttons being invisible
| * | | | | Fix slideshow buttons being invisibleRobin Appelman2014-04-061-1/+1
| | | | | |
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-04-0512-12/+12
| | | | | |