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

10208 Commits

Author SHA1 Message Date
Bernhard Posselt 841daf4845 Merge pull request #2062 from owncloud/shareType 
Sanitize shareWith
 2013-03-03 16:27:51 -08:00
Lukas Reschke 577945bd33 Sanitize shareWith 2013-03-04 00:54:21 +01:00
Jenkins for ownCloud b738aaba2a [tx-robot] updated from transifex 2013-03-04 00:07:35 +01:00
Frank Karlitschek ef01e0cdc5 Merge pull request #2057 from owncloud/upgrade-fixes 
Upgrade fixes
 2013-03-03 14:38:50 -08:00
Frank Karlitschek d8d14637f3 Merge pull request #2058 from owncloud/fix-getlog 
Fix encoding settings ajax getlog
 2013-03-03 14:38:32 -08:00
Bart Visscher d800f35bf4 Disable loading of backgroundjobs js when upgrade is needed 2013-03-03 23:15:22 +01:00
Bart Visscher a2d6b27170 Check maintenance mode before loading apps in route matcher 2013-03-03 23:15:18 +01:00
Bart Visscher 376f350af2 Fix encoding settings ajax getlog 2013-03-03 23:14:36 +01:00
Michael Gapczynski 0488968443 Merge pull request #2034 from owncloud/fix_bug47 
Fix #47 - Duplicate files create a (2) when multiples are uploaded
 2013-03-03 11:49:04 -08:00
Bernhard Posselt 3021d9b146 Merge pull request #2050 from owncloud/fix-readfile-comment 
Chunk size comment should say kB, not MB
 2013-03-03 09:22:49 -08:00
Michael Gapczynski 71bdccf347 Chunk size comment should say kB, not MB 2013-03-03 12:03:26 -05:00
Frank Karlitschek d8655a4248 Merge pull request #2046 from owncloud/add_ie_css_switch 
add ie css switch to layout templates
 2013-03-03 05:24:01 -08:00
Jörn Friedrich Dreyer 9cb5bf0a28 add ie css switch to layout templates 2013-03-03 13:57:20 +01:00
Jenkins for ownCloud 844e18a8b1 [tx-robot] updated from transifex 2013-03-03 00:06:56 +01:00
Lukas Reschke b900d0987e Add link to installation instructions 2013-03-02 22:25:24 +01:00
Frank Karlitschek 927a374dbe Merge pull request #2036 from owncloud/escape-only-in-template 
Escape the data only in the template
 2013-03-02 11:35:37 -08:00
Lukas Reschke 3e3c039292 Escape the data only in the template 2013-03-02 20:21:51 +01:00
Georg Ehrke 620ddd3baa new Array() -> [] 2013-03-02 19:24:37 +01:00
Georg Ehrke 22424e8abc update OC.Notification.show 2013-03-02 17:36:04 +01:00
Bernhard Posselt c8cdc741fd Merge pull request #2033 from eMerzh/fix_ldap_quoting 
Fix quoting of query for user_ldap ref #1983
 2013-03-02 07:45:09 -08:00
eMerzh 37295deeb7 Merge pull request #2031 from eMerzh/fix_empty_display_name 
Avoid to display empty DisplayNames for menu and title
 2013-03-02 07:42:11 -08:00
Brice Maron dbb9b68331 Fix quoting of query for user_ldap ref #1983 2013-03-02 16:26:15 +01:00
Brice Maron 050de008b1 Avoid to display empty DisplayNames for menu and title 2013-03-02 16:09:36 +01:00
Lukas Reschke d3e88e6a8c Remove uneeded sanitizeHTML 2013-03-02 12:44:53 +01:00
Frank Karlitschek b759c616b4 Merge pull request #2021 from owncloud/fix-csp-docu 
Remove uneeded \ since we're using "
 2013-03-02 03:02:00 -08:00
Lukas Reschke 5a9e9e0b51 Merge pull request #2026 from j-ed/master 
do not try to extract image infos from 0- or better less than 12-byte length files.
 2013-03-02 02:59:00 -08:00
