summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2013-05-1645-142/+167
|
* Merge pull request #3371 from owncloud/fix-3353Thomas Müller2013-05-151-2/+2
|\ | | | | Fix finding mount in background watcher, fixes #3353
| * Merge branch 'master' into fix-3353Thomas Mueller2013-05-154-2/+99
| |\ | |/ |/|
* | Merge pull request #3374 from owncloud/vobject_compound_propertyThomas Müller2013-05-153-1/+95
|\ \ | | | | | | Add Compound property to avoid double escaping values.
| * | No unit test coverage reports for pgsql - this causes issues on Jenkins.Thomas Mueller2013-05-151-1/+6
| | |
| * | Add Compound property to avoid double escaping values.Thomas Tanghus2013-05-152-0/+89
| | |
* | | Merge pull request #3376 from owncloud/fix_for_disappearing_root_mount_pointThomas Müller2013-05-151-1/+4
|\ \ \ | | | | | | | | fix for disappearing root mount point on lib/files/filesystem.php
| * | | fix for losing mount point "/"Florin Peter2013-05-151-1/+4
|/ / /
| | * Fix finding mount in background watcher, fixes #3353Michael Gapczynski2013-05-151-2/+2
| |/ |/|
* | Merge pull request #3366 from owncloud/contributing_add_contactsMichael Gapczynski2013-05-151-1/+2
|\ \ | | | | | | Add Contacts repo to CONTRIBUTING.md
| * | Add Contacts repo to CONTRIBUTING.mdThomas Tanghus2013-05-151-1/+2
|/ /
* / [tx-robot] updated from transifexJenkins for ownCloud2013-05-15133-2828/+3136
|/
* Merge pull request #2821 from owncloud/fix-2159-rename-to-sharedThomas Müller2013-05-143-19/+230
|\ | | | | fix allowed rename of folder in root directory to reserved name "Shared"
| * [files] add private declaration of $viewMorris Jobke2013-05-141-0/+1
| |
| * [files] fix mock creation and remove hardcoded 'require' statementMorris Jobke2013-05-122-7/+2
| |
| * [files] rename lib to "App"Morris Jobke2013-05-123-7/+7
| |
| * [files] ownCloud typoMorris Jobke2013-05-121-1/+1
| |
| * [files] rename test class and add rename testMorris Jobke2013-05-121-1/+22
| |
| * [files] remove realpath in testMorris Jobke2013-05-121-1/+1
| |
| * [files] rename testsMorris Jobke2013-05-121-0/+99
| |
| * [files] remove normalizePath on rename and dependency injectionMorris Jobke2013-05-122-7/+8
| |
| * [files] kill stripslashesMorris Jobke2013-05-121-3/+3
| |
| * [files] fix typosMorris Jobke2013-05-121-5/+5
| |
| * [files] refactoringMorris Jobke2013-05-122-19/+111
| |
| * string comparisionMorris Jobke2013-05-121-1/+1
| |
| * wrong root dir nameMorris Jobke2013-05-121-2/+2
| |
| * fix allowed rename of folder in root directory to reserved name "Shared"Morris Jobke2013-05-121-2/+4
| | | | | | | | refs #2159
* | fix history template, print_unescaped() needs to include closing tagsBjörn Schießle2013-05-141-4/+4
| |
* | Merge pull request #3338 from owncloud/button_color_fixRaghu Nayyar2013-05-141-2/+4
|\ \ | | | | | | Keeping Font Colors Consistant on the headers.
| * | color change to crumb elements as well.raghunayyar2013-05-141-1/+1
| | |
| * | Keeping Font Colors Consistant on the headers.raghunayyar2013-05-131-1/+3
| | |
* | | Merge pull request #3330 from owncloud/preselect_filename_on_renameMorris Jobke2013-05-142-0/+27
|\ \ \ | | | | | | | | peselect filename without extension on rename
| * | | peselect filename without extension on renameJörn Friedrich Dreyer2013-05-132-0/+27
| | | |
* | | | [tx-robot] updated from transifexJenkins for ownCloud2013-05-1411-11/+11
| |/ / |/| |
* | | Merge pull request #3303 from owncloud/update_etags_on_restoreMorris Jobke2013-05-131-1/+4
|\ \ \ | | | | | | | | Make sure that etags get updated once a file gets retored from the trash bin
| * \ \ Merge branch 'master' into update_etags_on_restoreBjörn Schießle2013-05-13136-990/+1336
| |\ \ \
| * | | | touch() needs to be performed relative to user/files otherwise ownCloud ↵Björn Schießle2013-05-101-1/+4
| | | | | | | | | | | | | | | | | | | | doesn't execute the hooks which means that etags aren't updated properly
* | | | | Merge pull request #3329 from owncloud/increase_lock_timeoutBernhard Posselt2013-05-131-1/+1
|\ \ \ \ \ | |_|_|/ / |/| | | | Set the SQLite database lock timeout to 60 seconds which is the default ...
| * | | | Set the SQLite database lock timeout to 60 seconds which is the default in ↵Frank Karlitschek2013-05-131-1/+1
|/ / / / | | | | | | | | | | | | PHP anyways. I don't know why the MDB2 driver has this hardcoded to 0.1 seconds. This potentially fixes a lot of SQLite database lock problems and stuck in maintainance mode during upgrade issues.
* | | | Merge pull request #3326 from owncloud/fix-3321Lukas Reschke2013-05-131-1/+1
|\ \ \ \ | |_|/ / |/| | | Add requesttoken to guest view
| * | | Add requesttoken to guest viewLukas Reschke2013-05-131-1/+1
|/ / / | | | | | | Should fix #3321
* | | Merge pull request #3235 from NCTU-NBA/pr-langcodeMorris Jobke2013-05-131-3/+3
|\ \ \ | | | | | | | | Modify zh_* language codes
| * \ \ Merge remote-tracking branch 'upstream/master' into pr-langcodePellaeon Lin2013-05-12162-1108/+1720
| |\ \ \
| * | | | Modify zh_* language codesPellaeon Lin2013-05-041-3/+3
| | | | |
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-05-1313-32/+49
| |/ / / |/| | |
* | | | Merge pull request #3311 from owncloud/disable_mbstring.func_overloadMorris Jobke2013-05-121-0/+1
|\ \ \ \ | |_|_|/ |/| | | disable mbstring.func_overload in setup v.3
| * | | disable mbstring.func_overload in setupThomas Tanghus2013-05-121-0/+1
| | | |
* | | | Merge pull request #3290 from owncloud/config-dataLukas Reschke2013-05-123-5/+5
|\ \ \ \ | |/ / / |/| | | Move config data to template
| * | | TypoLukas Reschke2013-05-121-2/+2
| | | |
| * | | Get config from templateLukas Reschke2013-05-123-5/+5
|/ / /