summaryrefslogtreecommitdiffstats
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* repair search lucene before installingJörn Friedrich Dreyer2014-09-103-2/+66
* Merge pull request #10947 from owncloud/html-importsBernhard Posselt2014-09-091-0/+10
|\
| * append .html since componets always use html filesBernhard Posselt2014-09-081-1/+1
| * add template functions for html importsBernhard Posselt2014-09-081-0/+10
* | Merge pull request #10949 from owncloud/allow_prefilling_loginJörn Friedrich Dreyer2014-09-091-2/+2
|\ \
| * | allow prefilling loginJörn Friedrich Dreyer2014-09-081-2/+2
| |/
* | Merge pull request #7323 from owncloud/Jonny007-MKD-masterLukas Reschke2014-09-092-6/+19
|\ \
| * | Also update sqliteadapterRobin Appelman2014-07-021-3/+11
| * | Update adapter.phpJonny007-MKD2014-07-011-3/+8
* | | Merge pull request #10886 from owncloud/keep_fileid_on_move_in_objectstoreJörn Friedrich Dreyer2014-09-091-33/+5
|\ \ \
| * | | Keep fileid on move in objectstore, fixes #10848Jörn Friedrich Dreyer2014-09-051-33/+5
* | | | [tx-robot] updated from transifexJenkins for ownCloud2014-09-091-0/+1
* | | | Merge pull request #10858 from owncloud/issue/10847VicDeo2014-09-091-1/+1
|\ \ \ \
| * | | | Use correct language package so the subject is correctly translatedJoas Schilling2014-09-041-1/+1
* | | | | Merge pull request #10927 from owncloud/update-nosetupbackendsVincent Petry2014-09-081-1/+3
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Do not load extra user backends when an upgrade is dueVincent Petry2014-09-081-1/+3
* | | | | Merge pull request #10739 from owncloud/eventsource-publicLukas Reschke2014-09-085-47/+103
|\ \ \ \ \
| * | | | | Better phpdoc and method namingRobin Appelman2014-09-044-5/+7
| * | | | | Explicitly cast id and validate typeRobin Appelman2014-09-041-3/+6
| * | | | | Use the public api to get event sourcesRobin Appelman2014-09-031-4/+3
| * | | | | Add event source to the public apiRobin Appelman2014-09-034-1/+49
| * | | | | Initialize an event source when we start using it, not in the constructorRobin Appelman2014-09-031-42/+46
* | | | | | Merge pull request #10755 from owncloud/shorter_sharing_linksLukas Reschke2014-09-083-8/+11
|\ \ \ \ \ \
| * | | | | | Match \OC_Helper::linkToPublic() to new links and fit unittestskondou2014-09-041-6/+6
| * | | | | | Readd TOKEN_LENGTHkondou2014-09-042-1/+3
| * | | | | | Use base62 and remove configuration options for link lengthkondou2014-09-041-7/+2
| * | | | | | Change config.sample entry and use MediumSecuritykondou2014-09-041-1/+1
| * | | | | | Adapt token size to new generation and add an option for free length specific...kondou2014-09-041-16/+5
| * | | | | | Use a route instead of s.php and convert tokens asapkondou2014-09-042-3/+20
| * | | | | | Initial work on shorter linkskondou2014-09-041-1/+1
* | | | | | | Merge pull request #10938 from owncloud/useSecureMimetypeLukas Reschke2014-09-081-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Use secure mimetype for content deliveryLukas Reschke2014-09-081-1/+1
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge pull request #10827 from oparoz/patch-2Lukas Reschke2014-09-081-1/+1
|\ \ \ \ \ \ \
| * | | | | | | env:UserInstallation was already there in masterOlivier Paroz2014-09-031-2/+2
| * | | | | | | Libreoffice config folder needs to be setOlivier Paroz2014-09-031-1/+1
* | | | | | | | Merge pull request #10911 from owncloud/template-funcsLukas Reschke2014-09-081-0/+18
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | add shortcut functions for style and scriptBernhard Posselt2014-09-061-0/+18
* | | | | | | | Merge pull request #10862 from chli1/masterVincent Petry2014-09-081-5/+8
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | fix BadRequest error if CONTENT_LENGTH not setchli12014-09-041-5/+8
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge pull request #10889 from owncloud/moveTrustedDomainCheckLukas Reschke2014-09-051-15/+15
|\ \ \ \ \ \ \
| * | | | | | | Move trusted domain check to init()Lukas Reschke2014-09-051-15/+15
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Remove explicit propagate callsRobin Appelman2014-09-052-19/+7
* | | | | | | Update cache before post hooksRobin Appelman2014-09-051-19/+20
* | | | | | | Fix warning in homecacheRobin Appelman2014-09-051-0/+3
* | | | | | | Refactor Cache\Updater to work outside of the users homeRobin Appelman2014-09-053-173/+111
|/ / / / / /
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-09-051-0/+3
* | | | | | Merge pull request #10840 from owncloud/issue_10674Jesus Macias Portela2014-09-041-1/+7
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Fix code with previous commentsJesus Macias2014-09-031-1/+1
| * | | | | Reset changes on 3rdparty submoduleJesus Macias2014-09-031-1/+7
* | | | | | Merge pull request #10818 from owncloud/enableappforgroupfixLukas Reschke2014-09-042-13/+34
|\ \ \ \ \ \