summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Expand)AuthorAgeFilesLines
* merge master into filesystemRobin Appelman2012-10-261-6/+5
|\
| * separate buttons for new file and uploadJan-Christoph Borchardt2012-10-261-6/+5
* | Merge branch 'master' into filesystemRobin Appelman2012-10-264-7/+59
|\|
| * [tx-robot] updated from transifexJenkins for ownCloud2012-10-264-7/+59
* | merge master into filesystemRobin Appelman2012-10-2520-62/+68
|\|
| * dir in newfile has to start with /Bart Visscher2012-10-251-1/+1
| * [tx-robot] updated from transifexJenkins for ownCloud2012-10-251-0/+6
| * Merge pull request #81 from fmms/masterLukas Reschke2012-10-2415-53/+53
| |\
| | * NoSpaceAfterComma IIFelix Moeller2012-10-233-6/+6
| | * Checkstyle: NoSpaceAfterCommaFelix Moeller2012-10-2314-49/+49
| * | Forget to urlencode the pathLukas Reschke2012-10-241-1/+1
| * | urlencodeLukas Reschke2012-10-241-6/+6
| * | Revert e1a4fe98908dbf8f9e795fd852b231381d4f3ce4Lukas Reschke2012-10-241-1/+1
| * | urldecode target directoryBjörn Schießle2012-10-241-1/+1
* | | cleanup OC_Files a bitRobin Appelman2012-10-245-20/+34
* | | merge master into filesystemRobin Appelman2012-10-2414-244/+361
|\| |
| * | Apply coding style guideThomas Müller2012-10-241-1/+2
| * | fix copy&paste bug from previous commitBjörn Schießle2012-10-241-1/+1
| * | Shared files are not stored in the file cache. Therefore we need toBjörn Schießle2012-10-241-1/+18
| * | Place the brackets in the first lineLukas Reschke2012-10-241-60/+59
| * | Apply coding style guideThomas Müller2012-10-241-203/+203
| * | calling OC_Filesystem at this point will initialize file system with wrong us...Björn Schießle2012-10-241-2/+8
| * | Merge pull request #76 from fmms/masterLukas Reschke2012-10-233-3/+3
| |\|
| | * Codestyle: FunctionCallArgumentSpacingFelix Moeller2012-10-233-3/+3
| * | [tx-robot] updated from transifexJenkins for ownCloud2012-10-244-23/+58
| * | LDAP: properly check if Groups-feature is enabledArthur Schiwon2012-10-241-3/+2
| * | Merge pull request #75 from fmms/masterLukas Reschke2012-10-231-2/+2
| |\|
| | * More Checkstyle cleanupFelix Moeller2012-10-231-2/+2
| * | Remove uneeded vendor prefixesLukas Reschke2012-10-241-2/+0
| * | Format the CSS in a readable wayLukas Reschke2012-10-231-11/+73
| * | Fix urlencoding in the breadcrumbLukas Reschke2012-10-231-1/+1
| * | Merge pull request #62 from fmms/masterLukas Reschke2012-10-232-2/+2
| |\|
| | * Make Jenkins more happy.Felix Moeller2012-10-232-2/+2
* | | merge master into filesystemRobin Appelman2012-10-2330-39/+348
|\| |
| * | Merge pull request #12 from scambra/fixesicewind19912012-10-233-2/+10
| |\ \
| | * | check free space using folder's ownerscambra2012-09-193-2/+10
| * | | Merge pull request #59 from fmms/mastericewind19912012-10-231-1/+1
| |\ \ \ | | | |/ | | |/|
| | * | Correct a first issue Checkstyle is complaining about ...Felix Moeller2012-10-221-1/+1
| * | | Files: urldecode urlencoded dir names, fixes oc-2111Arthur Schiwon2012-10-231-1/+1
| |/ /
| * | [tx-robot] updated from transifexJenkins for ownCloud2012-10-2320-27/+297
| * | LDAP: fix db update for PostgresArthur Schiwon2012-10-232-2/+2
| * | LDAP: fix cache save and check, fixes oc-2118Arthur Schiwon2012-10-221-4/+5
| * | [tx-robot] updated from transifexJenkins for ownCloud2012-10-223-0/+30
* | | postpone the cost of setting up some of the external storage backends untill ...Robin Appelman2012-10-216-8/+81
* | | Merge branch 'master' into filesystemRobin Appelman2012-10-218-1/+90
|\| |
| * | [tx-robot] updated from transifexJenkins for ownCloud2012-10-218-1/+90
* | | some namespaces fixed for the shared backendRobin Appelman2012-10-211-18/+7
* | | drop filectime from the filesystem api'sRobin Appelman2012-10-206-30/+0
* | | Merge branch 'master' into filesystemRobin Appelman2012-10-2043-120/+286
|\| |
| * | [tx-robot] updated from transifexJenkins for ownCloud2012-10-2025-33/+176