Thomas Müller 4c8c974740 Merge pull request #2020 from owncloud/fixing-bugtracker-link-master 
change bug tracker links to https://github.com/owncloud/core/blob/master...
 2013-03-02 02:16:45 -08:00
j-ed 07b956c22d Update image.php 
don't try to extract image infos from 0- or better less than 12 byte length files. See description of `exif_imagetype` function at
`http://php.net/manual/de/function.exif-imagetype.php`.
 2013-03-02 10:51:49 +01:00
Thomas Müller 2af3bc3e77 Merge pull request #2022 from owncloud/fix-notice 
Fix notice
 2013-03-01 23:39:27 -08:00
Lukas Reschke 630483c75d Fix notice 2013-03-02 00:53:53 +01:00
Jenkins for ownCloud c9d9c381ec [tx-robot] updated from transifex 2013-03-02 00:05:42 +01:00
Lukas Reschke 50460d9032 Remove uneeded \ since we're using " 2013-03-02 00:04:44 +01:00
Bart Visscher f21ecef0b4 Merge pull request #2019 from owncloud/fixing-languages-again-master 
some more new languages recently introduced to ownCloud
 2013-03-01 14:55:27 -08:00
Lukas Reschke fadb11253b Merge branch 'master' into fixing-bugtracker-link-master 
Conflicts:
	core/templates/exception.php
	settings/templates/help.php
 2013-03-01 23:41:23 +01:00
Thomas Mueller f9b454dab1 change bug tracker links to https://github.com/owncloud/core/blob/master/CONTRIBUTING.md 2013-03-01 23:32:43 +01:00
Lukas Reschke 8e5bbace71 Merge pull request #1976 from owncloud/from-insane-autoescape-to-p 
Replace insane auto sanitization with p()
 2013-03-01 14:31:06 -08:00
Thomas Mueller 6708dd80cd some more new languages recently introduced to ownCloud 2013-03-01 23:28:54 +01:00
Lukas Reschke 73c84e4a0f Merge master 2013-03-01 23:11:26 +01:00
Lukas Reschke 5e7970f761 Merge master 2013-03-01 23:11:03 +01:00
Thomas Mueller 4b9863fa7d Merge branch 'master' into from-insane-autoescape-to-p 
Conflicts:
	apps/files/templates/index.php
 2013-03-01 23:09:20 +01:00
Lukas Reschke 31754a653b Merge pull request #2016 from owncloud/fixing-1844-master 
validate the generated email address and fall back to localhost.localdom...
 2013-03-01 14:00:30 -08:00
Thomas Mueller 6c304fa5c0 validate the generated email address and fall back to localhost.localdomain in case it is not valid 
fixes #1844
 2013-03-01 22:24:19 +01:00
Bernhard Posselt 5036e316a6 Merge pull request #2015 from owncloud/fixing-2001-master 
in case the user has no permissions to upload/create files...
 2013-03-01 12:52:36 -08:00
Thomas Mueller e3e4c28316 fixes #2001 - in case the user has no permissions to upload/create files/folders a clear warning is displayed 2013-03-01 21:43:34 +01:00
Bernhard Posselt 7f7f447ab0 Merge pull request #2014 from owncloud/fixing-1909-master 
for this self test we don't care if the ssl certificate is self signed a...
 2013-03-01 12:42:52 -08:00
Thomas Mueller 39b9ed50d7 for this self test we don't care if the ssl certificate is self signed and the peer cannot be verified. 2013-03-01 20:34:16 +01:00
Bernhard Posselt 2e2cf28d30 Merge pull request #2005 from owncloud/trash_add_signals 
add post_moveToTrash and post_restore signals to the trash bin
 2013-03-01 09:41:07 -08:00
Bernhard Posselt 87c8fff2d2 Merge pull request #2007 from owncloud/fix_1834_master 
make sure that the version app always works on the users real home folder [master]
 2013-03-01 09:40:37 -08:00
Georg Ehrke ff9476b3e3 fix oc#47 2013-03-01 18:30:25 +01:00
Frank Karlitschek f7cb53b103 Merge pull request #2008 from owncloud/1999-requesttoken 
Check if requesttoken exists in session
 2013-03-01 06:12:09 -08:00