summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Update README.mdThomas Müller2014-02-071-1/+2
|
* Merge pull request #6952 from MartialGeek/add_freebox_supportVincent Petry2014-02-063-1/+21
|\ | | | | New user agent added for the Freebox.
| * The regexp of the Freebox user agent is now more strict.Martial Saunois2014-01-292-1/+6
| | | | | | | | A new unit test has been added in consequence.
| * Unit tests added for the new Freebox user agent.Martial Saunois2014-01-281-0/+10
| |
| * New user agent added for the Freebox.Martial Saunois2014-01-262-1/+6
| | | | | | | | The Freebox is the multimedia device of a french Internet provider: Free. This device provides a seedbox which uses the user agent "Mozilla/5.0". In the "Content-Disposition" header, if the "filename" key is used with the "filename*=UTF-8''" value, the seedbox does not take care about the header and saves the file name with the origin URL. This patch brings the support for the Freebox users.
* | Merge pull request #6445 from owncloud/fix_5956Vincent Petry2014-02-061-2/+2
|\ \ | | | | | | fix issue with logging non utf8 chars
| * | encode imagePath and fix documentation of loadFromFileGeorg Ehrke2014-01-111-2/+2
| | |
| * | fix issue with logging non utf8 charsGeorg Ehrke2013-12-161-1/+1
| | |
* | | Merge pull request #7099 from owncloud/fix-autoconfig-masterThomas Müller2014-02-061-4/+5
|\ \ \ | | | | | | | | fixing autoconfig handling
| * | | fixing autoconfig handlingThomas Müller2014-02-051-4/+5
| | | |
* | | | Merge pull request #7089 from owncloud/sharing-searchbymimeVincent Petry2014-02-062-9/+164
|\ \ \ \ | | | | | | | | | | Fixed searchByMime in shared cache
| * | | | Fixed searchByMime in shared cacheVincent Petry2014-02-052-9/+164
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - searchByMime now correctly returns files recursively search through all the dirs - added unit test for searchByMime
* | | | | Merge pull request #7105 from NCTU-NBA/pr-7098Morris Jobke2014-02-061-9/+5
|\ \ \ \ \ | |_|/ / / |/| | | | Fix #7098
| * | | | Remove unused template variable assignment of files_sharing/template/public.phpPellaeon Lin2014-02-061-5/+0
| | | | |
| * | | | Move template variable assignment to correct placePellaeon Lin2014-02-061-4/+5
|/ / / /
* | | | Merge pull request #7091 from owncloud/jenkins-catchsetuperrorsThomas Müller2014-02-051-2/+6
|\ \ \ \ | | | | | | | | | | Catch setup errors during autotest
| * | | | Catch setup errors during autotestVincent Petry2014-02-051-2/+6
| |/ / /
* | | | Merge pull request #6490 from owncloud/theming-for-appstemplateJan-Christoph Borchardt2014-02-051-0/+4
|\ \ \ \ | | | | | | | | | | do not show 'Add app' and 'More apps' for themed ownCloud
| * | | | use appstoreenabled config switchBjoern Schiessle2014-01-161-2/+2
| | | | |
| * | | | do not show 'Add app' and 'More apps' for themed ownCloudJan-Christoph Borchardt2013-12-181-0/+4
| | | | |
* | | | | Merge pull request #7064 from owncloud/files-scrolltopafterupdateJan-Christoph Borchardt2014-02-051-4/+5
|\ \ \ \ \ | | | | | | | | | | | | Scroll to the top after switching dir
| * | | | | Scroll to the top after switching dirVincent Petry2014-02-041-5/+6
| | |/ / / | |/| | | | | | | | | | | | | Fixes #7061
* | | | | Merge pull request #7032 from owncloud/enc_fix_deleteBjörn Schießle2014-02-059-119/+430
|\ \ \ \ \ | | | | | | | | | | | | Encryption replace delete proxy with pre/post hooks and add tests
| * | | | | add function to extract filename from sharekey name + testsBjoern Schiessle2014-02-032-1/+37
| | | | | |
| * | | | | added tests for the delete hooks if the trash bin is disabledBjoern Schiessle2014-02-013-65/+300
| | | | | |
| * | | | | don't expect OC_FilesystemView, this is depreciatedBjoern Schiessle2014-01-311-1/+1
| | | | | |
| * | | | | better error detection and don't use glob()Bjoern Schiessle2014-01-311-12/+27
| | | | | |
| * | | | | move unlink proxy to a hook which handles pre and post conditionsBjoern Schiessle2014-01-313-41/+66
| | | | | |
* | | | | | Merge pull request #7067 from owncloud/core-sessionheartbeatconfigVincent Petry2014-02-055-16/+142
|\ \ \ \ \ \ | | | | | | | | | | | | | | Core sessionheartbeatconfig
| * | | | | | fixing typosThomas Müller2014-02-041-2/+2
| | | | | | |
| * | | | | | Added unit tests for session_keepalive / heartbeatVincent Petry2014-02-042-1/+91
| | | | | | |
| * | | | | | Added session_keepalive settingVincent Petry2014-02-043-15/+51
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | When session_keepalive is true (default) the heartbeat will be send as often as the half of the session timeout value.
* | | | | | Merge pull request #6969 from owncloud/tests-morecoverageThomas Müller2014-02-045-37/+172
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fixed unit test scripts + coverage
| * | | | | | Added core unit tests for basename and dirnameVincent Petry2014-01-301-0/+99
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Note that it doesn't work 100% like the PHP functions so the tests have TODO comments to fix those core functions eventually.
| * | | | | | Fixed unit test scripts + coverageVincent Petry2014-01-304-37/+73
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Tried to add more apps (others break). "preprocessors" is now populated automatically based on the tested apps.
* | | | | | | Merge pull request #7011 from owncloud/jshintThomas Müller2014-02-0411-22/+152
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Added .jshintrc
| * | | | | | | Fixed file name validation unit test + added newlineVincent Petry2014-01-302-7/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - fixed file name validation unit test - added "\n" as forbidden character in isFileNameValid()
| * | | | | | | Added .jshintrcVincent Petry2014-01-3011-15/+136
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Also fixes a few JSHint warnings in files app - Added "global" comment on top of files app to suppress warning and also inform devs about what globals are use
* | | | | | | | Merge pull request #6235 from NCTU-NBA/pr-exceed_upload_limit_msgJan-Christoph Borchardt2014-02-048-18/+76
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Change misleading message when file size exceeds upload limit
| * | | | | | | | Merge branch 'master' into pr-exceed_upload_limit_msgPellaeon Lin2014-01-30860-13933/+38249
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: apps/files/templates/index.php apps/files_sharing/templates/public.php
| * | | | | | | | Use $storageInfo['free']Pellaeon Lin2014-01-292-3/+2
| | | | | | | | |
| * | | | | | | | Fix variable namePellaeon Lin2014-01-241-2/+2
| | | | | | | | |
| * | | | | | | | Add $freeSpace and $uploadLimit to files_sharingPellaeon Lin2014-01-172-0/+6
| | | | | | | | |
| * | | | | | | | Comments to clarifyPellaeon Lin2014-01-161-2/+2
| | | | | | | | |
| * | | | | | | | Use t() 's native methodPellaeon Lin2014-01-161-2/+8
| | | | | | | | |
| * | | | | | | | Fix namespacePellaeon Lin2014-01-151-1/+1
| | | | | | | | |
| * | | | | | | | Contextual upload error messagePellaeon Lin2013-12-111-2/+2
| | | | | | | | |
| * | | | | | | | #max_upload is needed after allPellaeon Lin2013-12-111-1/+1
| | | | | | | | |
| * | | | | | | | Update #free_space on getstoragestats AJAX callPellaeon Lin2013-12-112-0/+3
| | | | | | | | |
| * | | | | | | | Display different messages for uploadLimit and freeSpacePellaeon Lin2013-12-083-4/+15
| | | | | | | | |