summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #10248 from owncloud/enc_remove_keys_from_sessionMorris Jobke2014-08-074-4/+19
|\
| * add logout hook to remove keys from sessionBjoern Schiessle2014-08-074-4/+19
* | Merge pull request #9953 from owncloud/fix_text_preview_for_systems_without_ttfMorris Jobke2014-08-071-1/+8
|\ \
| * | implement a txt preview fallback for the case that ttf is not supportGeorg Ehrke2014-07-281-1/+8
* | | Merge pull request #10261 from owncloud/fix-9829Thomas Müller2014-08-071-1/+1
|\ \ \
| * | | ldap_ prefix will be added in invokeLDAPMethod(), having it would lead to a u...Arthur Schiwon2014-08-071-1/+1
* | | | Merge pull request #10172 from owncloud/fix-8802Morris Jobke2014-08-071-1/+1
|\ \ \ \
| * | | | Use human readable relative date for oc-dialog-filepickersTom Needham2014-08-071-1/+1
* | | | | Merge pull request #10079 from owncloud/Improve_scanner_messageThomas Müller2014-08-071-1/+1
|\ \ \ \ \
| * | | | | Improved scanner error messageMartin2014-07-311-1/+1
* | | | | | Merge pull request #10142 from owncloud/fix-#9283-gzip_supportThomas Müller2014-08-072-8/+7
|\ \ \ \ \ \
| * | | | | | Previous commit was not based on master, retry. Removed broken tar cutter, do...Remco Brenninkmeijer2014-08-042-8/+7
* | | | | | | Merge pull request #10238 from owncloud/fix-public-download-with-encryption-m...Thomas Müller2014-08-071-1/+4
|\ \ \ \ \ \ \
| * | | | | | | we can only close the session if encryption is not usedThomas Müller2014-08-071-1/+4
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge pull request #10184 from owncloud/getbyid-nodeRobin Appelman2014-08-074-61/+159
|\ \ \ \ \ \ \
| * | | | | | | trim leading slashRobin Appelman2014-08-061-1/+1
| * | | | | | | Fix SharedCache::getPathByIdRobin Appelman2014-08-062-21/+7
| * | | | | | | return null instead of throwing an exceptionRobin Appelman2014-08-062-6/+3
| * | | | | | | Fix Folder::getByIdRobin Appelman2014-08-053-39/+154
* | | | | | | | Merge pull request #10223 from dannosaur/patch-1Jan-Christoph Borchardt2014-08-071-0/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | fix tiny thumbnails in public preview/share modeDan Jones2014-08-061-0/+1
* | | | | | | | | Merge pull request #10218 from owncloud/pzy-masterThomas Müller2014-08-071-0/+5
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ |/| | | | | | | |
| * | | | | | | | Update public.phppzy2014-08-071-0/+5
| |/ / / / / / /
* | | | | | | | Merge pull request #8915 from owncloud/MorrisJobke-travisThomas Müller2014-08-0714-6/+367
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | |
| * | | | | | | execute unit test for files external in separate build configThomas Müller2014-08-051-0/+9
| * | | | | | | Disable encryption migration testsMorris Jobke2014-08-051-0/+8
| * | | | | | | mark tests as skipped - TODO travisMorris Jobke2014-08-053-0/+62
| * | | | | | | Minor fixesMorris Jobke2014-08-055-4/+9
| * | | | | | | Make View->shouldEmitHooks more robustRobin Appelman2014-08-051-0/+3
| * | | | | | | Don't rely on the sorting the database gives us for testsRobin Appelman2014-08-052-5/+12
| * | | | | | | Travis supportMorris Jobke2014-08-055-0/+267
* | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-08-07152-1067/+1060
* | | | | | | | Merge pull request #10224 from owncloud/typo-fixMorris Jobke2014-08-071-2/+2
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | typo fix from transifex suggestionVolkan Gezer2014-08-061-2/+2
|/ / / / / / /
* | | | | | | Merge pull request #10144 from owncloud/issue/9972Thomas Müller2014-08-064-4/+4
|\ \ \ \ \ \ \
| * | | | | | | Fix isLoggedIn() check for user '0'Joas Schilling2014-08-042-2/+2
| * | | | | | | Fix getting group '0' from database backendJoas Schilling2014-08-042-2/+2
* | | | | | | | Merge pull request #10186 from owncloud/versioning_fix_pathThomas Müller2014-08-062-2/+36
|\ \ \ \ \ \ \ \
| * | | | | | | | add unit test to make sure getVersions returns the correct resultBjoern Schiessle2014-08-051-0/+34
| * | | | | | | | make sure that the versions array contains the correct pathBjoern Schiessle2014-08-051-2/+2
| | |_|_|_|_|/ / | |/| | | | | |
* | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-08-0637-174/+199
* | | | | | | | Merge pull request #10191 from owncloud/sharing_rm_trailing_slashMorris Jobke2014-08-052-2/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | remove trailing slash from pathBjoern Schiessle2014-08-051-1/+2
| * | | | | | | | remove unused variableBjoern Schiessle2014-08-051-1/+0
| |/ / / / / / /
* | | | | | | | Merge pull request #9520 from owncloud/theme_urlsBjörn Schießle2014-08-053-15/+59
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | |
| * | | | | | | remove escaping because it's unneededMorris Jobke2014-08-051-1/+1
| * | | | | | | fix uppercase issueMorris Jobke2014-08-051-4/+4
| * | | | | | | Added to personal settings page.scolebrook2014-08-051-2/+2
| * | | | | | | Add ability to theme iOS and Android client URLs just like desktop URLs.scolebrook2014-08-052-13/+57
* | | | | | | | Merge pull request #10176 from owncloud/fix-install-icon-sizeMorris Jobke2014-08-051-1/+1
|\ \ \ \ \ \ \ \