Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | port database layer from appframework to core | Bernhard Posselt | 2014-04-19 | 10 | -0/+1360 |
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-04-19 | 22 | -135/+144 |
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-04-18 | 12 | -34/+34 |
* | 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 #8249 from owncloud/correct-m | Morris Jobke | 2014-04-17 | 1 | -2/+2 |
|\ \ | |||||
| * | | Use JS as content-type due to mimesniffing | Lukas Reschke | 2014-04-17 | 1 | -2/+2 |
* | | | Merge pull request #8205 from owncloud/fix-8202 | Morris Jobke | 2014-04-17 | 1 | -1/+1 |
|\ \ \ | |||||
| * | | | remove unneeded LOWER. Fixes #8202 | Victor Dubiniuk | 2014-04-14 | 1 | -1/+1 |
* | | | | Merge pull request #8222 from owncloud/type-hinting | Morris Jobke | 2014-04-17 | 14 | -18/+55 |
|\ \ \ \ | |||||
| * | | | | Fix PHPdoc in lib/public | Bart Visscher | 2014-04-15 | 3 | -1/+13 |
| * | | | | Fix PHPdoc in lib/private | Bart Visscher | 2014-04-15 | 11 | -17/+42 |
| | |_|/ | |/| | | |||||
* | | | | Merge pull request #8246 from Gared/master | Morris Jobke | 2014-04-17 | 1 | -19/+21 |
|\ \ \ \ | |||||
| * | | | | Fix javascript error in calendar app | Stefan | 2014-04-16 | 1 | -19/+21 |
* | | | | | Merge pull request #8236 from owncloud/header-right-fix | Morris Jobke | 2014-04-17 | 2 | -36/+49 |
|\ \ \ \ \ | |||||
| * | | | | | fix header code duplication, code style fixes | Jan-Christoph Borchardt | 2014-04-16 | 2 | -21/+28 |
| * | | | | | remove duplication of 'header-right' element, also make it overflow when too ... | Jan-Christoph Borchardt | 2014-04-16 | 2 | -16/+22 |
* | | | | | | Merge pull request #8189 from Xenopathic/misc_fixes | Robin McCorkell | 2014-04-17 | 3 | -16/+20 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Fix user_ldap default setting value | Robin McCorkell | 2014-04-13 | 1 | -1/+1 |
| * | | | | | | Prevent error from cache update on deleted files | Robin McCorkell | 2014-04-13 | 1 | -1/+5 |
| * | | | | | | 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 |
* | | | | | | | Merge pull request #8240 from owncloud/thumbnail-on-short-videos-master | Jörn Friedrich Dreyer | 2014-04-17 | 1 | -7/+30 |
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | | |||||
| * | | | | | | escape $second + update PHPDoc | Thomas Müller | 2014-04-16 | 1 | -7/+7 |
| * | | | | | | videos which are shorter then 5 seconds will now get a proper thumbnail at 1 ... | Thomas Müller | 2014-04-16 | 1 | -7/+30 |
* | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-04-17 | 18 | -135/+180 |
* | | | | | | | Merge pull request #8183 from owncloud/move-security-headers | Morris Jobke | 2014-04-16 | 5 | -33/+29 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Fix typo | Lukas Reschke | 2014-04-14 | 1 | -1/+1 |
| * | | | | | | | Typo + Line breaks | Lukas Reschke | 2014-04-13 | 1 | -5/+3 |
| * | | | | | | | Remove uneeded usages of nosniff | Lukas Reschke | 2014-04-13 | 3 | -10/+0 |
| * | | | | | | | Fix indentation | Lukas Reschke | 2014-04-13 | 1 | -1/+2 |
| * | | | | | | | Move security headers to base.php | Lukas Reschke | 2014-04-13 | 2 | -25/+32 |
* | | | | | | | | Merge pull request #7994 from owncloud/fix-login-fields | Morris Jobke | 2014-04-16 | 1 | -15/+39 |
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | | | |||||
| * | | | | | | | fix overlapping infield labels | Jan-Christoph Borchardt | 2014-04-16 | 1 | -1/+1 |
| * | | | | | | | fix database infield label indentation | Jan-Christoph Borchardt | 2014-04-16 | 1 | -1/+3 |
| * | | | | | | | fix sizing for fields when password is shown | Jan-Christoph Borchardt | 2014-04-16 | 1 | -9/+6 |
| * | | | | | | | make infield labels use less space so pasting in is easier | Jan-Christoph Borchardt | 2014-04-01 | 1 | -3/+8 |
| * | | | | | | | fix log in input sizing caused by core input field switch to px | Jan-Christoph Borchardt | 2014-04-01 | 1 | -11/+31 |
* | | | | | | | | Merge pull request #8235 from owncloud/fix-error-mobile | Jan-Christoph Borchardt | 2014-04-16 | 2 | -2/+10 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | fix error display on smaller screens, fix #8090 | Jan-Christoph Borchardt | 2014-04-16 | 2 | -2/+10 |
| | |_|_|_|/ / / | |/| | | | | | | |||||
* | | | | | | | | Merge pull request #8157 from owncloud/share-expiration-smooth-hide | Jan-Christoph Borchardt | 2014-04-16 | 1 | -5/+6 |
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | | | |||||
| * | | | | | | | Expiration date is hidden smoothly | Volkan Gezer | 2014-04-10 | 1 | -5/+6 |
* | | | | | | | | 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 |