mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
20,309 Commits 349 Branches 696 Tags 1.6 GiB
Commit Graph

20309 Commits

Author SHA1 Message Date
Jenkins for ownCloud c119a9fd32 [tx-robot] updated from transifex 2014-09-10 01:54:54 -04:00
Lukas Reschke fa096217b1 Merge pull request #9512 from libasys/patch-2 
Fix use Sharing Api with calendar
 2014-09-09 23:58:24 +02:00
Lukas Reschke 01e1157a54 Merge pull request #10844 from owncloud/acceptance-enableapps 
Added acceptance tests for enabling apps
 2014-09-09 23:44:06 +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
Vincent Petry cd94b54be3 Merge pull request #10969 from owncloud/set-e 
terminate script execution in case of failure
 2014-09-09 20:08:48 +02:00
Bernhard Posselt 2a4201dbea Merge pull request #10964 from owncloud/static-array-functions 
More sugar for including lists of files in templates
 2014-09-09 18:56:48 +02:00
Thomas Müller 8196536309 terminate script execution in case of failure 2014-09-09 17:12:20 +02:00
Bernhard Posselt 023e066971 more sugar for including lists of templates 2014-09-09 15:47:42 +02:00
Lukas Reschke dc99fd768a Merge pull request #10948 from owncloud/fix-zindex 
fix z-index of header and dropdowns, fix user menu not showing on mobile
 2014-09-09 14:23:28 +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
Thomas Müller fd92fc7c47 Merge pull request #9753 from owncloud/filepath-css 
Remove special case for css in OC.filePath
 2014-09-09 13:59:19 +02:00
Lukas Reschke e3c99a8505 Add beforeeach and aftereach 2014-09-09 13:08:50 +02:00
Lukas Reschke cabd70148f Add unittest for filePath 2014-09-09 12:05:19 +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
Lukas Reschke e9a3b280c0 Merge pull request #10928 from owncloud/allow_dot_in_dbname_on_web_install 
allow . in dbname on web install
 2014-09-09 09:36:16 +02:00
Jenkins for ownCloud 317e6d03b4 [tx-robot] updated from transifex 2014-09-09 01:55:47 -04:00
VicDeo ae7f632a1a Merge pull request #10863 from owncloud/removeWarningWhenCheckIsDisabled 
Add new check_for_working_internet configuration switch
 2014-09-09 01:50:33 +03: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
Vincent Petry 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
Jan-Christoph Borchardt 71e10b66d9 Merge pull request #10944 from owncloud/fix-nojavascript-style 
fix no-JS message, and add it to log in and shared as well cause they don’t work without JS
 2014-09-08 21:58:54 +02: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
Jan-Christoph Borchardt dc5db3dd90 fix z-index of header and dropdowns, fix user menu not showing on mobile 2014-09-08 21:37:17 +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
Jan-Christoph Borchardt bd56619e7a also add no-JavaScript notice to log in and sharing pages because they do not work without JS either 2014-09-08 18:07:20 +02:00
Jan-Christoph Borchardt 3db2b11435 fix styling and wording of no-JavaScript message 2014-09-08 17:55:53 +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 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
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
Robin Appelman 644755df66 Use bigger transactions when doing explicit file system scans 2014-09-08 14:15:41 +02:00
Jörn Friedrich Dreyer d12a74e299 allow . in dbname on web install 2014-09-08 13:41:23 +02:00
Jörn Friedrich Dreyer c362c78d76 make objectstore tests check fileid on rename 2014-09-08 12:53:52 +02:00
Vincent Petry 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