Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #11704 from owncloud/fix-type-for-query | Lukas Reschke | 2014-10-22 | 1 | -5/+8 |
|\ | | | | | Use mixed as type | ||||
| * | Use mixed as type | Lukas Reschke | 2014-10-22 | 1 | -5/+8 |
| | | | | | | | | Actually query() returns value of the type "mixed" (as is also stated in the interface) - this is purely there to make our IDEs and Scrutinizer happier. | ||||
* | | Merge pull request #11702 from owncloud/fix-11637 | blizzz | 2014-10-22 | 1 | -4/+5 |
|\ \ | | | | | | | setup filesystem by username, not login name, fixes #11637 | ||||
| * | | better variable name | Arthur Schiwon | 2014-10-22 | 1 | -3/+4 |
| | | | |||||
| * | | set up FS by username, not login name\! | Arthur Schiwon | 2014-10-22 | 1 | -1/+1 |
| | | | |||||
* | | | Merge pull request #9586 from ↵ | Jörn Friedrich Dreyer | 2014-10-22 | 4 | -13/+49 |
|\ \ \ | |_|/ |/| | | | | | | | | owncloud/enhanced-sql-script-generation-oracle-master Special treatment for Oracle | ||||
| * | | Special treatment for Oracle | Thomas Müller | 2014-10-16 | 4 | -13/+49 |
| | | | |||||
* | | | Merge pull request #11687 from owncloud/appframework-session-annotation | Lukas Reschke | 2014-10-22 | 2 | -1/+82 |
|\ \ \ | |_|/ |/| | | introduce SessionMiddleWare to control session handling via an annotatio... | ||||
| * | | introduce SessionMiddleWare to control session handling via an annotation | Thomas Müller | 2014-10-22 | 2 | -1/+82 |
| | | | |||||
* | | | always use the correct share type | Bjoern Schiessle | 2014-10-22 | 1 | -3/+3 |
| | | | |||||
* | | | Merge pull request #11416 from owncloud/eventlogger | Morris Jobke | 2014-10-22 | 17 | -10/+524 |
|\ \ \ | | | | | | | | | Allow apps to gather performance diagnistics | ||||
| * | | | call initPaths() right before the server is instantiated | Thomas Müller | 2014-10-21 | 1 | -1/+1 |
| | | | | |||||
| * | | | Log some additional events | Robin Appelman | 2014-10-20 | 2 | -2/+6 |
| | | | | |||||
| * | | | Allow adding events that hapend before the event logger was loaded | Robin Appelman | 2014-10-20 | 3 | -1/+17 |
| | | | | |||||
| * | | | Rename to NullQueryLogger | Robin Appelman | 2014-10-20 | 3 | -6/+6 |
| | | | | |||||
| * | | | Log some basic events | Robin Appelman | 2014-10-20 | 6 | -4/+24 |
| | | | | |||||
| * | | | 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 |
| | | | | |||||
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-10-22 | 1 | -0/+9 |
| |/ / |/| | | |||||
* | | | Merge pull request #11630 from owncloud/kill-some-legacy | Lukas Reschke | 2014-10-21 | 4 | -22/+7 |
|\ \ \ | | | | | | | | | remove legacy class OC_Updater | ||||
| * | | | move some deprecated usage of OC_Config and OC_AppConfig to \OC::server | Thomas Müller | 2014-10-20 | 1 | -1/+1 |
| | | | | |||||
| * | | | remove legacy class OC_Updater | Thomas Müller | 2014-10-20 | 3 | -21/+6 |
| |/ / | |||||
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-10-21 | 3 | -1/+4 |
| | | | |||||
* | | | Add unit tests for convertToRelativePath | Lukas Reschke | 2014-10-20 | 1 | -1/+1 |
| | | | |||||
* | | | Refer to relative path instead of absolute path | Lukas Reschke | 2014-10-20 | 1 | -8/+21 |
|/ / | | | | | | | | | | | | | There is no need to refer to the absolute path here if we can use the relative one. Conflicts: lib/private/templatelayout.php | ||||
* | | 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 | 3 | -27/+40 |
| | | | | | | | | suspend encryption proxy when copying skeleton | ||||
* | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-10-20 | 3 | -0/+3 |
| | | |||||
* | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-10-18 | 2 | -0/+2 |
| | | |||||
* | | make performance less bad. Still far from good, but at least it works | Arthur Schiwon | 2014-10-17 | 1 | -3/+2 |
| | | |||||
* | | with several backends, more than limit can be returned | Arthur Schiwon | 2014-10-17 | 1 | -1/+1 |
| | | |||||
* | | Merge pull request #11430 from owncloud/minify-js-css-master | Morris Jobke | 2014-10-17 | 6 | -81/+147 |
|\ \ | | | | | | | adding cssmin and jssmin(minify) | ||||
| * | | adding cssmin and jssmin(minify) | Thomas Müller | 2014-10-17 | 6 | -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 #9104 from macjohnny/macjohnny-drastic-ldap-speedup | blizzz | 2014-10-17 | 1 | -5/+12 |
|\ \ \ | | | | | | | | | drastic ldap speedup (update) | ||||
| * | | | 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 | 1 | -2/+12 |
|\ \ \ \ | | | | | | | | | | | Fix SVG icons | ||||
| * | | | | Remove insane comment | Lukas Reschke | 2014-10-16 | 1 | -1/+0 |
| | | | | | |||||
| * | | | | Fix SVG icons | Lukas Reschke | 2014-10-16 | 1 | -2/+13 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | ||||
* | | | | | Add PHPDoc about sanitization of "insertIfNotExist" | Lukas Reschke | 2014-10-17 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | Let's document this potential pitfall properly. |