Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Prevent error if previously cached data doesn't have an etag | Robin Appelman | 2014-04-22 | 1 | -0/+1 |
* | merge master into webdav-injection | Robin Appelman | 2014-04-22 | 75 | -246/+396 |
|\ | |||||
| * | Merge pull request #8255 from owncloud/fix-public-download-button | Raghu Nayyar | 2014-04-22 | 1 | -0/+13 |
| |\ | |||||
| | * | keep long file names in one line to not overflow download button on mobile | Jan-Christoph Borchardt | 2014-04-17 | 1 | -0/+13 |
| * | | Merge pull request #8247 from owncloud/l10n-files_trasbin-fix | Thomas Müller | 2014-04-22 | 1 | -4/+4 |
| |\ \ | |||||
| | * | | Fix localization issues of files_trashbin | Volkan Gezer | 2014-04-17 | 1 | -4/+4 |
| * | | | Merge pull request #8239 from owncloud/directlink-overflow | Thomas Müller | 2014-04-22 | 1 | -0/+1 |
| |\ \ \ | |||||
| | * | | | add max-width to directLink input to prevent overflow | Jan-Christoph Borchardt | 2014-04-16 | 1 | -0/+1 |
| * | | | | Merge pull request #8283 from owncloud/translatable-max-in-upload | Jörn Friedrich Dreyer | 2014-04-22 | 2 | -2/+2 |
| |\ \ \ \ | |||||
| | * | | | | make max. text translatable | Volkan Gezer | 2014-04-21 | 2 | -2/+2 |
| * | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-04-22 | 3 | -1/+9 |
| * | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-04-21 | 3 | -4/+39 |
| |/ / / / | |||||
| * | | | | Merge pull request #8169 from owncloud/change-to-show | Andreas Fischer | 2014-04-20 | 1 | -1/+1 |
| |\ \ \ \ | |||||
| | * | | | | Change from showHTML to show | Lukas Reschke | 2014-04-11 | 1 | -1/+1 |
| * | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-04-19 | 2 | -0/+7 |
| * | | | | | Merge pull request #8220 from owncloud/type-hinting-ldap | blizzz | 2014-04-17 | 6 | -4/+25 |
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | | | |||||
| | * | | | | Add missing param hint | Bart Visscher | 2014-04-16 | 1 | -0/+1 |
| | * | | | | Fix PHPdoc in user_ldap | Bart Visscher | 2014-04-15 | 6 | -4/+24 |
| * | | | | | Merge pull request #8236 from owncloud/header-right-fix | Morris Jobke | 2014-04-17 | 1 | -29/+0 |
| |\ \ \ \ \ | |||||
| | * | | | | | fix header code duplication, code style fixes | Jan-Christoph Borchardt | 2014-04-16 | 1 | -16/+0 |
| | * | | | | | remove duplication of 'header-right' element, also make it overflow when too ... | Jan-Christoph Borchardt | 2014-04-16 | 1 | -13/+0 |
| | | |_|/ / | | |/| | | | |||||
| * | | | | | Merge pull request #8189 from Xenopathic/misc_fixes | Robin McCorkell | 2014-04-17 | 2 | -15/+15 |
| |\ \ \ \ \ | |||||
| | * | | | | | Fix user_ldap default setting value | Robin McCorkell | 2014-04-13 | 1 | -1/+1 |
| | * | | | | | Prevent error in files_trashbin | Robin McCorkell | 2014-04-13 | 1 | -7/+9 |
| | * | | | | | Adjust logic for deciding if trashbin empty | Robin McCorkell | 2014-04-13 | 1 | -7/+5 |
| * | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-04-17 | 1 | -1/+1 |
| | |_|_|_|/ | |/| | | | | |||||
| * | | | | | Merge pull request #7815 from owncloud/ldap_fix_usercount_master | blizzz | 2014-04-16 | 1 | -15/+40 |
| |\ \ \ \ \ | | |_|/ / / | |/| | | | | |||||
| | * | | | | replace hardcoded limit of 400 with user controlled ldapPagingSize value | Arthur Schiwon | 2014-04-09 | 1 | -2/+1 |
| | * | | | | Put inner loop into own method, let's see whether it makes scrutinizer happier | Arthur Schiwon | 2014-04-09 | 1 | -9/+18 |
| | * | | | | var count is assigned in the inner loop so it must be checked inside there to... | Arthur Schiwon | 2014-04-09 | 1 | -1/+5 |
| | * | | | | initialize variable | Arthur Schiwon | 2014-04-09 | 1 | -0/+1 |
| | * | | | | LDAP: fix user report i.e. count for LDAP servers with really many users | Arthur Schiwon | 2014-04-09 | 1 | -13/+25 |
| | * | | | | LDAP: make sure cache key for paged result cookie matches when limit or offse... | Arthur Schiwon | 2014-04-09 | 1 | -2/+2 |
| * | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-04-16 | 50 | -96/+106 |
| * | | | | | Merge pull request #8104 from owncloud/lukepolo-master | Thomas Müller | 2014-04-15 | 5 | -75/+134 |
| |\ \ \ \ \ | | |_|_|/ / | |/| | | | | |||||
| | * | | | | add link to further discussion about that folder check | Thomas Müller | 2014-04-15 | 1 | -0/+1 |
| | * | | | | drop folder support on public shared folders | Thomas Müller | 2014-04-11 | 1 | -1/+7 |
| | * | | | | fix single file upload in firefox | Thomas Müller | 2014-04-10 | 1 | -1/+5 |
| | * | | | | In cases folder drag and drop is not supported a proper message is displayed | Thomas Müller | 2014-04-09 | 1 | -5/+12 |
| | * | | | | use FileList.findFileEl | Thomas Müller | 2014-04-09 | 1 | -1/+2 |
| | * | | | | Merge branch 'master' into lukepolo-master | Thomas Müller | 2014-04-09 | 79 | -329/+833 |
| | |\ \ \ \ | |||||
| | * | | | | | js style fixes according to our jshintrc rules | Thomas Müller | 2014-04-07 | 1 | -58/+56 |
| | * | | | | | fix folder upload in js | Thomas Müller | 2014-04-07 | 1 | -16/+21 |
| | * | | | | | adding parentId to file info array | Thomas Müller | 2014-04-07 | 1 | -1/+2 |
| | * | | | | | remove unused exit() | Thomas Müller | 2014-04-07 | 1 | -1/+0 |
| | * | | | | | Merge branch 'master' of https://github.com/lukepolo/core-1 into lukepolo-master | Thomas Müller | 2014-04-07 | 3 | -13/+50 |
| | |\ \ \ \ \ | |||||
| | | * | | | | | Fixed issue with drag and drop not in the root directory, for folders and files | Luke Policinski | 2014-02-20 | 1 | -6/+7 |
| | | * | | | | | Feature Added : Ability to drag and drop in Chrome | Luke Policinski | 2014-02-19 | 2 | -8/+8 |
| | | * | | | | | Feature Added : Ability to drag and drop in Chrome | Luke Policinski | 2014-02-19 | 3 | -13/+48 |
* | | | | | | | | merge master into webdav-injection | Robin Appelman | 2014-04-15 | 304 | -3404/+6150 |
|\| | | | | | | |