summaryrefslogtreecommitdiffstats
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
* Port OC.dialogs to use octemplate except for prompt() and form().Thomas Tanghus2013-05-161-0/+1
| | | | Also load octemplate per default.
* [tx-robot] updated from transifexJenkins for ownCloud2013-05-161-1/+1
|
* Merge branch 'master' into fix-3353Thomas Mueller2013-05-152-1/+74
|\
| * Merge pull request #3374 from owncloud/vobject_compound_propertyThomas Müller2013-05-151-0/+70
| |\ | | | | | | Add Compound property to avoid double escaping values.
| | * Add Compound property to avoid double escaping values.Thomas Tanghus2013-05-151-0/+70
| | |
| * | fix for losing mount point "/"Florin Peter2013-05-151-1/+4
| |/
* / Fix finding mount in background watcher, fixes #3353Michael Gapczynski2013-05-151-2/+2
|/
* 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 #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
| |
* | Get config from templateLukas Reschke2013-05-121-1/+1
|/
* [tx-robot] updated from transifexJenkins for ownCloud2013-05-122-1/+20
|
* Merge pull request #3283 from owncloud/move-legacy-fsMorris Jobke2013-05-102-0/+0
|\ | | | | Move legacy filesystem classes
| * Move legacy filesystem classesRobin Appelman2013-05-082-0/+0
| |
* | 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 ↵Jörn Friedrich Dreyer2013-05-102-10/+16
| | | | | | | | isPartialFile, correct usage of isPartialFile and isFileBlacklisted
* | don't call correctFolder() in touchHook, it will be called later in the ↵Björn Schießle2013-05-081-1/+0
| | | | | | | | writeUpdate()
* | update etag for for the touched fileBjörn Schießle2013-05-081-1/+9
|/
* Merge pull request #3271 from owncloud/fix_for_util_tearDownFSFlorinPeter2013-05-081-0/+1
|\ | | | | fix for tearDownFS, after filesystem::tearDown() in Util
| * fix for tearDownFS, after filesystem::tearDown() the root is not mountedFlorin Peter2013-05-071-0/+1
| |
* | Autoloader: fix loading app clases located in lib/Robin Appelman2013-05-081-5/+6
| |
* | 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
| |
* | Allow the autoloader to try mutliple possible paths for each pathRobin Appelman2013-05-071-24/+17
| |
* | Add per-autoloader classPathRobin Appelman2013-05-071-3/+24
| |
* | Move autoloader to it's own classRobin Appelman2013-05-072-56/+71
|/
* Merge pull request #3044 from owncloud/backgroundwatchericewind19912013-05-072-0/+119
|\ | | | | Add a background job to watch for external filesystem changes
| * Cache: check one folder and one file each time the backgroundwatcher runsRobin Appelman2013-04-201-8/+39
| | | | | | | | Because there are usually way less folders than files it walks trought the list of all folder quicker, this causes new files to be detected quicker
| * Cache: add a backgroundjob to check for external changes to the filesystemRobin Appelman2013-04-203-0/+89
| |
* | Merge pull request #3025 from owncloud/move-fileMichael Gapczynski2013-05-071-11/+14
|\ \ | | | | | | Cache: only look for child entires when doing a move operation when moving a folder
| * | Cache: only look for child entires when doing a move operation when moving a ↵Robin Appelman2013-04-191-12/+15
| |/ | | | | | | folder
* | Merge pull request #2813 from owncloud/improve-lib-checkBart Visscher2013-05-071-1/+1
|\ \ | | | | | | added correct check for gd and check for php-intl
| * | remove hard php-intl requirementMorris Jobke2013-05-071-5/+0
| | |
| * | added correct check for gd and check for php-intlBernhard Posselt2013-04-091-1/+6
| | |
* | | Merge pull request #3120 from owncloud/ocs_propertiesBart Visscher2013-05-051-1/+1
|\ \ \ | | | | | | | | Allow subclassing of OC_OCS_Result class by changing properties from 'private' to 'protected'
| * | | Make class properties protected instead of private to allow subclassingTom Needham2013-04-231-1/+1
| | | |
* | | | [tx-robot] updated from transifexJenkins for ownCloud2013-05-041-0/+8
| | | |
* | | | Merge pull request #3222 from owncloud/fix-3218Bart Visscher2013-05-032-2/+5
|\ \ \ \ | | | | | | | | | | Fix retrieving of mount points for shared storage, fix #3218
| * | | | One more mount point fixMichael Gapczynski2013-05-021-1/+4
| | | | |
| * | | | Fix retrieving of mount points for shared storage, fix #3218Michael Gapczynski2013-05-021-1/+1
| | | | |
* | | | | Merge pull request #2972 from AndreasErgenzinger/masterBart Visscher2013-05-031-1/+13
|\ \ \ \ \ | | | | | | | | | | | | Translations for themes
| * | | | | additional safety checksAndreasErgenzinger2013-04-171-1/+3
| | | | | |
| * | | | | merge translations with those from themeAndreasErgenzinger2013-04-171-9/+10
| | | | | |
| * | | | | merge translations with those from themeAndreasErgenzinger2013-04-171-0/+9
| | | | | |
* | | | | | Merge pull request #2491 from riso/xsendfile_fix_zipBart Visscher2013-05-032-20/+22
|\ \ \ \ \ \ | | | | | | | | | | | | | | improved handling of xsendfile zip generation race condition
| * | | | | | fixed xsendfile zip generation race conditionValerio Ponte2013-03-202-20/+22
| | | | | | |
* | | | | | | Merge pull request #3216 from owncloud/fix-api-3rdpartyTom Needham2013-05-021-2/+8
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | fix bug that would only return error responses for 3rdparty apps