summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #4262 from owncloud/fix_jslint_kondouChristopher2013-08-2019-64/+82
|\
| * Merge branch 'master' into fix_jslint_kondoukondou2013-08-181499-15173/+20708
| |\
| * | Fix a syntax error & have if-conds in an own linekondou2013-08-015-11/+31
| * | Fix some JSLint warningskondou2013-07-3119-71/+71
* | | Merge pull request #4447 from owncloud/fix_4351_masterMorris Jobke2013-08-204-22/+29
|\ \ \
| * | | Break long lines into smaller ones.Owen Winkler2013-08-181-3/+10
| * | | Use JSON to send/receive group data.Owen Winkler2013-08-154-22/+22
* | | | Merge pull request #4512 from owncloud/readdir-strict-equalsThomas Müller2013-08-2014-19/+19
|\ \ \ \
| * \ \ \ Merge branch 'master' into readdir-strict-equalsGeorg Ehrke2013-08-1919-149/+456
| |\ \ \ \
| * | | | | use strict equals in readdir loops to prevent issues with '0' filesRobin Appelman2013-08-1914-19/+19
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-08-19686-13104/+12471
| |/ / / / |/| | | |
* | | | | Merge pull request #4510 from owncloud/f_e_webdav_urlencodingThomas Müller2013-08-191-2/+2
|\ \ \ \ \
| * | | | | replace ' ' with '%20' in urls for curlJörn Friedrich Dreyer2013-08-191-2/+2
| |/ / / /
* | | | | Merge pull request #4467 from owncloud/storage-wrapper-quotaicewind19912013-08-1919-147/+454
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | merge master in storage-wrapper-quotaRobin Appelman2013-08-181675-33543/+39887
| |\ \ \ \ | | | |_|/ | | |/| |
| * | | | remove outdated quota proxyRobin Appelman2013-08-161-114/+0
| * | | | fix quota wrapper reporting negative free_space, breaking user interfaceRobin Appelman2013-08-161-1/+1
| * | | | use renamed constantsRobin Appelman2013-07-254-5/+5
| * | | | use storage wrapper for quota instead of a filesystem proxyRobin Appelman2013-07-251-2/+22
| * | | | add conveince function to wrap all storagesRobin Appelman2013-07-251-0/+12
| * | | | use renamed constantsRobin Appelman2013-07-251-2/+2
| * | | | add option to wrap existing mountsRobin Appelman2013-07-252-0/+14
| * | | | fix getPermissionsCache for storage wrapperRobin Appelman2013-07-251-1/+1
| * | | | add quota storage wrapperRobin Appelman2013-07-252-0/+165
| * | | | move storage wrapper test to new namespaceRobin Appelman2013-07-251-2/+2
| * | | | add quota streamwrapper that limits the amount of data that can be written to...Robin Appelman2013-07-253-16/+225
| * | | | rename constantsRobin Appelman2013-07-253-4/+5
* | | | | Merge pull request #4509 from owncloud/add-odf-templates-masterMorris Jobke2013-08-194-1/+3
|\ \ \ \ \
| * | | | | adding file templates for ods, odt and odpThomas Müller2013-08-184-1/+3
|/ / / / /
* | | | | Merge pull request #4239 from owncloud/decrypt_files_againBjörn Schießle2013-08-1823-123/+565
|\ \ \ \ \
| * | | | | revert changes to 3rdparty submodule referenceBjoern Schiessle2013-08-181-0/+0
| * | | | | don't change the etags if a file gets encrypted/decrypted to avoid that the s...Bjoern Schiessle2013-08-181-24/+32
| * | | | | Merge branch 'master' into decrypt_files_againBjoern Schiessle2013-08-171514-17058/+24960
| |\ \ \ \ \
| * | | | | | remove whitespaces and some leftover code from testingBjoern Schiessle2013-08-152-2/+2
| * | | | | | throw exception if encryption was disabled but files are still encrypted to p...Bjoern Schiessle2013-08-141-1/+11
| * | | | | | check if some encrypted files are left after the app was disabled and warn th...Bjoern Schiessle2013-08-126-7/+42
| * | | | | | preserve mtime if file gets encrypted/decryptedBjoern Schiessle2013-08-121-1/+13
| * | | | | | fix array declarationBjoern Schiessle2013-08-121-1/+1
| * | | | | | don't know why it works locally but not on the build server... let's keep it ...Bjoern Schiessle2013-07-311-0/+3
| * | | | | | use OC\Files\View to read encrypted file, so that it also works with external...Bjoern Schiessle2013-07-311-4/+7
| * | | | | | this hopefully fixes testRecoveryForUser(), works locallyBjoern Schiessle2013-07-311-7/+10
| * | | | | | this test works locally, let's see what out build server says...Bjoern Schiessle2013-07-311-3/+0
| * | | | | | fix searchUsers() call in group.phpBjoern Schiessle2013-07-311-1/+1
| * | | | | | fixing some unit testsBjoern Schiessle2013-07-302-6/+6
| * | | | | | we need to use the path relative to data/Bjoern Schiessle2013-07-301-4/+1
| * | | | | | handle error if we can't handle the given pathBjoern Schiessle2013-07-302-2/+7
| * | | | | | remove unused method, the right one is in util.phpBjoern Schiessle2013-07-301-4/+0
| * | | | | | adapt unit tests to the modified stream wrapperBjoern Schiessle2013-07-305-35/+35
| * | | | | | only show decrypt all files option if encrypted files are availableBjoern Schiessle2013-07-301-2/+1
| * | | | | | encrypt/decrypt file versionsBjoern Schiessle2013-07-301-3/+124