summaryrefslogtreecommitdiffstats
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #11704 from owncloud/fix-type-for-queryLukas Reschke2014-10-221-5/+8
|\ | | | | Use mixed as type
| * Use mixed as typeLukas Reschke2014-10-221-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-11637blizzz2014-10-221-4/+5
|\ \ | | | | | | setup filesystem by username, not login name, fixes #11637
| * | better variable nameArthur Schiwon2014-10-221-3/+4
| | |
| * | set up FS by username, not login name\!Arthur Schiwon2014-10-221-1/+1
| | |
* | | Merge pull request #9586 from ↵Jörn Friedrich Dreyer2014-10-224-13/+49
|\ \ \ | |_|/ |/| | | | | | | | owncloud/enhanced-sql-script-generation-oracle-master Special treatment for Oracle
| * | Special treatment for OracleThomas Müller2014-10-164-13/+49
| | |
* | | Merge pull request #11687 from owncloud/appframework-session-annotationLukas Reschke2014-10-222-1/+82
|\ \ \ | |_|/ |/| | introduce SessionMiddleWare to control session handling via an annotatio...
| * | introduce SessionMiddleWare to control session handling via an annotationThomas Müller2014-10-222-1/+82
| | |
* | | always use the correct share typeBjoern Schiessle2014-10-221-3/+3
| | |
* | | Merge pull request #11416 from owncloud/eventloggerMorris Jobke2014-10-2217-10/+524
|\ \ \ | | | | | | | | Allow apps to gather performance diagnistics
| * | | call initPaths() right before the server is instantiatedThomas Müller2014-10-211-1/+1
| | | |
| * | | Log some additional eventsRobin Appelman2014-10-202-2/+6
| | | |
| * | | Allow adding events that hapend before the event logger was loadedRobin Appelman2014-10-203-1/+17
| | | |
| * | | Rename to NullQueryLoggerRobin Appelman2014-10-203-6/+6
| | | |
| * | | Log some basic eventsRobin Appelman2014-10-206-4/+24
| | | |
| * | | Rename namespace to DiagnosticsRobin Appelman2014-10-2012-34/+34
| | | |
| * | | Activate the query logger on connectRobin Appelman2014-10-201-0/+1
| | | |
| * | | Add QueryLogger interface to allow apps to get a list of used queriesRobin Appelman2014-10-207-0/+217
| | | |
| * | | Add an EventLogger interface to allow apps to get a log of the request timelineRobin Appelman2014-10-207-6/+262
| | | |
* | | | [tx-robot] updated from transifexJenkins for ownCloud2014-10-221-0/+9
| |/ / |/| |
* | | Merge pull request #11630 from owncloud/kill-some-legacyLukas Reschke2014-10-214-22/+7
|\ \ \ | | | | | | | | remove legacy class OC_Updater
| * | | move some deprecated usage of OC_Config and OC_AppConfig to \OC::serverThomas Müller2014-10-201-1/+1
| | | |
| * | | remove legacy class OC_UpdaterThomas Müller2014-10-203-21/+6
| |/ /
* | | [tx-robot] updated from transifexJenkins for ownCloud2014-10-213-1/+4
| | |
* | | Add unit tests for convertToRelativePathLukas Reschke2014-10-201-1/+1
| | |
* | | Refer to relative path instead of absolute pathLukas Reschke2014-10-201-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 nowhereJörn Friedrich Dreyer2014-10-201-3/+2
| |
* | make skeleton compatible with objectstoreJörn Friedrich Dreyer2014-10-203-27/+40
| | | | | | | | suspend encryption proxy when copying skeleton
* | [tx-robot] updated from transifexJenkins for ownCloud2014-10-203-0/+3
| |
* | [tx-robot] updated from transifexJenkins for ownCloud2014-10-182-0/+2
| |
* | make performance less bad. Still far from good, but at least it worksArthur Schiwon2014-10-171-3/+2
| |
* | with several backends, more than limit can be returnedArthur Schiwon2014-10-171-1/+1
| |
* | Merge pull request #11430 from owncloud/minify-js-css-masterMorris Jobke2014-10-176-81/+147
|\ \ | | | | | | adding cssmin and jssmin(minify)
| * | adding cssmin and jssmin(minify)Thomas Müller2014-10-176-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-encapsulaterequireLukas Reschke2014-10-171-1/+11
|\ \ \ | |/ / |/| | Encapsulate require_once to avoid name space bleedind
| * | Encapsulate require_once to avoid name space bleedindVincent Petry2014-10-171-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-speedupblizzz2014-10-171-5/+12
|\ \ \ | | | | | | | | drastic ldap speedup (update)
| * | | modified caching mechanism in getUserGroupIdsmacjohnny2014-06-231-25/+6
| | | | | | | | | | | | removed cachedUserGroupIds, instead changed indexing in getUserGroups to groupId
| * | | clean up function getUserGroupIdsmacjohnny2014-06-231-7/+4
| | | | | | | | | | | | clean up of function getUserGroupIds and improved caching mechanism of cachedUserGroupIds
| * | | Update manager.phpmacjohnny2014-06-211-3/+11
| | | |
| * | | Update manager.phpmacjohnny2014-06-191-2/+2
| | | |
| * | | Update manager.phpmacjohnny2014-06-191-9/+25
| | | |
| * | | Update manager.phpmacjohnny2014-06-191-0/+1
| | | | | | | | | | | | defined $uid in getUserGroupIds
| * | | Update manager.phpmacjohnny2014-06-191-1/+2
| | | | | | | | | | | | added description and blank lines in getUserGroupIds
| * | | Update manager.phpmacjohnny2014-06-191-1/+4
| | | | | | | | | | | | add caching to getUserGroupIds
* | | | Merge pull request #11611 from owncloud/fix-svg-masterMorris Jobke2014-10-171-2/+12
|\ \ \ \ | | | | | | | | | | Fix SVG icons
| * | | | Remove insane commentLukas Reschke2014-10-161-1/+0
| | | | |
| * | | | Fix SVG iconsLukas Reschke2014-10-161-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 Reschke2014-10-171-1/+1
| | | | | | | | | | | | | | | | | | | | Let's document this potential pitfall properly.