summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #8382 from owncloud/enc_fix_decrypt_allVincent Petry2014-04-292-10/+52
|\
| * fix shouldEncrypt() method and improved decryptAll() unit testsBjoern Schiessle2014-04-282-10/+52
* | Merge pull request #8285 from owncloud/better_getmountby_handlingicewind19912014-04-293-3/+4
|\ \
| * | Better handle return values from Filesystem::getMountBy*Robin McCorkell2014-04-253-3/+4
* | | Merge pull request #6870 from owncloud/uncheck-remember-checkboxJan-Christoph Borchardt2014-04-291-1/+1
|\ \ \
| * | | do not check 'remember' log in by defaultJan-Christoph Borchardt2014-01-211-1/+1
* | | | [tx-robot] updated from transifexJenkins for ownCloud2014-04-29304-5308/+21503
* | | | Merge pull request #8388 from owncloud/reset-3rdparty-masterLukas Reschke2014-04-281-0/+0
|\ \ \ \
| * | | | Update 3rdpartyThomas Müller2014-04-281-0/+0
* | | | | Merge pull request #7852 from josh4trunks/basic_auth_fixThomas Müller2014-04-282-16/+14
|\ \ \ \ \
| * | | | | Remove missed stuff from mergejosh4trunks2014-04-031-3/+0
| * | | | | Fixed Typojosh4trunks2014-04-031-1/+1
| * | | | | Don't always $cookie_path, only set it when neededjosh4trunks2014-04-031-3/+2
| * | | | | cookie would be useless if value is not setjosh4trunks2014-04-031-1/+1
| * | | | | Don't to set the cookie it wasn't needed.josh4trunks2014-04-031-1/+1
| * | | | | Fixes login / logout when HTTP Basic Headers are avilable.josh4trunks2014-04-032-16/+18
* | | | | | Merge pull request #8387 from wakeup/masterLukas Reschke2014-04-281-1/+1
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Update outdated commentVolkan Gezer2014-04-281-1/+1
|/ / / / /
* | | | | Merge pull request #7167 from owncloud/files-ajaxload-infscrollThomas Müller2014-04-2819-771/+1742
|\ \ \ \ \
| * | | | | typos, naming, remove unused code, identationThomas Müller2014-04-283-53/+39
| * | | | | Fixed drag and drop into folder and onto breadcrumbVincent Petry2014-04-283-82/+211
| * | | | | Fixed selection summary calculation issueVincent Petry2014-04-282-3/+27
| * | | | | Cleanup of event handlersVincent Petry2014-04-281-32/+32
| * | | | | Cleanup and fix trashbin "clear all files" operationVincent Petry2014-04-282-6/+2
| * | | | | Fixed drag shadow file sortingVincent Petry2014-04-281-0/+1
| * | | | | Fixed selection to be based on FileList.filesVincent Petry2014-04-285-161/+289
| * | | | | Fix trashbin previews and "delete selected"Vincent Petry2014-04-282-4/+4
| * | | | | Make sure there are always enough elements visible on the pageVincent Petry2014-04-282-0/+18
| * | | | | Fixed insertion of filesVincent Petry2014-04-284-40/+169
| * | | | | Fixed file sorting to work with scrollingVincent Petry2014-04-282-106/+150
| * | | | | Fix file selection for infinite scrollingVincent Petry2014-04-288-379/+626
| * | | | | Fix file summary to use the whole file listVincent Petry2014-04-2812-138/+342
| * | | | | Added infinite scrolling (in-memory list)Vincent Petry2014-04-282-6/+71
* | | | | | Merge pull request #8380 from owncloud/kill_office_fallbackThomas Müller2014-04-282-149/+0
|\ \ \ \ \ \
| * | | | | | remove preview office fallback as it makes too much trouble and generates ina...Georg Ehrke2014-04-282-149/+0
| | |_|_|_|/ | |/| | | |
* | | | | | Merge pull request #8340 from tribut/htaccess-escape-dotsThomas Müller2014-04-281-6/+6
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Remove trailing tabFelix Eckhofer2014-04-281-1/+1
| * | | | | Escape literal dots in mod_rewrite regexesFelix Eckhofer2014-04-281-6/+6
| |/ / / /
* | | | | Merge pull request #8381 from owncloud/files_irodsThomas Müller2014-04-2882-8015/+0
|\ \ \ \ \
| * | | | | drop files_irods from apps_externalThomas Müller2014-04-2882-8015/+0
| |/ / / /
* | | | | Merge pull request #8309 from DavidPrevot/chosenThomas Müller2014-04-281-1/+1
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Adapt chosen (css) pathDavid Prévot2014-04-221-1/+1
* | | | | Merge pull request #8327 from owncloud/l10n-files_external-fieldsThomas Müller2014-04-282-66/+67
|\ \ \ \ \
| * | | | | fix single quote sanitizationVolkan Gezer2014-04-261-1/+1
| * | | | | Add translatable mount configsVolkan Gezer2014-04-231-65/+66
| |/ / / /
* | | | | Merge pull request #7473 from owncloud/append-error-documentThomas Müller2014-04-283-48/+14
|\ \ \ \ \
| * \ \ \ \ Merge branch 'master' into append-error-documentThomas Müller2014-04-021730-59460/+97173
| |\ \ \ \ \
| * | | | | | A version bump is not necessary hereLukas Reschke2014-02-281-1/+1
| * | | | | | Typo + use regular assignmentLukas Reschke2014-02-281-2/+2
| * | | | | | Remove .htaccess creation codeLukas Reschke2014-02-284-49/+15