summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2014-08-1145-206/+312
* [tx-robot] updated from transifexJenkins for ownCloud2014-08-10221-3345/+1595
* Merge pull request #10302 from owncloud/remove-logon-rejectedLukas Reschke2014-08-091-8/+0
|\
| * remove confusing 'automatic logon rejected' message, fix #8591Jan-Christoph Borchardt2014-08-091-8/+0
* | Merge pull request #10293 from owncloud/fix-headers-being-sentJan-Christoph Borchardt2014-08-093-3/+0
|\ \
| * | using flush() here is pointless as we render the layout into a memory buffer ...Thomas Müller2014-08-083-3/+0
* | | [tx-robot] updated from transifexJenkins for ownCloud2014-08-09146-1199/+1830
| |/ |/|
* | Merge pull request #10290 from owncloud/check_quota_on_new_via_webThomas Müller2014-08-081-0/+23
|\ \ | |/ |/|
| * check quota when trying to download a file via new -> webJörn Friedrich Dreyer2014-08-081-0/+23
* | Merge pull request #10288 from owncloud/sharing_dont_show_share_dialogBjörn Schießle2014-08-082-18/+32
|\ \ | |/ |/|
| * remove share permissions if user is excluded from sharingBjoern Schiessle2014-08-081-0/+10
| * only show "share with others" and "share by link" navigation bar entries if u...Bjoern Schiessle2014-08-081-18/+22
|/
* Merge pull request #10280 from owncloud/lazyloading-earlierMorris Jobke2014-08-081-1/+1
|\
| * trigger lazy loading earlier, fix #9823Jan-Christoph Borchardt2014-08-081-1/+1
* | [tx-robot] updated from transifexJenkins for ownCloud2014-08-08194-1837/+1772
|/
* 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
|\ \ \ \ \ \ \