Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | repair search lucene before installing | Jörn Friedrich Dreyer | 2014-09-10 | 3 | -2/+66 |
| | |||||
* | Merge pull request #10947 from owncloud/html-imports | Bernhard Posselt | 2014-09-09 | 1 | -0/+10 |
|\ | | | | | add template functions for html imports | ||||
| * | append .html since componets always use html files | Bernhard Posselt | 2014-09-08 | 1 | -1/+1 |
| | | |||||
| * | add template functions for html imports | Bernhard Posselt | 2014-09-08 | 1 | -0/+10 |
| | | |||||
* | | Merge pull request #10949 from owncloud/allow_prefilling_login | Jörn Friedrich Dreyer | 2014-09-09 | 1 | -2/+2 |
|\ \ | | | | | | | allow prefilling login | ||||
| * | | allow prefilling login | Jörn Friedrich Dreyer | 2014-09-08 | 1 | -2/+2 |
| |/ | |||||
* | | Merge pull request #7323 from owncloud/Jonny007-MKD-master | Lukas Reschke | 2014-09-09 | 2 | -6/+19 |
|\ \ | | | | | | | Update adapter.php | ||||
| * | | Also update sqliteadapter | Robin Appelman | 2014-07-02 | 1 | -3/+11 |
| | | | |||||
| * | | Update adapter.php | Jonny007-MKD | 2014-07-01 | 1 | -3/+8 |
| | | | | | | | | | | | | Modified insertIfNotExist() to support NULL values | ||||
* | | | Merge pull request #10886 from owncloud/keep_fileid_on_move_in_objectstore | Jörn Friedrich Dreyer | 2014-09-09 | 1 | -33/+5 |
|\ \ \ | | | | | | | | | Keep fileid on move in objectstore, fixes #10848 | ||||
| * | | | Keep fileid on move in objectstore, fixes #10848 | Jörn Friedrich Dreyer | 2014-09-05 | 1 | -33/+5 |
| | | | | |||||
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-09-09 | 1 | -0/+1 |
| | | | | |||||
* | | | | Merge pull request #10858 from owncloud/issue/10847 | VicDeo | 2014-09-09 | 1 | -1/+1 |
|\ \ \ \ | | | | | | | | | | | Use correct language package so the subject is correctly translated | ||||
| * | | | | Use correct language package so the subject is correctly translated | Joas Schilling | 2014-09-04 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | Fix #10847 | ||||
* | | | | | Merge pull request #10927 from owncloud/update-nosetupbackends | Vincent Petry | 2014-09-08 | 1 | -1/+3 |
|\ \ \ \ \ | |_|_|_|/ |/| | | | | Do not load extra user backends when an upgrade is due | ||||
| * | | | | Do not load extra user backends when an upgrade is due | Vincent Petry | 2014-09-08 | 1 | -1/+3 |
| | | | | | | | | | | | | | | | | | | | | Whenever an upgrade is due, do not load extra user backends | ||||
* | | | | | Merge pull request #10739 from owncloud/eventsource-public | Lukas Reschke | 2014-09-08 | 5 | -47/+103 |
|\ \ \ \ \ | | | | | | | | | | | | | Add EventSource to the public API | ||||
| * | | | | | Better phpdoc and method naming | Robin Appelman | 2014-09-04 | 4 | -5/+7 |
| | | | | | | |||||
| * | | | | | Explicitly cast id and validate type | Robin Appelman | 2014-09-04 | 1 | -3/+6 |
| | | | | | | |||||
| * | | | | | Use the public api to get event sources | Robin Appelman | 2014-09-03 | 1 | -4/+3 |
| | | | | | | |||||
| * | | | | | Add event source to the public api | Robin Appelman | 2014-09-03 | 4 | -1/+49 |
| | | | | | | |||||
| * | | | | | Initialize an event source when we start using it, not in the constructor | Robin Appelman | 2014-09-03 | 1 | -42/+46 |
| | | | | | | |||||
* | | | | | | Merge pull request #10755 from owncloud/shorter_sharing_links | Lukas Reschke | 2014-09-08 | 3 | -8/+11 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Shorter sharing links | ||||
| * | | | | | | Match \OC_Helper::linkToPublic() to new links and fit unittests | kondou | 2014-09-04 | 1 | -6/+6 |
| | | | | | | | |||||
| * | | | | | | Readd TOKEN_LENGTH | kondou | 2014-09-04 | 2 | -1/+3 |
| | | | | | | | |||||
| * | | | | | | Use base62 and remove configuration options for link length | kondou | 2014-09-04 | 1 | -7/+2 |
| | | | | | | | |||||
| * | | | | | | Change config.sample entry and use MediumSecurity | kondou | 2014-09-04 | 1 | -1/+1 |
| | | | | | | | |||||
| * | | | | | | Adapt token size to new generation and add an option for free length ↵ | kondou | 2014-09-04 | 1 | -16/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | specification Minimum size is 3 = 46656 tokens, maximum size is 64, which is what our DB allows. | ||||
| * | | | | | | Use a route instead of s.php and convert tokens asap | kondou | 2014-09-04 | 2 | -3/+20 |
| | | | | | | | |||||
| * | | | | | | Initial work on shorter links | kondou | 2014-09-04 | 1 | -1/+1 |
| | | | | | | | |||||
* | | | | | | | Merge pull request #10938 from owncloud/useSecureMimetype | Lukas Reschke | 2014-09-08 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Use secure mimetype for content delivery | ||||
| * | | | | | | | Use secure mimetype for content delivery | Lukas Reschke | 2014-09-08 | 1 | -1/+1 |
| | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | Adds some hardening against potential CSP bypassed. | ||||
* | | | | | | | Merge pull request #10827 from oparoz/patch-2 | Lukas Reschke | 2014-09-08 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Libreoffice config folder needs to be set | ||||
| * | | | | | | | env:UserInstallation was already there in master | Olivier Paroz | 2014-09-03 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | My changes were made against stable7 and I merged them to the file in master, so this version is now the properly merged file for master. I'm just adding `owncloud-<instanceid>` to the path where temp files are stored. | ||||
| * | | | | | | | Libreoffice config folder needs to be set | Olivier Paroz | 2014-09-03 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In order to avoid conflicts between multiple instances installed on one server, it's required to define a LibreOffice configuration folder per instance. Just like with my PR for the documents app (https://github.com/owncloud/documents/pull/353), I propose to use /tmp/owncloud-instanceid | ||||
* | | | | | | | | Merge pull request #10911 from owncloud/template-funcs | Lukas Reschke | 2014-09-08 | 1 | -0/+18 |
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | Add template shortcut functions for style and script | ||||
| * | | | | | | | add shortcut functions for style and script | Bernhard Posselt | 2014-09-06 | 1 | -0/+18 |
| | | | | | | | | |||||
* | | | | | | | | Merge pull request #10862 from chli1/master | Vincent Petry | 2014-09-08 | 1 | -5/+8 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | fix BadRequest error if CONTENT_LENGTH not set | ||||
| * | | | | | | | fix BadRequest error if CONTENT_LENGTH not set | chli1 | 2014-09-04 | 1 | -5/+8 |
| | |_|_|/ / / | |/| | | | | | | | | | | | | If client does not send content length header on webdav upload (e.g. because the content comes from a stream and its length is not predictable) the put() method should not try to compare the content length value with the actually amount of received data, because this will always fail and results in a BadRequest exception. So the check will only be performed if $_SERVER['CONTENT_LENGTH'] is set. | ||||
* | | | | | | | Merge pull request #10889 from owncloud/moveTrustedDomainCheck | Lukas Reschke | 2014-09-05 | 1 | -15/+15 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Move trusted domain check to init() | ||||
| * | | | | | | | Move trusted domain check to init() | Lukas Reschke | 2014-09-05 | 1 | -15/+15 |
| | |_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | handleRequest() is not called from remote.php or public.php which made these files party available but all included apps in there produced errors. As the expected behaviour is anyways that a trusted domain warning is shown I moved this to init() Fixes https://github.com/owncloud/core/issues/10064 | ||||
* | | | | | | | Remove explicit propagate calls | Robin Appelman | 2014-09-05 | 2 | -19/+7 |
| | | | | | | | |||||
* | | | | | | | Update cache before post hooks | Robin Appelman | 2014-09-05 | 1 | -19/+20 |
| | | | | | | | |||||
* | | | | | | | Fix warning in homecache | Robin Appelman | 2014-09-05 | 1 | -0/+3 |
| | | | | | | | |||||
* | | | | | | | Refactor Cache\Updater to work outside of the users home | Robin Appelman | 2014-09-05 | 3 | -173/+111 |
|/ / / / / / | |||||
* | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-09-05 | 1 | -0/+3 |
| | | | | | | |||||
* | | | | | | Merge pull request #10840 from owncloud/issue_10674 | Jesus Macias Portela | 2014-09-04 | 1 | -1/+7 |
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | Solve bug with touch always return true on /lib/private/files/view.php | ||||
| * | | | | | Fix code with previous comments | Jesus Macias | 2014-09-03 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | Reset changes on 3rdparty submodule | Jesus Macias | 2014-09-03 | 1 | -1/+7 |
| | | | | | | |||||
* | | | | | | Merge pull request #10818 from owncloud/enableappforgroupfix | Lukas Reschke | 2014-09-04 | 2 | -13/+34 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Fix upgrade process when apps enabled for specific groups |