Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Rename namespace to Diagnostics | Robin Appelman | 2014-10-20 | 12 | -34/+34 |
| | |||||
* | Activate the query logger on connect | Robin Appelman | 2014-10-20 | 1 | -0/+1 |
| | |||||
* | Add QueryLogger interface to allow apps to get a list of used queries | Robin Appelman | 2014-10-20 | 7 | -0/+217 |
| | |||||
* | Add an EventLogger interface to allow apps to get a log of the request timeline | Robin Appelman | 2014-10-20 | 7 | -6/+262 |
| | |||||
* | make tests compatible with hook based skeleton generation | Jörn Friedrich Dreyer | 2014-10-20 | 12 | -24/+102 |
| | |||||
* | throw exception in writeBack, the returned boolean is checked nowhere | Jörn Friedrich Dreyer | 2014-10-20 | 1 | -3/+2 |
| | |||||
* | make skeleton compatible with objectstore | Jörn Friedrich Dreyer | 2014-10-20 | 4 | -29/+42 |
| | | | | suspend encryption proxy when copying skeleton | ||||
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-10-20 | 31 | -20/+325 |
| | |||||
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-10-19 | 18 | -14/+66 |
| | |||||
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-10-18 | 75 | -41/+167 |
| | |||||
* | Merge pull request #11494 from owncloud/fix-ldap-ingroup-for-9225-2 | blizzz | 2014-10-17 | 5 | -33/+96 |
|\ | | | | | fix retrieval of group members and cache group members | ||||
| * | adjust group manager tests | Arthur Schiwon | 2014-10-17 | 1 | -15/+9 |
| | | |||||
| * | add one simple cache test | Arthur Schiwon | 2014-10-17 | 1 | -4/+29 |
| | | |||||
| * | make performance less bad. Still far from good, but at least it works | Arthur Schiwon | 2014-10-17 | 3 | -11/+32 |
| | | |||||
| * | with several backends, more than limit can be returned | Arthur Schiwon | 2014-10-17 | 1 | -1/+1 |
| | | |||||
| * | fix retrievel of group members and cache group members | Arthur Schiwon | 2014-10-17 | 1 | -2/+25 |
|/ | | | | fix changed variable name | ||||
* | update 3rdparty to match master - just adds the merge commit | Morris Jobke | 2014-10-17 | 1 | -0/+0 |
| | |||||
* | Merge pull request #11430 from owncloud/minify-js-css-master | Morris Jobke | 2014-10-17 | 7 | -81/+147 |
|\ | | | | | adding cssmin and jssmin(minify) | ||||
| * | adding cssmin and jssmin(minify) | Thomas Müller | 2014-10-17 | 7 | -81/+147 |
| | | | | | | | | | | | | adding argument deleteSelf to rmdirr() - if false the directory itself will not be deleted only it's content adding repair step to clean the asset cache after upgrade + coding style adjustments | ||||
* | | Merge pull request #11634 from owncloud/loadapps-encapsulaterequire | Lukas Reschke | 2014-10-17 | 1 | -1/+11 |
|\ \ | | | | | | | Encapsulate require_once to avoid name space bleedind | ||||
| * | | Encapsulate require_once to avoid name space bleedind | Vincent Petry | 2014-10-17 | 1 | -1/+11 |
| | | | | | | | | | | | | | | | | | | | | | | | | The script required by require_once might use variable names like $app which will conflict with the code that follows. This fix encapsulates require_once into its own function to avoid such issues. | ||||
* | | | Merge pull request #11631 from owncloud/fix-undefine-encryption-exception | Björn Schießle | 2014-10-17 | 1 | -3/+4 |
|\ \ \ | |_|/ |/| | | fixing usage of EncryptionException | ||||
| * | | fixing usage of EncryptionException | Thomas Müller | 2014-10-17 | 1 | -3/+4 |
| | | | |||||
* | | | Merge pull request #9104 from macjohnny/macjohnny-drastic-ldap-speedup | blizzz | 2014-10-17 | 2 | -15/+22 |
|\ \ \ | | | | | | | | | drastic ldap speedup (update) | ||||
| * | | | adapted tests for a groupId indexed group array | macjohnny | 2014-06-24 | 1 | -10/+10 |
| | | | | |||||
| * | | | modified caching mechanism in getUserGroupIds | macjohnny | 2014-06-23 | 1 | -25/+6 |
| | | | | | | | | | | | | removed cachedUserGroupIds, instead changed indexing in getUserGroups to groupId | ||||
| * | | | clean up function getUserGroupIds | macjohnny | 2014-06-23 | 1 | -7/+4 |
| | | | | | | | | | | | | clean up of function getUserGroupIds and improved caching mechanism of cachedUserGroupIds | ||||
| * | | | Update manager.php | macjohnny | 2014-06-21 | 1 | -3/+11 |
| | | | | |||||
| * | | | Update manager.php | macjohnny | 2014-06-19 | 1 | -2/+2 |
| | | | | |||||
| * | | | Update manager.php | macjohnny | 2014-06-19 | 1 | -9/+25 |
| | | | | |||||
| * | | | Update manager.php | macjohnny | 2014-06-19 | 1 | -0/+1 |
| | | | | | | | | | | | | defined $uid in getUserGroupIds | ||||
| * | | | Update manager.php | macjohnny | 2014-06-19 | 1 | -1/+2 |
| | | | | | | | | | | | | added description and blank lines in getUserGroupIds | ||||
| * | | | Update manager.php | macjohnny | 2014-06-19 | 1 | -1/+4 |
| | | | | | | | | | | | | add caching to getUserGroupIds | ||||
* | | | | Merge pull request #11611 from owncloud/fix-svg-master | Morris Jobke | 2014-10-17 | 2 | -3/+13 |
|\ \ \ \ | | | | | | | | | | | Fix SVG icons | ||||
| * | | | | Remove insane comment | Lukas Reschke | 2014-10-16 | 1 | -1/+0 |
| | | | | | |||||
| * | | | | Fix SVG icons | Lukas Reschke | 2014-10-16 | 2 | -3/+14 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | FIXME: Ugly hack to prevent SVG of being returned if the SVG provider is not enabled. This is required because the preview system is designed in a bad way and relies on opt-in with asterisks (i.e. image/*) which will lead to the fact that a SVG will also match the image provider. Conflicts: lib/private/preview.php | ||||
* | | | | | Merge pull request #11629 from owncloud/add-notice-to-php-doc | Morris Jobke | 2014-10-17 | 1 | -1/+1 |
|\ \ \ \ \ | | | | | | | | | | | | | Add PHPDoc about sanitization of "insertIfNotExist" | ||||
| * | | | | | Add PHPDoc about sanitization of "insertIfNotExist" | Lukas Reschke | 2014-10-17 | 1 | -1/+1 |
| | |_|/ / | |/| | | | | | | | | | | | | | Let's document this potential pitfall properly. | ||||
* | | | | | Merge pull request #11594 from owncloud/sharing_toggle_password | Morris Jobke | 2014-10-17 | 1 | -0/+1 |
|\ \ \ \ \ | |/ / / / |/| | | | | set password field placeholder back if passward was disabled | ||||
| * | | | | set password field placeholder back if passward was disabled | Bjoern Schiessle | 2014-10-15 | 1 | -0/+1 |
| | | | | | |||||
* | | | | | Merge pull request #11627 from owncloud/fix-sample.php-syntax | Thomas Müller | 2014-10-17 | 1 | -3/+5 |
|\ \ \ \ \ | | | | | | | | | | | | | fix the RST syntax of config.sample.php | ||||
| * | | | | | fix the RST syntax of config.sample.php | Morris Jobke | 2014-10-17 | 1 | -3/+5 |
| | | | | | | |||||
* | | | | | | Merge pull request #11552 from owncloud/fix_files_external_flickering | Jörn Friedrich Dreyer | 2014-10-17 | 1 | -76/+80 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Fix files external flickering | ||||
| * | | | | | | cleanup variable names and duplicate jQuery selectors | Jörn Friedrich Dreyer | 2014-10-13 | 1 | -76/+80 |
| | | | | | | | |||||
| * | | | | | | fix flickering users | Jörn Friedrich Dreyer | 2014-10-13 | 1 | -1/+1 |
| | | | | | | | |||||
* | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-10-17 | 94 | -69/+329 |
| |/ / / / / |/| | | | | | |||||
* | | | | | | read config.sample.php options and whitespace fixes | Morris Jobke | 2014-10-17 | 1 | -4/+6 |
| | | | | | | |||||
* | | | | | | Merge pull request #11626 from owncloud/add-l10n | Lukas Reschke | 2014-10-16 | 1 | -1/+1 |
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | Use l10n on this string as well | ||||
| * | | | | | Use l10n on this string as well | Lukas Reschke | 2014-10-16 | 1 | -1/+1 |
| | | | | | | |||||
* | | | | | | Merge pull request #11625 from owncloud/fix-setup-due-to-some-race-condition | Vincent Petry | 2014-10-16 | 1 | -6/+10 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | Add a try catch block |