summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Make google drive client secret and dropbox api secret a password fieldJoas Schilling2014-02-071-2/+2
* Merge pull request #7112 from owncloud/enc_fix_size_for_shared_filesVincent Petry2014-02-073-4/+22
|\
| * replace 'size' with 'unencrypted_size' if encryption is enabledBjoern Schiessle2014-02-073-4/+22
* | Merge pull request #6997 from owncloud/fix_l10n_warningsThomas Müller2014-02-071-2/+2
|\ \ | |/ |/|
| * change order of issubdirectory() calls to avoid error messages for non-appsBjoern Schiessle2014-01-291-2/+2
* | Update README.mdThomas Müller2014-02-071-0/+1
* | Update README.mdThomas Müller2014-02-071-1/+2
* | Merge pull request #6952 from MartialGeek/add_freebox_supportVincent Petry2014-02-063-1/+21
|\ \
| * | The regexp of the Freebox user agent is now more strict.Martial Saunois2014-01-292-1/+6
| * | 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
* | | Merge pull request #6445 from owncloud/fix_5956Vincent Petry2014-02-061-2/+2
|\ \ \
| * | | 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 handlingThomas Müller2014-02-051-4/+5
* | | | | Merge pull request #7089 from owncloud/sharing-searchbymimeVincent Petry2014-02-062-9/+164
|\ \ \ \ \
| * | | | | Fixed searchByMime in shared cacheVincent Petry2014-02-052-9/+164
* | | | | | Merge pull request #7105 from NCTU-NBA/pr-7098Morris Jobke2014-02-061-9/+5
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | 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 autotestVincent Petry2014-02-051-2/+6
| |/ / / /
* | | | | Merge pull request #6490 from owncloud/theming-for-appstemplateJan-Christoph Borchardt2014-02-051-0/+4
|\ \ \ \ \
| * | | | | 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 dirVincent Petry2014-02-041-5/+6
| | |/ / / / | |/| | | |
* | | | | | Merge pull request #7032 from owncloud/enc_fix_deleteBjörn Schießle2014-02-059-119/+430
|\ \ \ \ \ \
| * | | | | | 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
|\ \ \ \ \ \ \
| * | | | | | | 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
| | |/ / / / / | |/| | | | |
* | | | | | | Merge pull request #6969 from owncloud/tests-morecoverageThomas Müller2014-02-045-37/+172
|\ \ \ \ \ \ \
| * | | | | | | Added core unit tests for basename and dirnameVincent Petry2014-01-301-0/+99
| * | | | | | | Fixed unit test scripts + coverageVincent Petry2014-01-304-37/+73
* | | | | | | | Merge pull request #7011 from owncloud/jshintThomas Müller2014-02-0411-22/+152
|\ \ \ \ \ \ \ \
| * | | | | | | | Fixed file name validation unit test + added newlineVincent Petry2014-01-302-7/+16
| * | | | | | | | Added .jshintrcVincent Petry2014-01-3011-15/+136
* | | | | | | | | Merge pull request #6235 from NCTU-NBA/pr-exceed_upload_limit_msgJan-Christoph Borchardt2014-02-048-18/+76
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Merge branch 'master' into pr-exceed_upload_limit_msgPellaeon Lin2014-01-30860-13933/+38249
| |\| | | | | | | |
| * | | | | | | | | 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
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-06 22:50:14 +0000