Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #8102 from owncloud/fix-appconfig-master | Thomas Müller | 2014-04-08 | 3 | -4/+41 |
|\ | |||||
| * | using array_key_exists() instead of isset() - required because in case the va... | Thomas Müller | 2014-04-07 | 1 | -1/+1 |
| * | fixing undefined exception classes | Thomas Müller | 2014-04-07 | 1 | -3/+3 |
| * | unit test testSetAppValueIfSetToNull() added | Thomas Müller | 2014-04-07 | 1 | -0/+37 |
* | | Merge pull request #8089 from bantu/autotest-checkout-pathspec | Jörn Friedrich Dreyer | 2014-04-07 | 1 | -1/+1 |
|\ \ | |/ |/| | |||||
| * | Use git checkout on directory as some files may not be in git resulting in, e... | Andreas Fischer | 2014-04-07 | 1 | -1/+1 |
* | | Merge pull request #8065 from owncloud/avatar-highdpi | Thomas Müller | 2014-04-07 | 1 | -3/+3 |
|\ \ | |||||
| * | | use high resolution avatars on highdpi screens | Robin Appelman | 2014-04-04 | 1 | -3/+3 |
* | | | Merge pull request #8091 from owncloud/jshint-globals-oc-t-n | Jörn Friedrich Dreyer | 2014-04-07 | 2 | -1/+5 |
|\ \ \ | |||||
| * | | | ignore underscore.js in scrutinizer.yml | Thomas Müller | 2014-04-07 | 1 | -0/+1 |
| * | | | Merge branch 'master' into jshint-globals-oc-t-n | Thomas Müller | 2014-04-07 | 9 | -69/+1424 |
| |\ \ \ | |/ / / |/| | | | |||||
* | | | | Merge pull request #8088 from owncloud/fix-personal.js | Thomas Müller | 2014-04-07 | 5 | -52/+1396 |
|\ \ \ \ | |||||
| * | | | | adding underscore.js | Thomas Müller | 2014-04-07 | 1 | -0/+1344 |
| * | | | | reduce code duplication, fix parse error, prevent page reload on hitting ente... | Thomas Müller | 2014-04-07 | 4 | -52/+52 |
* | | | | | Merge pull request #7599 from owncloud/public-pathinfo | icewind1991 | 2014-04-07 | 1 | -6/+14 |
|\ \ \ \ \ | |||||
| * | | | | | Allow using pathinfo based public.php paths | Robin Appelman | 2014-03-06 | 1 | -6/+14 |
* | | | | | | Merge pull request #8083 from owncloud/fix-link-to-sync | Thomas Müller | 2014-04-07 | 1 | -2/+2 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Switch to HTTPS | Lukas Reschke | 2014-04-06 | 1 | -1/+1 |
| * | | | | | | Remove wrong whitespace from URL and use HTTPS | Lukas Reschke | 2014-04-06 | 1 | -1/+1 |
* | | | | | | | Merge pull request #8086 from owncloud/fix_copy_conflict_translations_in_js | Thomas Müller | 2014-04-07 | 2 | -10/+13 |
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | | |||||
| * | | | | | | translations for oc-dialogs reside in code | Jörn Friedrich Dreyer | 2014-04-07 | 1 | -10/+10 |
| * | | | | | | Fix copy conflict dialog translation | Jörn Friedrich Dreyer | 2014-04-07 | 2 | -2/+5 |
| | |_|/ / / | |/| | | | | |||||
| | | | * | | adding ownCloud globals to jshintrc: OC, t, n | Thomas Müller | 2014-04-07 | 1 | -1/+4 |
| |_|_|/ / |/| | | | | |||||
* | | | | | Merge pull request #6221 from leo-b/ldap_get_all_groups | blizzz | 2014-04-07 | 3 | -3/+49 |
|\ \ \ \ \ | |/ / / / |/| | | | | |||||
| * | | | | adapt description of paging size configuration | Alexander Bergolth | 2014-03-28 | 1 | -1/+1 |
| * | | | | change default ldap paging size to 500 | Alexander Bergolth | 2014-03-28 | 1 | -1/+1 |
| * | | | | make getGroupsChunk() protected instead of private | Alexander Bergolth | 2014-03-13 | 1 | -1/+1 |
| * | | | | adapt coding style | Alexander Bergolth | 2014-03-13 | 1 | -15/+15 |
| * | | | | fix another oversight... sigh.. | root | 2014-03-05 | 1 | -1/+1 |
| * | | | | getGroups(): fix overall max search limit for paged searches | root | 2014-03-04 | 1 | -3/+3 |
| * | | | | getGroups() $limit was not handled correctly | root | 2014-03-04 | 1 | -2/+7 |
| * | | | | revert updateGroups job to use getGroups() instead of getAllGroups() | root | 2014-03-04 | 1 | -1/+1 |
| * | | | | merge functionality of getAllGroups into getGroups | root | 2014-03-04 | 1 | -15/+18 |
| * | | | | Merge branch 'ldap_paging_chunksize' into ldap_get_all_groups | root | 2014-03-04 | 2 | -1/+5 |
| |\ \ \ \ | |||||
| | * | | | | add ldap_paging_size config option | root | 2014-03-04 | 2 | -1/+5 |
| * | | | | | use getAllGroup() in the updateGroups background job | root | 2014-03-04 | 1 | -1/+1 |
| * | | | | | add getAllGroups() that uses a paged search if available | root | 2014-03-04 | 1 | -0/+34 |
| |/ / / / | |||||
* | | | | | Merge pull request #8017 from Raydiation/master | blizzz | 2014-04-07 | 1 | -7/+7 |
|\ \ \ \ \ | |||||
| * | | | | | Remove dependency on container, removing service locator antipattern | Bernhard Posselt | 2014-04-02 | 1 | -7/+7 |
* | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-04-07 | 34 | -351/+459 |
* | | | | | | Merge pull request #8064 from owncloud/remove-not-existing-functions | Lukas Reschke | 2014-04-06 | 1 | -27/+0 |
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | |||||
| * | | | | | Removed two unused functions | Lukas Reschke | 2014-04-04 | 1 | -27/+0 |
| | |_|_|/ | |/| | | | |||||
* | | | | | Update README.md | Volkan Gezer | 2014-04-06 | 1 | -1/+1 |
* | | | | | Update README.md | Volkan Gezer | 2014-04-06 | 1 | -1/+1 |
* | | | | | Update README.md | Volkan Gezer | 2014-04-06 | 1 | -1/+1 |
* | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-04-06 | 30 | -123/+146 |
* | | | | | Merge pull request #8072 from owncloud/slideshow-buttons | jbtbnl | 2014-04-06 | 1 | -1/+1 |
|\ \ \ \ \ | |||||
| * | | | | | Fix slideshow buttons being invisible | Robin Appelman | 2014-04-06 | 1 | -1/+1 |
* | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-04-05 | 12 | -12/+12 |
* | | | | | | Merge pull request #8061 from owncloud/remove-uneeded-file | Tom Needham | 2014-04-05 | 3 | -62/+0 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | |