summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* merge master into filesystemRobin Appelman2012-10-24223-5440/+8134
|\
| * 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-245-288/+274
| * 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-236-12/+9
| |\
| | * Codestyle: FunctionCallArgumentSpacingFelix Moeller2012-10-234-4/+4
| | * Checkstyle: MultiLineConditionFelix Moeller2012-10-231-4/+1
| | * Checkstyle: LowerCaseConstantFelix Moeller2012-10-232-4/+4
| * | [tx-robot] updated from transifexJenkins for ownCloud2012-10-24185-5115/+7545
| * | LDAP: properly check if Groups-feature is enabledArthur Schiwon2012-10-241-3/+2
| * | Merge pull request #75 from fmms/masterLukas Reschke2012-10-2314-37/+37
| |\|
| | * More Checkstyle cleanupFelix Moeller2012-10-2314-37/+37
| * | Remove uneeded vendor prefixesLukas Reschke2012-10-241-4/+0
| * | Format CSS in a readable wayLukas Reschke2012-10-241-8/+44
| * | Remove uneeded vendor prefixesLukas Reschke2012-10-241-2/+0
| * | Format the CSS in a readable wayLukas Reschke2012-10-231-11/+73
| * | Remove uneeded vendor prefixesLukas Reschke2012-10-231-6/+0
| * | Format the CSS in a readable way...Lukas Reschke2012-10-231-18/+83
| * | Remove uneeded vendor prefixesLukas Reschke2012-10-231-6/+0
| * | Format the CSS in a readable way...Lukas Reschke2012-10-231-7/+63
| * | box-shadow can safely be used without vendor prefixesLukas Reschke2012-10-231-1/+1
| * | radius can safely be used without vendor prefixesLukas Reschke2012-10-231-2/+0
| * | box-shadow can safely be used without vendor prefixesLukas Reschke2012-10-231-2/+0
| * | Format the CSS in a readable way….Lukas Reschke2012-10-231-9/+65
| * | Urlencode the share URLLukas Reschke2012-10-231-1/+1
| * | Fix urlencoding in the breadcrumbLukas Reschke2012-10-231-1/+1
| * | Merge pull request #62 from fmms/masterLukas Reschke2012-10-2310-77/+77
| |\|
| | * Make Jenkins more happy.Felix Moeller2012-10-2310-77/+77
| * | Merge pull request #40 from scambra/dateformat-fixesLukas Reschke2012-10-231-1/+6
| |\ \
| | * | fix strftime in windows, use %#d instead of %e in windowsscambra2012-10-231-1/+6
| * | | use strtotime on non-nummeric times in oc_filesystem::touchRobin Appelman2012-10-231-0/+3
| |/ /
* | | use strtotime on non-nummeric times in oc_filesystem::touchRobin Appelman2012-10-231-9/+12
* | | merge master into filesystemRobin Appelman2012-10-23117-795/+3069
|\| |
| * | Merge pull request #12 from scambra/fixesicewind19912012-10-236-26/+50
| |\ \
| | * | check free space using folder's ownerscambra2012-09-196-26/+50
| * | | Merge pull request #59 from fmms/mastericewind19912012-10-238-12/+12
| |\ \ \ | | | |/ | | |/|
| | * | Correct a first issue Checkstyle is complaining about ...Felix Moeller2012-10-228-12/+12
| * | | Files: urldecode urlencoded dir names, fixes oc-2111Arthur Schiwon2012-10-231-1/+1
| * | | Merge pull request #58 from fmms/masterLukas Reschke2012-10-231-5/+6
| |\| |
| | * | Adding the t() function to have the labels in the search results translatedFelix Moeller2012-10-221-5/+6
| * | | get effective username after webdav login, fixes oc-2108Arthur Schiwon2012-10-231-1/+1
| |/ /
| * | Merge pull request #38 from scambra/datepicker-l10nLukas Reschke2012-10-227-7/+28
| |\ \
| | * | Translate formatDate using jquery datepickerscambra2012-10-196-3/+7
| | * | translate datepickerscambra2012-10-196-4/+21
| * | | [tx-robot] updated from transifexJenkins for ownCloud2012-10-2375-823/+1381
| * | | LDAP: fix db update for PostgresArthur Schiwon2012-10-232-2/+2
| * | | Disable enhancedauth by defaultLukas Reschke2012-10-222-4/+4