summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Pass \OC::$WEBROOT to the ctrLukas Reschke2014-11-272-5/+12
* Remove redundant codeLukas Reschke2014-11-271-3/+3
* Use server containerLukas Reschke2014-11-273-1/+17
* Add functions to modify cookies to response classLukas Reschke2014-11-276-18/+177
* Merge pull request #12433 from owncloud/appstoreVincent Petry2014-11-261-0/+1
|\
| * added comment that App Store is disabled for EECarla Schroder2014-11-251-0/+1
* | Merge pull request #12304 from oparoz/patch-1Vincent Petry2014-11-261-1/+1
|\ \
| * | Use a more universal shebangOlivier Paroz2014-11-191-1/+1
* | | Merge pull request #12448 from owncloud/no503forRootMorris Jobke2014-11-261-1/+1
|\ \ \
| * | | Don't show favicon to prevent iteration through subfoldersLukas Reschke2014-11-261-1/+1
* | | | Merge pull request #12453 from owncloud/kill-session-globalThomas Müller2014-11-262-27/+2
|\ \ \ \
| * | | | remove deprecated \OC:$sessionThomas Müller2014-11-262-27/+2
|/ / / /
* | | | Merge pull request #6989 from AdamWill/google-1Robin Appelman2014-11-2657-6250/+11212
|\ \ \ \
| * | | | google: disable compression when curl is not availableAdam Williamson2014-11-071-0/+6
| * | | | update google-api-php-client to 1.0.6-betaAdam Williamson2014-11-0721-264/+1179
| * | | | scrutinizer fix: explicitly declare Google class property $clientAdam Williamson2014-11-061-0/+1
| * | | | scrutinizer fix: correct @return for getDriveFile()Adam Williamson2014-11-061-2/+3
| * | | | bump google lib to c6949531d2 (post 1.0.3-beta, including query separator fix)Adam Williamson2014-11-064-11/+38
| * | | | google drive: set access type to 'offline' when requesting tokenAdam Williamson2014-11-061-0/+1
| * | | | fix a bug in google-api-php-client: generates an auth url that doesn't workAdam Williamson2014-11-061-1/+1
| * | | | files_external/3rdparty: update google-api-php-client to 1.0.2-betaAdam Williamson2014-11-0653-6160/+10171
| * | | | Migrate Google Drive storage app to v1.0.0 of the client libraryAdam Williamson2014-11-062-25/+25
* | | | | Merge pull request #12414 from owncloud/delay-autoconfig-kill-2Morris Jobke2014-11-261-7/+14
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | autoconfig.php only to be deleted on successful installationThomas Müller2014-11-251-7/+14
* | | | | Merge pull request #12411 from owncloud/unknown-command-windowsLukas Reschke2014-11-262-9/+4
|\ \ \ \ \
| * | | | | Replace some more "command -v" calls with the Helper methodJoas Schilling2014-11-252-9/+4
| |/ / / /
* | | | | Merge pull request #12438 from owncloud/jenkins-no-new-session-ocs-apiMorris Jobke2014-11-261-16/+22
|\ \ \ \ \
| * | | | | because OC_User::login will create a new session we shall only try to login i...Thomas Müller2014-11-261-16/+22
* | | | | | Merge pull request #12350 from mprokop/link_expirationMorris Jobke2014-11-262-7/+8
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Consolidate if statement, and update unit testMiguel Prokop2014-11-212-8/+4
| * | | | | fix calculation of expiration date if there is a default expiration date set ...Miguel Prokop2014-11-211-3/+8
* | | | | | Merge pull request #12421 from owncloud/issue/6101-remove-namespace-permissio...Morris Jobke2014-11-2642-240/+262
|\ \ \ \ \ \
| * | | | | | Replace deprecated constant with new class constantJoas Schilling2014-11-2541-237/+237
| * | | | | | Move namespaced constants to namespaced classJoas Schilling2014-11-251-3/+25
* | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-11-2612-4/+12
| |_|_|_|_|/ |/| | | | |
* | | | | | Merge pull request #12420 from owncloud/sqlite-wal-2Morris Jobke2014-11-265-21/+36
|\ \ \ \ \ \
| * | | | | | fix failing unit test for the temp manager - concurrently executed unit tests...Thomas Müller2014-11-251-2/+2
| * | | | | | adding new config parameter for sqlite to specify the journal modeThomas Müller2014-11-254-19/+34
| | |_|/ / / | |/| | | |
* | | | | | Merge pull request #12410 from owncloud/no_session_for_public_share_keyThomas Müller2014-11-254-34/+15
|\ \ \ \ \ \
| * | | | | | replace \OC:: with \OC::->getSession()Bjoern Schiessle2014-11-251-2/+2
| * | | | | | we no longer need to keep the session open for encryptionBjoern Schiessle2014-11-252-14/+3
| * | | | | | don't store private public-share-key in sessionBjoern Schiessle2014-11-251-17/+10
| * | | | | | remove unused variableBjoern Schiessle2014-11-251-1/+0
* | | | | | | Merge pull request #12416 from owncloud/app-info-xml-parser-2Thomas Müller2014-11-259-61/+223
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | handle invalid xml fileThomas Müller2014-11-253-7/+45
| * | | | | | simplify xml parser codeThomas Müller2014-11-253-64/+55
| * | | | | | Introduce app info xml parser including basic unit test - necessary for #10777Thomas Müller2014-11-257-61/+194
| | |/ / / / | |/| | | |
* | | | | | Merge pull request #12313 from oparoz/patch-2Thomas Müller2014-11-253-3/+3
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | The class name is Movie NOT MoviesOlivier Paroz2014-11-253-3/+3
|/ / / / /
* | | | | Merge pull request #12262 from owncloud/removeAbsoluteDirectoryPathFromTemplateMorris Jobke2014-11-253-5/+3
|\ \ \ \ \ | |/ / / / |/| | | |