summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #3338 from owncloud/button_color_fixRaghu Nayyar2013-05-141-2/+4
|\
| * 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 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
|\ \
| * \ 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 doesn...Björn Schießle2013-05-101-1/+4
* | | | 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 in PH...Frank Karlitschek2013-05-131-1/+1
|/ / /
* | | Merge pull request #3326 from owncloud/fix-3321Lukas Reschke2013-05-131-1/+1
|\ \ \ | |_|/ |/| |
| * | Add requesttoken to guest viewLukas Reschke2013-05-131-1/+1
|/ /
* | Merge pull request #3235 from NCTU-NBA/pr-langcodeMorris Jobke2013-05-131-3/+3
|\ \
| * \ 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 setupThomas Tanghus2013-05-121-0/+1
* | | | Merge pull request #3290 from owncloud/config-dataLukas Reschke2013-05-123-5/+5
|\ \ \ \ | |/ / / |/| | |
| * | | TypoLukas Reschke2013-05-121-2/+2
| * | | Get config from templateLukas Reschke2013-05-123-5/+5
|/ / /
* | | [tx-robot] updated from transifexJenkins for ownCloud2013-05-12119-941/+1260
* | | Merge pull request #3309 from owncloud/no_explicit_autoloadicewind19912013-05-112-4/+5
|\ \ \
| * | | Use new autoloader classThomas Tanghus2013-05-112-4/+5
|/ / /
* | | Merge pull request #3296 from owncloud/disable_mbstring.func_overloadMorris Jobke2013-05-111-0/+1
|\ \ \
| * | | disable mbstring.func_overloadThomas Tanghus2013-05-101-0/+1
* | | | Merge pull request #3257 from owncloud/fix_3251Jan-Christoph Borchardt2013-05-101-2/+3
|\ \ \ \
| * | | | Fix #3251kondou2013-05-091-2/+3
* | | | | Merge pull request #3283 from owncloud/move-legacy-fsMorris Jobke2013-05-102-0/+0
|\ \ \ \ \
| * | | | | Move legacy filesystem classesRobin Appelman2013-05-082-0/+0
* | | | | | Merge pull request #3304 from owncloud/fix_bypass_fo_file_blacklisticewind19912013-05-102-12/+18
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | don't emit rename hooks on partial file renamesJörn Friedrich Dreyer2013-05-101-2/+2
| * | | | | rename isIgnoredFile to isPartialFile, remove check of blacklisted files in i...Jörn Friedrich Dreyer2013-05-102-10/+16
|/ / / / /
* | | | | Merge pull request #3277 from owncloud/fix-change-passwordMichael Gapczynski2013-05-092-2/+2
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | fix inconsistent post parameters in change password operationBjörn Schießle2013-05-082-2/+2
* | | | | don't call correctFolder() in touchHook, it will be called later in the write...Björn Schießle2013-05-081-1/+0
* | | | | rename a file if it gets restored so that it no longer exists as a version. O...Björn Schießle2013-05-081-1/+1
* | | | | update etag for for the touched fileBjörn Schießle2013-05-081-1/+9
* | | | | touch file relative to users file folder, otherwise the hooks will be ignoredBjörn Schießle2013-05-081-4/+5
| |/ / / |/| | |
* | | | Merge pull request #3271 from owncloud/fix_for_util_tearDownFSFlorinPeter2013-05-081-0/+1
|\ \ \ \ | |/ / / |/| | |
| * | | fix for tearDownFS, after filesystem::tearDown() the root is not mountedFlorin Peter2013-05-071-0/+1
* | | | Merge pull request #3272 from owncloud/legacy-autoloaderBart Visscher2013-05-083-62/+198
|\ \ \ \ | |/ / / |/| | |
| * | | Autoloader: fix loading app clases located in lib/Robin Appelman2013-05-082-15/+23
| * | | Autoloader: test casesRobin Appelman2013-05-071-5/+53
| * | | Autoloader: load the 3rdparty libraries using prefixesRobin Appelman2013-05-071-17/+16
| * | | check for setlocale after setting up the paths to prevent autoloader confusionRobin Appelman2013-05-071-2/+7
| * | | Autoloader: add support for custom namespace pathsRobin Appelman2013-05-071-1/+19
| * | | Autoloader: split getting the class paths and loading the classRobin Appelman2013-05-071-7/+20
| * | | Allow disabling the global classpath in an autoloaderRobin Appelman2013-05-071-3/+19