summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2014-10-2383-253/+332
* Merge pull request #11704 from owncloud/fix-type-for-queryLukas Reschke2014-10-221-5/+8
|\
| * Use mixed as typeLukas Reschke2014-10-221-5/+8
* | Merge pull request #11702 from owncloud/fix-11637blizzz2014-10-221-4/+5
|\ \
| * | 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 #11620 from owncloud/settings-sidebarLukas Reschke2014-10-223-7/+56
|\ \ \
| * | | Add some basic sanitizationLukas Reschke2014-10-171-2/+2
| * | | implement sidebar fro personal settings - bad kung-fuThomas Müller2014-10-173-11/+47
| * | | first steps of sidebar for personal and admin settingsJan-Christoph Borchardt2014-10-171-0/+13
* | | | Merge pull request #9586 from owncloud/enhanced-sql-script-generation-oracle-...Jörn Friedrich Dreyer2014-10-224-13/+49
|\ \ \ \ | |_|_|/ |/| | |
| * | | Special treatment for OracleThomas Müller2014-10-164-13/+49
* | | | Merge pull request #11687 from owncloud/appframework-session-annotationLukas Reschke2014-10-223-1/+171
|\ \ \ \
| * | | | introduce SessionMiddleWare to control session handling via an annotationThomas Müller2014-10-223-1/+171
* | | | | Merge pull request #11694 from owncloud/extstorage-lazyinitLukas Reschke2014-10-226-107/+163
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Lazy initialize external storagesVincent Petry2014-10-226-107/+163
|/ / / /
* | | | Merge pull request #11684 from owncloud/guess_mimetype_on_touchJörn Friedrich Dreyer2014-10-222-2/+5
|\ \ \ \
| * | | | guess mimetype on touchJörn Friedrich Dreyer2014-10-212-2/+5
* | | | | always use the correct share typeBjoern Schiessle2014-10-221-3/+3
* | | | | Merge pull request #11416 from owncloud/eventloggerMorris Jobke2014-10-2217-10/+524
|\ \ \ \ \
| * | | | | 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-2216-14/+103
| |_|/ / / |/| | | |
* | | | | Merge pull request #11630 from owncloud/kill-some-legacyLukas Reschke2014-10-218-44/+30
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | move some deprecated usage of OC_Config and OC_AppConfig to \OC::serverThomas Müller2014-10-205-23/+24
| * | | | remove legacy class OC_UpdaterThomas Müller2014-10-203-21/+6
* | | | | Merge pull request #11675 from owncloud/urlencode-for-special-charactersLukas Reschke2014-10-211-3/+3
|\ \ \ \ \
| * | | | | URLEncode filenames to be compatible with special charactersLukas Reschke2014-10-201-3/+3
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-10-2128-85/+128
|/ / / / /
* | | | | Merge pull request #11666 from owncloud/setup-hidesqlitemessageforautoconfigLukas Reschke2014-10-201-0/+2
|\ \ \ \ \
| * | | | | Hide SQLite information on setup when autoconfig is usedVincent Petry2014-10-201-0/+2
| | |_|_|/ | |/| | |
* | | | | Merge pull request #11593 from owncloud/useRelativePathToOwnCloudInstallationLukas Reschke2014-10-203-9/+90
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Add proper setup and teardownVincent Petry2014-10-201-0/+17
| * | | | Add "$_SERVER['REQUEST_URI']" to fix the unit testsLukas Reschke2014-10-201-1/+8
| * | | | Add unit tests for convertToRelativePathLukas Reschke2014-10-202-1/+45
| * | | | Refer to relative path instead of absolute pathLukas Reschke2014-10-201-8/+21
|/ / / /
* | | | Merge pull request #11644 from owncloud/tune-share-autocompleteThomas Müller2014-10-201-1/+1
|\ \ \ \ | |_|/ / |/| | |
| * | | adjust autocomplete behavior for sharing menuCraig Morrissey2014-10-171-1/+1
* | | | make tests compatible with hook based skeleton generationJörn Friedrich Dreyer2014-10-2012-24/+102
* | | | 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-204-29/+42
* | | | [tx-robot] updated from transifexJenkins for ownCloud2014-10-2031-20/+325
* | | | [tx-robot] updated from transifexJenkins for ownCloud2014-10-1918-14/+66