Commit graph

10379 commits

Author SHA1 Message Date
Frank Karlitschek
36a1bcb732 Merge pull request #2061 from owncloud/app-text
Add the description as text and not as html
2013-03-04 00:01:26 -08:00
Frank Karlitschek
d70912e72b Merge pull request #2060 from owncloud/escapeGroupname
Sanitize uid, group and quota
2013-03-04 00:00:47 -08:00
Frank Karlitschek
17f7bd4c14 Merge pull request #2059 from owncloud/getlog
Add log as text and not as HTML
2013-03-04 00:00:04 -08:00
raghunayyar
d3ddf03687 Datepicker height fixed.
New id defined for files table for positioning.
2013-03-04 09:21:38 +05:30
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
Lukas Reschke
0252479e3e Add the description as text and not as html 2013-03-04 00:19:07 +01:00
Lukas Reschke
86a7202cda Sanitize uid, group and quota 2013-03-04 00:11:46 +01:00
Jenkins for ownCloud
b738aaba2a [tx-robot] updated from transifex 2013-03-04 00:07:35 +01:00
Lukas Reschke
962b7a7c80 Add log as text and not as HTML 2013-03-03 23:46:08 +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
Jörn Friedrich Dreyer
f4411b0243 durhurrrhurrr 2013-03-03 13:01:25 +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
Michael Gapczynski
e466d680fe Fix variable name in Shared_Updater 2013-03-02 13:11:57 -05:00
Michael Gapczynski
9b4d7d9925 Update ETag when file is shared 2013-03-02 12:57:29 -05: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
Frank Karlitschek
2b7ff7273d ownCloud 5 RC2 2013-03-02 04:06:27 +01:00
Jenkins for ownCloud
6c96b93fd4 [tx-robot] updated from transifex 2013-03-05 00:19:07 +01:00
Michael Gapczynski
db23c885d9 Merge pull request #2096 from owncloud/cache-upgrade-id
Cache: also check if the file id is already in the cache during upgrade
2013-03-04 14:55:20 -08:00
Robin Appelman
9d9acf24de Cache: more efficient detection for existing entries during upgrade 2013-03-04 23:19:55 +01:00
Lukas Reschke
76e6369ec1 Merge pull request #2077 from owncloud/oc_filepicker_inline_js
Remove inline js from OC.Dialogs.FilePicker.
2013-03-04 13:49:52 -08:00
Lukas Reschke
fdb37d191b Merge pull request #2092 from owncloud/infieldlabels-placeholder
explicitly add empty placeholder to inputs which use infield labels
2013-03-04 13:31:21 -08:00
Robin Appelman
56ae4bb6e9 Cache: also check if the file id is already in the cache during upgrade
Should solve upgrade issues if only some of the configured storages were migrated previously
2013-03-04 22:26:03 +01:00
Frank Karlitschek
33c62bf110 Merge pull request #2090 from owncloud/fixing-2089-master
fixes #2089
2013-03-04 13:17:35 -08:00
Jan-Christoph Borchardt
07dee24cb2 explicitly add empty placeholder to inputs which use infield labels, fix #2049 2013-03-04 22:11:57 +01:00
Bernhard Posselt
10b108ed8a Merge pull request #2030 from j-ed/master
suppress log messages like `include path for class ... starts with "apps/"`
2013-03-04 12:59:39 -08:00
Bernhard Posselt
62dde34887 Merge pull request #2088 from owncloud/fixing-1844-again-master
adding test case for getDefaultEmailAddress() + fixing #1844 again
2013-03-04 12:52:35 -08:00