d02f6c7ebe
Merge pull request #10947 from owncloud/html-imports
...
add template functions for html imports
2014-09-09 14:07:46 +02:00
3d4f77c8f1
Merge pull request #10949 from owncloud/allow_prefilling_login
...
allow prefilling login
2014-09-09 11:42:14 +02:00
353155b516
Merge pull request #7323 from owncloud/Jonny007-MKD-master
...
Update adapter.php
2014-09-09 11:31:50 +02:00
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
317e6d03b4
[tx-robot] updated from transifex
2014-09-09 01:55:47 -04:00
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
a9a3f17b35
Merge pull request #10927 from owncloud/update-nosetupbackends
...
Do not load extra user backends when an upgrade is due
2014-09-08 22:57:15 +02:00
0aad7fa1b1
allow prefilling login
2014-09-08 21:44:13 +02:00
f685d03674
append .html since componets always use html files
2014-09-08 21:37:18 +02:00
4aff85cd0c
add template functions for html imports
2014-09-08 21:19:44 +02:00
70abce0482
Merge pull request #10739 from owncloud/eventsource-public
...
Add EventSource to the public API
2014-09-08 18:46:27 +02:00
c79c894dbb
Merge pull request #10755 from owncloud/shorter_sharing_links
...
Shorter sharing links
2014-09-08 17:26:20 +02:00
2d847934ed
Merge pull request #10938 from owncloud/useSecureMimetype
...
Use secure mimetype for content delivery
2014-09-08 17:13:54 +02:00
5de404eb92
Merge pull request #10827 from oparoz/patch-2
...
Libreoffice config folder needs to be set
2014-09-08 16:41:26 +02:00
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
312ed18d15
Use secure mimetype for content delivery
...
Adds some hardening against potential CSP bypassed.
2014-09-08 15:57:39 +02:00
d6bfd90bf8
Do not load extra user backends when an upgrade is due
...
Whenever an upgrade is due, do not load extra user backends
2014-09-08 12:30:04 +02:00
637cff68ac
Merge pull request #10862 from chli1/master
...
fix BadRequest error if CONTENT_LENGTH not set
2014-09-08 10:00:15 +02:00
7e4d244200
add shortcut functions for style and script
2014-09-06 14:25:28 +02:00
f5951b2254
Merge pull request #10889 from owncloud/moveTrustedDomainCheck
...
Move trusted domain check to init()
2014-09-05 17:39:37 +02:00
c9afa60f62
Move trusted domain check to init()
...
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
2014-09-05 14:10:35 +02:00
8488be4d03
Keep fileid on move in objectstore, fixes #10848
2014-09-05 13:25:59 +02:00
e29b7e9335
Remove explicit propagate calls
2014-09-05 11:53:24 +02:00
d0e83a71aa
Update cache before post hooks
2014-09-05 11:53:24 +02:00
1d8a88dd1b
Fix warning in homecache
2014-09-05 11:53:23 +02:00
850542c5d6
Refactor Cache\Updater to work outside of the users home
2014-09-05 11:53:23 +02:00
0736a6695e
[tx-robot] updated from transifex
2014-09-05 01:54:39 -04:00
ecc9b42e41
Match \OC_Helper::linkToPublic() to new links and fit unittests
2014-09-04 20:44:50 +02:00
a10411d2bc
Readd TOKEN_LENGTH
2014-09-04 19:09:26 +02:00
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
226b203e20
Use base62 and remove configuration options for link length
2014-09-04 16:20:20 +02:00
c2d8eabd71
Change config.sample entry and use MediumSecurity
2014-09-04 15:52:23 +02:00
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
2a4c51389c
Use a route instead of s.php and convert tokens asap
2014-09-04 15:23:55 +02:00
0f2ad9862e
Initial work on shorter links
2014-09-04 15:23:53 +02:00
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
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
fa3393674c
Better phpdoc and method naming
2014-09-04 13:26:51 +02:00
8605e2e6a5
Explicitly cast id and validate type
2014-09-04 13:26:47 +02:00
bbc2d7cf4f
Typ in whichOpenOffice test
2014-09-04 12:54:20 +02:00
a0e8e88bc6
Use correct language package so the subject is correctly translated
...
Fix #10847
2014-09-04 11:23:23 +02:00
8fec19a872
Merge pull request #10790 from cbhp/master
...
added missing User-Agents
2014-09-03 22:40:12 +02:00
91c8174013
Fix code with previous comments
2014-09-03 18:21:24 +02:00
883649b69c
Reset changes on 3rdparty submodule
2014-09-03 18:20:09 +02:00
c00450b2c7
always use a user-agent constant
...
Some providers block connections with missing user-agents. Also
user-agents are useful for analyzing requests. I've added a USER_AGENT
constant that is used in cURL and in file_get_contents.
2014-09-03 18:00:05 +02:00
63a90a129b
Use proper RNG generator
...
OC_Util::generateRandomBytes() only returns lowercase alphanumeric values.
We should use the new RNG which has a broader characterset.
2014-09-03 17:46:48 +02:00
26f337d523
Only return lowercase letters and digits for backwards compatbility
2014-09-03 17:18:00 +02:00
954925eaa0
Merge pull request #10667 from pmjdebruijn/itunes-appid
...
defaults: add customizable defaultiTunesAppId
2014-09-03 16:26:20 +02:00
eaab067716
env:UserInstallation was already there in master
...
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.
2014-09-03 16:08:40 +02:00
373d1c5e9f
Merge pull request #10642 from owncloud/securityutils
...
Add some security utilities
2014-09-03 15:28:42 +02:00
Bernhard Posselt
Jörn Friedrich Dreyer
Lukas Reschke
Jenkins for ownCloud
VicDeo
Vincent Petry
Bernhard Posselt
Robin Appelman
kondou
Jesus Macias Portela
chli1
Olivier Paroz
Joas Schilling
Jesus Macias
cbhp
Thomas Müller