wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
20266 commits 157 branches 562 tags 714 MiB
Commit graph

20266 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
ffee4da397 Merge pull request #10740 from owncloud/fix-everyone-group-count 
Using countUsers method to return true count of users
 2014-09-08 18:29:11 +02:00
Lukas Reschke
0ec9c2ccf8 Merge pull request #10885 from owncloud/swift-hasupdated 
Fix hasUpdated for folders in openstack swift
 2014-09-08 18:19:59 +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
a92d6f3c50 Merge pull request #10930 from owncloud/use-admincheck 
Check for admin user instead of subadmin
 2014-09-08 17:25:30 +02:00
Volkan Gezer
053c879723 Merge pull request #10451 from k4k/login_logo_alignment_fix 
improve logo flexibility to fix wide custom logo alignment, fix #9339
 2014-09-08 17:21:33 +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
bca57b4b28 Merge pull request #10890 from owncloud/fix-10888 
if only one attribute is requested, the returned array has 0 as key inst...
 2014-09-08 16:39:48 +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
Clark Tomlinson
b8266a07b7 Merge pull request #10935 from owncloud/who_knows_what_horrors_lie_in_the_dark_of_unicode 
w͢͢͝h͡o͢͡ ̸͢k̵͟n̴͘ǫw̸̛s͘ ̀́w͘͢ḩ̵a҉̡͢t ̧̕h́o̵r͏̵rors̡ ̶͡͠lį̶e͟͟ ̶͝in͢ ͏t̕h̷̡͟e ͟͟d̛a͜r̕͡k̢̨ ͡h̴e͏a̷̢̡rt́͏ ̴̷͠ò̵̶f̸ u̧͘ní̛͜c͢͏o̷͏d̸͢e̡͝
 2014-09-08 10:30:09 -04: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
Jörn Friedrich Dreyer
5943b7ac0d w͢͢͝h͡o͢͡ ̸͢k̵͟n̴͘ǫw̸̛s͘ ̀́w͘͢ḩ̵a҉̡͢t ̧̕h́o̵r͏̵rors̡ ̶͡͠lį̶e͟͟ ̶͝in͢ ͏t̕h̷̡͟e ͟͟d̛a͜r̕͡k̢̨ ͡h̴e͏a̷̢̡rt́͏ ̴̷͠ò̵̶f̸ u̧͘ní̛͜c͢͏o̷͏d̸͢e̡͝ 2014-09-08 15:26:41 +02:00
Vincent Petry
bd63f475bc Merge pull request #10891 from owncloud/files-moveoperationcatchexception 
Catch exceptions when moving files
 2014-09-08 15:09:02 +02:00
Lukas Reschke
67b2957bf9 Check for admin user instead of subadmin 2014-09-08 14:34:44 +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
Jenkins for ownCloud
9fc45016f9 [tx-robot] updated from transifex 2014-09-07 01:54:42 -04:00
Bernhard Posselt
7e4d244200 add shortcut functions for style and script 2014-09-06 14:25:28 +02:00
Jenkins for ownCloud
6ca2ba6fde [tx-robot] updated from transifex 2014-09-06 01:55:03 -04:00
Lukas Reschke
f5951b2254 Merge pull request #10889 from owncloud/moveTrustedDomainCheck 
Move trusted domain check to init()
 2014-09-05 17:39:37 +02:00
Vincent Petry
d15c3e4030 Merge pull request #10145 from owncloud/cache-updater-refactor 
Refactor cache updater to work outside of the users home
 2014-09-05 17:30:19 +02:00
Clark Tomlinson
6a56e03d48 Using countUsers method to return true count of users 2014-09-05 11:23:59 -04:00
Clark Tomlinson
50993c1a05 Merge pull request #10860 from owncloud/scrolltofix 
Scroll to file on search or add
 2014-09-05 10:35:59 -04:00
Vincent Petry
e43c9b84c4 Catch exceptions when moving files 
When moving files on storages that don't expose permissions, the storage
itself might throw an exception when the permission is denied.

This fix ensures that exceptions are caught and forwarded to the client
instead of just hanging.
 2014-09-05 14:54:06 +02:00
Lukas Reschke
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
Arthur Schiwon
3c9668f605 if only one attribute is requested, the returned array has 0 as key instead of attribute name. fixes #10888 2014-09-05 14:05:37 +02:00
Robin Appelman
a1f4a0601b Fix hasUpdated for folders in swift backend 2014-09-05 13:23:10 +02:00
Robin Appelman
3d7aff84e5 Fix configuration of rackspace 2014-09-05 13:22:35 +02:00
Vincent Petry
5913a694de Merge pull request #10870 from owncloud/dnd-droponreadonlyfolderfix 
Added permission check for drag and drop
 2014-09-05 12:20:48 +02:00
Robin Appelman
e29b7e9335 Remove explicit propagate calls 2014-09-05 11:53:24 +02:00
Robin Appelman
58a1540587 remove unstable test 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
3d92f963f4 Fix unit test 2014-09-05 11:53:23 +02:00
Robin Appelman
65d24c3cd5 Improve unit tests for Cache\Updater 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
Jesus Macias Portela
614cf996ca Merge pull request #10871 from owncloud/issue_10674 
Fix 3rdparty pointer
 2014-09-05 09:03:07 +02:00
Jenkins for ownCloud
0736a6695e [tx-robot] updated from transifex 2014-09-05 01:54:39 -04:00
Jesus Macias
096991e208 Fix 3rdparty pointer 2014-09-04 21:34:56 +02:00
kondou
ecc9b42e41 Match \OC_Helper::linkToPublic() to new links and fit unittests 2014-09-04 20:44:50 +02:00
Vincent Petry
f1bfe35cda Added permission check for drag and drop 
When dropping files onto a read-only folder, a notification
is now shown instead of attempting to upload.

This for both the drag for upload and drag from inside the file list
cases.
 2014-09-04 20:18:24 +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