Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Port OC.dialogs to use octemplate except for prompt() and form(). | Thomas Tanghus | 2013-05-16 | 1 | -0/+1 |
| | | | | Also load octemplate per default. | ||||
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-05-16 | 1 | -1/+1 |
| | |||||
* | Merge branch 'master' into fix-3353 | Thomas Mueller | 2013-05-15 | 2 | -1/+74 |
|\ | |||||
| * | Merge pull request #3374 from owncloud/vobject_compound_property | Thomas Müller | 2013-05-15 | 1 | -0/+70 |
| |\ | | | | | | | Add Compound property to avoid double escaping values. | ||||
| | * | Add Compound property to avoid double escaping values. | Thomas Tanghus | 2013-05-15 | 1 | -0/+70 |
| | | | |||||
| * | | fix for losing mount point "/" | Florin Peter | 2013-05-15 | 1 | -1/+4 |
| |/ | |||||
* / | Fix finding mount in background watcher, fixes #3353 | Michael Gapczynski | 2013-05-15 | 1 | -2/+2 |
|/ | |||||
* | Set the SQLite database lock timeout to 60 seconds which is the default in ↵ | Frank Karlitschek | 2013-05-13 | 1 | -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_overload | Morris Jobke | 2013-05-12 | 1 | -0/+1 |
|\ | | | | | disable mbstring.func_overload in setup v.3 | ||||
| * | disable mbstring.func_overload in setup | Thomas Tanghus | 2013-05-12 | 1 | -0/+1 |
| | | |||||
* | | Get config from template | Lukas Reschke | 2013-05-12 | 1 | -1/+1 |
|/ | |||||
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-05-12 | 2 | -1/+20 |
| | |||||
* | Merge pull request #3283 from owncloud/move-legacy-fs | Morris Jobke | 2013-05-10 | 2 | -0/+0 |
|\ | | | | | Move legacy filesystem classes | ||||
| * | Move legacy filesystem classes | Robin Appelman | 2013-05-08 | 2 | -0/+0 |
| | | |||||
* | | don't emit rename hooks on partial file renames | Jörn Friedrich Dreyer | 2013-05-10 | 1 | -2/+2 |
| | | |||||
* | | rename isIgnoredFile to isPartialFile, remove check of blacklisted files in ↵ | Jörn Friedrich Dreyer | 2013-05-10 | 2 | -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ßle | 2013-05-08 | 1 | -1/+0 |
| | | | | | | | | writeUpdate() | ||||
* | | update etag for for the touched file | Björn Schießle | 2013-05-08 | 1 | -1/+9 |
|/ | |||||
* | Merge pull request #3271 from owncloud/fix_for_util_tearDownFS | FlorinPeter | 2013-05-08 | 1 | -0/+1 |
|\ | | | | | fix for tearDownFS, after filesystem::tearDown() in Util | ||||
| * | fix for tearDownFS, after filesystem::tearDown() the root is not mounted | Florin Peter | 2013-05-07 | 1 | -0/+1 |
| | | |||||
* | | Autoloader: fix loading app clases located in lib/ | Robin Appelman | 2013-05-08 | 1 | -5/+6 |
| | | |||||
* | | Autoloader: load the 3rdparty libraries using prefixes | Robin Appelman | 2013-05-07 | 1 | -17/+16 |
| | | |||||
* | | check for setlocale after setting up the paths to prevent autoloader confusion | Robin Appelman | 2013-05-07 | 1 | -2/+7 |
| | | |||||
* | | Autoloader: add support for custom namespace paths | Robin Appelman | 2013-05-07 | 1 | -1/+19 |
| | | |||||
* | | Autoloader: split getting the class paths and loading the class | Robin Appelman | 2013-05-07 | 1 | -7/+20 |
| | | |||||
* | | Allow disabling the global classpath in an autoloader | Robin Appelman | 2013-05-07 | 1 | -3/+19 |
| | | |||||
* | | Allow the autoloader to try mutliple possible paths for each path | Robin Appelman | 2013-05-07 | 1 | -24/+17 |
| | | |||||
* | | Add per-autoloader classPath | Robin Appelman | 2013-05-07 | 1 | -3/+24 |
| | | |||||
* | | Move autoloader to it's own class | Robin Appelman | 2013-05-07 | 2 | -56/+71 |
|/ | |||||
* | Merge pull request #3044 from owncloud/backgroundwatcher | icewind1991 | 2013-05-07 | 2 | -0/+119 |
|\ | | | | | Add a background job to watch for external filesystem changes | ||||
| * | Cache: check one folder and one file each time the backgroundwatcher runs | Robin Appelman | 2013-04-20 | 1 | -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 filesystem | Robin Appelman | 2013-04-20 | 3 | -0/+89 |
| | | |||||
* | | Merge pull request #3025 from owncloud/move-file | Michael Gapczynski | 2013-05-07 | 1 | -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 Appelman | 2013-04-19 | 1 | -12/+15 |
| |/ | | | | | | | folder | ||||
* | | Merge pull request #2813 from owncloud/improve-lib-check | Bart Visscher | 2013-05-07 | 1 | -1/+1 |
|\ \ | | | | | | | added correct check for gd and check for php-intl | ||||
| * | | remove hard php-intl requirement | Morris Jobke | 2013-05-07 | 1 | -5/+0 |
| | | | |||||
| * | | added correct check for gd and check for php-intl | Bernhard Posselt | 2013-04-09 | 1 | -1/+6 |
| | | | |||||
* | | | Merge pull request #3120 from owncloud/ocs_properties | Bart Visscher | 2013-05-05 | 1 | -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 subclassing | Tom Needham | 2013-04-23 | 1 | -1/+1 |
| | | | | |||||
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-05-04 | 1 | -0/+8 |
| | | | | |||||
* | | | | Merge pull request #3222 from owncloud/fix-3218 | Bart Visscher | 2013-05-03 | 2 | -2/+5 |
|\ \ \ \ | | | | | | | | | | | Fix retrieving of mount points for shared storage, fix #3218 | ||||
| * | | | | One more mount point fix | Michael Gapczynski | 2013-05-02 | 1 | -1/+4 |
| | | | | | |||||
| * | | | | Fix retrieving of mount points for shared storage, fix #3218 | Michael Gapczynski | 2013-05-02 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | Merge pull request #2972 from AndreasErgenzinger/master | Bart Visscher | 2013-05-03 | 1 | -1/+13 |
|\ \ \ \ \ | | | | | | | | | | | | | Translations for themes | ||||
| * | | | | | additional safety checks | AndreasErgenzinger | 2013-04-17 | 1 | -1/+3 |
| | | | | | | |||||
| * | | | | | merge translations with those from theme | AndreasErgenzinger | 2013-04-17 | 1 | -9/+10 |
| | | | | | | |||||
| * | | | | | merge translations with those from theme | AndreasErgenzinger | 2013-04-17 | 1 | -0/+9 |
| | | | | | | |||||
* | | | | | | Merge pull request #2491 from riso/xsendfile_fix_zip | Bart Visscher | 2013-05-03 | 2 | -20/+22 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | improved handling of xsendfile zip generation race condition | ||||
| * | | | | | | fixed xsendfile zip generation race condition | Valerio Ponte | 2013-03-20 | 2 | -20/+22 |
| | | | | | | | |||||
* | | | | | | | Merge pull request #3216 from owncloud/fix-api-3rdparty | Tom Needham | 2013-05-02 | 1 | -2/+8 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | fix bug that would only return error responses for 3rdparty apps |