Lukas Reschke
bfebbe47de
Merge pull request #10962 from owncloud/repair_search_lucene
...
repair search lucene before installing
2014-09-11 10:09:43 +02:00
Thomas Müller
2a382a87d5
Merge pull request #10988 from owncloud/usetransactions-wrong-name
...
Fix method name useTransactions
2014-09-10 17:27:23 +02:00
Robin Appelman
fa2b385d33
Fix method name
2014-09-10 15:59:24 +02:00
Vincent Petry
70ebe86e60
Merge pull request #10929 from owncloud/issue/10514
...
Set overwritewebroot when installing owncloud to avoid problems
2014-09-10 15:07:57 +02:00
Jörn Friedrich Dreyer
8e2acb1482
repair search lucene before installing
2014-09-10 10:22:40 +02:00
Bernhard Posselt
ba698a4942
Merge pull request #10972 from ppaysant/routes-defaults
...
Allow default values for route parameters.
2014-09-09 23:40:46 +02:00
Lukas Reschke
c3d90b96c8
Merge pull request #10922 from owncloud/explicit-scan-transactions
...
Use bigger transactions when doing explicit file system scans
2014-09-09 23:32:32 +02:00
Patrick Paysant
cb5416b798
Allow default values for route parameters.
2014-09-09 23:00:29 +02:00
Bernhard Posselt
023e066971
more sugar for including lists of templates
2014-09-09 15:47:42 +02:00
Bernhard Posselt
d02f6c7ebe
Merge pull request #10947 from owncloud/html-imports
...
add template functions for html imports
2014-09-09 14:07:46 +02:00
Jörn Friedrich Dreyer
3d4f77c8f1
Merge pull request #10949 from owncloud/allow_prefilling_login
...
allow prefilling login
2014-09-09 11:42:14 +02:00
Lukas Reschke
353155b516
Merge pull request #7323 from owncloud/Jonny007-MKD-master
...
Update adapter.php
2014-09-09 11:31:50 +02:00
Jörn Friedrich Dreyer
ed2414fd0d
Merge pull request #10886 from owncloud/keep_fileid_on_move_in_objectstore
...
Keep fileid on move in objectstore, fixes #10848
2014-09-09 10:25:10 +02:00
VicDeo
efd485acda
Merge pull request #10858 from owncloud/issue/10847
...
Use correct language package so the subject is correctly translated
2014-09-09 01:11:34 +03:00
Jörn Friedrich Dreyer
0aad7fa1b1
allow prefilling login
2014-09-08 21:44:13 +02:00
Bernhard Posselt
f685d03674
append .html since componets always use html files
2014-09-08 21:37:18 +02:00
Bernhard Posselt
4aff85cd0c
add template functions for html imports
2014-09-08 21:19:44 +02:00
Lukas Reschke
70abce0482
Merge pull request #10739 from owncloud/eventsource-public
...
Add EventSource to the public API
2014-09-08 18:46:27 +02:00
Lukas Reschke
c79c894dbb
Merge pull request #10755 from owncloud/shorter_sharing_links
...
Shorter sharing links
2014-09-08 17:26:20 +02:00
Lukas Reschke
2d847934ed
Merge pull request #10938 from owncloud/useSecureMimetype
...
Use secure mimetype for content delivery
2014-09-08 17:13:54 +02:00
Lukas Reschke
5de404eb92
Merge pull request #10827 from oparoz/patch-2
...
Libreoffice config folder needs to be set
2014-09-08 16:41:26 +02:00
Lukas Reschke
fa718d2e2c
Fix typo
2014-09-08 16:34:03 +02:00
Lukas Reschke
0cdfe4f8c2
Merge pull request #10911 from owncloud/template-funcs
...
Add template shortcut functions for style and script
2014-09-08 16:32:05 +02:00
Lukas Reschke
312ed18d15
Use secure mimetype for content delivery
...
Adds some hardening against potential CSP bypassed.
2014-09-08 15:57:39 +02:00
Joas Schilling
249558966e
Set overwritewebroot when installing owncloud to avoid problems
...
Fix #10514
2014-09-08 14:30:13 +02:00
Robin Appelman
644755df66
Use bigger transactions when doing explicit file system scans
2014-09-08 14:15:41 +02:00
Vincent Petry
637cff68ac
Merge pull request #10862 from chli1/master
...
fix BadRequest error if CONTENT_LENGTH not set
2014-09-08 10:00:15 +02:00
Bernhard Posselt
7e4d244200
add shortcut functions for style and script
2014-09-06 14:25:28 +02:00
Jörn Friedrich Dreyer
8488be4d03
Keep fileid on move in objectstore, fixes #10848
2014-09-05 13:25:59 +02:00
Robin Appelman
e29b7e9335
Remove explicit propagate calls
2014-09-05 11:53:24 +02:00
Robin Appelman
d0e83a71aa
Update cache before post hooks
2014-09-05 11:53:24 +02:00
Robin Appelman
1d8a88dd1b
Fix warning in homecache
2014-09-05 11:53:23 +02:00
Robin Appelman
850542c5d6
Refactor Cache\Updater to work outside of the users home
2014-09-05 11:53:23 +02:00
kondou
ecc9b42e41
Match \OC_Helper::linkToPublic() to new links and fit unittests
2014-09-04 20:44:50 +02:00
kondou
a10411d2bc
Readd TOKEN_LENGTH
2014-09-04 19:09:26 +02:00
Jesus Macias Portela
523680cef2
Merge pull request #10840 from owncloud/issue_10674
...
Solve bug with touch always return true on /lib/private/files/view.php
2014-09-04 17:29:08 +02:00
kondou
226b203e20
Use base62 and remove configuration options for link length
2014-09-04 16:20:20 +02:00
kondou
c2d8eabd71
Change config.sample entry and use MediumSecurity
2014-09-04 15:52:23 +02:00
kondou
3bf725d7e0
Adapt token size to new generation and add an option for free length specification
...
Minimum size is 3 = 46656 tokens, maximum size is 64, which is what our DB allows.
2014-09-04 15:24:33 +02:00
kondou
2a4c51389c
Use a route instead of s.php and convert tokens asap
2014-09-04 15:23:55 +02:00
kondou
0f2ad9862e
Initial work on shorter links
2014-09-04 15:23:53 +02:00
Lukas Reschke
1a7df33233
Merge pull request #10818 from owncloud/enableappforgroupfix
...
Fix upgrade process when apps enabled for specific groups
2014-09-04 13:56:41 +02:00
chli1
712487c861
fix BadRequest error if CONTENT_LENGTH not set
...
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.
2014-09-04 13:49:15 +02:00
Robin Appelman
fa3393674c
Better phpdoc and method naming
2014-09-04 13:26:51 +02:00
Robin Appelman
8605e2e6a5
Explicitly cast id and validate type
2014-09-04 13:26:47 +02:00
Olivier Paroz
bbc2d7cf4f
Typ in whichOpenOffice test
2014-09-04 12:54:20 +02:00
Joas Schilling
a0e8e88bc6
Use correct language package so the subject is correctly translated
...
Fix #10847
2014-09-04 11:23:23 +02:00
Lukas Reschke
8fec19a872
Merge pull request #10790 from cbhp/master
...
added missing User-Agents
2014-09-03 22:40:12 +02:00
Jesus Macias
91c8174013
Fix code with previous comments
2014-09-03 18:21:24 +02:00
Jesus Macias
883649b69c
Reset changes on 3rdparty submodule
2014-09-03 18:20:09 +02:00