Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | | Merge pull request #13520 from owncloud/fix-comparison-op | Lukas Reschke | 2015-01-20 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | this must be larger then (>), since buggy behaviour occurs when the parameter... | Arthur Schiwon | 2015-01-20 | 1 | -1/+1 | |
| | |/ / / / / | |/| | | | | | ||||||
* | | | | | | | Merge pull request #13506 from owncloud/fix-scanner-s2s-trashbin | Morris Jobke | 2015-01-20 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | ||||||
| * | | | | | | avoid $this->cache being null - fixes #13491 | Thomas Müller | 2015-01-20 | 1 | -1/+1 | |
| | |/ / / / | |/| | | | | ||||||
* | | | | | | Merge pull request #13499 from owncloud/issue/13451-redis-json-encode | Thomas Müller | 2015-01-20 | 2 | -4/+10 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Json_(en|de)code values on redis to be able to cache arrays | Joas Schilling | 2015-01-20 | 1 | -4/+4 | |
| * | | | | | | Add a test case for memcaches to store an array | Joas Schilling | 2015-01-20 | 1 | -0/+6 | |
| |/ / / / / | ||||||
* | | | | | | Merge pull request #13512 from owncloud/kill-ancient-code | Lukas Reschke | 2015-01-20 | 1 | -17/+0 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | kill ancient code | Morris Jobke | 2015-01-20 | 1 | -17/+0 | |
* | | | | | | | Merge pull request #13494 from owncloud/windows_warning | Morris Jobke | 2015-01-20 | 2 | -5/+18 | |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | ||||||
| * | | | | | | add a Windows warning | Frank Karlitschek | 2015-01-20 | 2 | -5/+18 | |
* | | | | | | | Merge pull request #13497 from owncloud/fix-basic-auth-for-session | Lukas Reschke | 2015-01-20 | 2 | -3/+5 | |
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | ||||||
| * | | | | | | Fix WebDAV auth for session authentication only | Lukas Reschke | 2015-01-20 | 2 | -3/+5 | |
* | | | | | | | Merge pull request #13454 from owncloud/improve-empty-displayname | Joas Schilling | 2015-01-20 | 1 | -2/+2 | |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | ||||||
| * | | | | | | also show message for empty display name if change of it isn't allowed | Morris Jobke | 2015-01-19 | 1 | -2/+2 | |
* | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-01-20 | 36 | -26/+220 | |
| |/ / / / / |/| | | | | | ||||||
* | | | | | | Merge pull request #13416 from owncloud/reauthenticate-if-session-differs-fro... | Morris Jobke | 2015-01-19 | 2 | -13/+44 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Close session properly | Lukas Reschke | 2015-01-19 | 1 | -0/+1 | |
| * | | | | | | Prioritise Basic Auth header over Cookie | Lukas Reschke | 2015-01-17 | 2 | -13/+43 | |
| | |/ / / / | |/| | | | | ||||||
* | | | | | | Merge pull request #13480 from owncloud/mysql-autocommit | Lukas Reschke | 2015-01-19 | 1 | -4/+9 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | set MySQL autocommit on connection setup | Thomas Müller | 2015-01-19 | 1 | -4/+9 | |
| | |_|/ / / | |/| | | | | ||||||
* | | | | | | Merge pull request #13478 from owncloud/tags-chunkedquery | Lukas Reschke | 2015-01-19 | 2 | -4/+30 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Fix chunked query for tags + unit test | Vincent Petry | 2015-01-19 | 2 | -4/+30 | |
| |/ / / / / | ||||||
* | | | | | | Merge pull request #13471 from owncloud/fix-blog-typo | Lukas Reschke | 2015-01-19 | 2 | -2/+2 | |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | ||||||
| * | | | | | fix typo of blog -> changed to block | Morris Jobke | 2015-01-19 | 2 | -2/+2 | |
* | | | | | | Merge pull request #13466 from owncloud/Undefined-index-mimetype-cache | Thomas Müller | 2015-01-19 | 1 | -1/+1 | |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | ||||||
| * | | | | | check is mimetype is set - fixed #13452 | Thomas Müller | 2015-01-19 | 1 | -1/+1 | |
* | | | | | | Merge pull request #13419 from owncloud/drop-animation-user-list | Thomas Müller | 2015-01-19 | 1 | -7/+0 | |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | ||||||
| * | | | | | Drop the hide and show of new users in user list | Morris Jobke | 2015-01-16 | 1 | -7/+0 | |
* | | | | | | Merge pull request #13461 from owncloud/remove-strip-slashes | Thomas Müller | 2015-01-19 | 1 | -2/+1 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Remove stripslashes() from newfolder.php | Lukas Reschke | 2015-01-19 | 1 | -2/+1 | |
* | | | | | | | increase version. This time for real | Frank Karlitschek | 2015-01-18 | 1 | -1/+1 | |
* | | | | | | | Merge pull request #13457 from owncloud/enc-skippartfiles | Thomas Müller | 2015-01-19 | 1 | -0/+55 | |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | ||||||
| * | | | | | | Add class attribute types in encryption Util class | Vincent Petry | 2015-01-19 | 1 | -0/+51 | |
| * | | | | | | Skip stray part files during initial encryption | Vincent Petry | 2015-01-19 | 1 | -0/+4 | |
* | | | | | | | Merge pull request #13377 from owncloud/trashbin_storage_wrapper | Morris Jobke | 2015-01-19 | 9 | -53/+109 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | replace hook with storage wrapper | Bjoern Schiessle | 2015-01-19 | 9 | -53/+109 | |
| | |_|_|/ / / | |/| | | | | | ||||||
* | | | | | | | Merge pull request #13423 from owncloud/share-fixfindshareforuserwithmultiple... | Thomas Müller | 2015-01-19 | 2 | -9/+53 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Fix getItemSharedWithUser for groups | Vincent Petry | 2015-01-16 | 2 | -9/+53 | |
* | | | | | | | | Merge pull request #13362 from owncloud/fix-11442 | Thomas Müller | 2015-01-19 | 3 | -38/+92 | |
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | | ||||||
| * | | | | | | | coding style | Arthur Schiwon | 2015-01-15 | 2 | -5/+8 | |
| * | | | | | | | update user or group count only, when the multiselect is closed | Arthur Schiwon | 2015-01-14 | 1 | -4/+34 | |
| * | | | | | | | allow to read again objectclasses and groups under certain conditions | Arthur Schiwon | 2015-01-14 | 2 | -2/+31 | |
| * | | | | | | | JS cleanup | Arthur Schiwon | 2015-01-13 | 3 | -34/+26 | |
* | | | | | | | | Merge pull request #13443 from owncloud/fix-filtering-for-users | Thomas Müller | 2015-01-19 | 2 | -1/+128 | |
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | | ||||||
| * | | | | | | | Fix filtering for users when $gid is empty | Lukas Reschke | 2015-01-18 | 2 | -1/+128 | |
* | | | | | | | | Merge pull request #13438 from owncloud/cache-the-array | Thomas Müller | 2015-01-19 | 1 | -70/+71 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Reuse the array key of mimetypes | Lukas Reschke | 2015-01-18 | 1 | -70/+71 | |
| | |_|_|_|/ / / | |/| | | | | | | ||||||
* | | | | | | | | Merge pull request #13447 from owncloud/fix_typo | Joas Schilling | 2015-01-19 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | fix typo - caused by 3d997e8c62bd752f38bcc11f02fb2af0e46d9154 | Morris Jobke | 2015-01-18 | 1 | -1/+1 | |
| | |/ / / / / / | |/| | | | | | |