Commit graph

10131 commits

Author SHA1 Message Date
Jenkins for ownCloud
d20fd7e9a6 [tx-robot] updated from transifex 2013-03-01 00:07:02 +01:00
Lukas Reschke
416607e559 Merge pull request #1979 from maelzx/patch-2
Fix window.location mistakes in previous code
2013-02-28 12:53:15 -08:00
Lukas Reschke
040076ffc2 Merge pull request #1992 from owncloud/fix-heartbeat
The router base url is without / on the end
2013-02-28 12:50:56 -08:00
Bart Visscher
84aa2c66d6 Merge pull request #1937 from owncloud/check-resharing
Check resharing setting
2013-02-28 11:39:11 -08:00
icewind1991
a86761e1e7 Merge pull request #1988 from owncloud/permissionscache_clean
Clean permissions cache when deleting file
2013-02-28 10:24:20 -08:00
Bart Visscher
294403fa99 The router base url is without / on the end 2013-02-28 18:02:26 +01:00
Björn Schießle
1cc7e6d31a Merge pull request #1989 from owncloud/selectSanitize
Sanitize HTML in html_select_options
2013-02-28 08:51:07 -08:00
Lukas Reschke
cef6131ea8 Sanitize HTML in html_select_options 2013-02-28 17:19:04 +01:00
Robin Appelman
ee1eb98d4a Cache: cleanup permissions cache when removing a file from the cache 2013-02-28 17:04:50 +01:00
Robin Appelman
f7a43391a7 Cache: add option to delete file from permissions cache for all users 2013-02-28 17:04:34 +01:00
Bernhard Posselt
93e713d378 Merge pull request #1987 from owncloud/fixinstalldeps
add checks for xml and dom when installing
2013-02-28 06:36:19 -08:00
Bernhard Posselt
59835a9087 add checks for xml and dom when installing 2013-02-28 15:13:18 +01:00
Jan-Christoph Borchardt
6d4b344f5d Merge pull request #1397 from owncloud/trash_fileactions
Enable fileactions while viewing trash
2013-02-28 05:43:51 -08:00
Robin Appelman
12fd47af39 Trash: fix opening folders 2013-02-28 13:32:08 +01:00
Bernhard Posselt
4223e99629 Merge pull request #1985 from owncloud/sharing-more
up limit of share dropdown from 4 to 15, scrollbar after 4 1/2 entries, fix #135
2013-02-28 03:44:51 -08:00
Jan-Christoph Borchardt
fbb989f548 up limit of share dropdown from 4 to 15, scrollbar after 4 1/2 entries, fix #135 2013-02-28 12:07:56 +01:00
maelzx
a319fa8d47 Fix window.location mistakes in previous code
Sorry guys, I commit the incomplete code. It should be window.location.assign(url);

However this is just tested in google chrome.
2013-02-28 11:26:42 +08:00
Jan-Christoph Borchardt
a2147c4f89 Merge pull request #1973 from owncloud/share-improvements
reduce minimum length for username suggestions in share dialog, fix #1666
2013-02-27 15:07:07 -08:00
Jenkins for ownCloud
a93b5b47a1 [tx-robot] updated from transifex 2013-02-28 00:05:40 +01:00
Bernhard Posselt
2f036bcc54 Merge pull request #1972 from owncloud/raw-pathinfo
Use the plain urlencoded path info for the routing matching
2013-02-27 13:43:47 -08:00
Bernhard Posselt
8a0d786d66 Merge pull request #1945 from owncloud/sqlite-query-cache
Disable query cache for Sqlite
2013-02-27 13:34:09 -08:00
Bart Visscher
d7528f06df Disable query cache for Sqlite 2013-02-27 22:32:39 +01:00
Bernhard Posselt
9508a58c79 Merge pull request #1944 from owncloud/query-caching-upgrade
Disable prepared query caching while doing an upgrade
2013-02-27 12:48:42 -08:00
Bart Visscher
56f3917f36 Use the plain urlencoded path info for the routing matching 2013-02-27 21:38:58 +01:00
icewind1991
a8bab023b2 Merge pull request #1969 from j-ed/master
OC5 beta 2 - prevent multiple slashes in a row when building URLs.
2013-02-27 12:29:39 -08:00
Robin Appelman
923c51773a Trash: disable text editor from trash for now 2013-02-27 20:37:50 +01:00
Robin Appelman
f497970e30 Trash: fix download.php 2013-02-27 20:31:21 +01:00
Robin Appelman
d2fe600789 Trash: fix trash when default quota is used 2013-02-27 20:29:49 +01:00
Robin Appelman
429bf42e98 Merge master into trash_fileactions 2013-02-27 20:29:19 +01:00
j-ed
1f9551a382 Update apps/files/templates/part.list.php
prevent multiple slashes in a row when building URLs.
2013-02-27 19:09:37 +01:00
Michael Gapczynski
766a301a6b Merge pull request #1031 from owncloud/external_storage_ui_feedback
External Storage UI Improvements
2013-02-27 10:00:22 -08:00
Thomas Müller
f0a4506e40 Merge pull request #1967 from eMerzh/refix_1931
Refix #1931
2013-02-27 09:08:00 -08:00
Jan-Christoph Borchardt
e01ab04d2b reduce minimum length for username suggestions in share dialog, fix #1666 2013-02-27 17:57:53 +01:00
Brice Maron
6c26214955 Refix #1931 2013-02-27 17:51:28 +01:00
Frank Karlitschek
fed39d0db2 Merge pull request #1964 from owncloud/versions_cleanup
Versions cleanup
2013-02-27 07:12:50 -08:00
Bernhard Posselt
5fd8d155fd Merge pull request #1962 from owncloud/big_upload_fix
timeout after a longer time
2013-02-27 07:05:19 -08:00
Björn Schießle
f8bcd38d4d remove admin settings from app.php 2013-02-27 15:53:08 +01:00
Björn Schießle
6cf147003f Merge branch 'master' into versions_cleanup 2013-02-27 15:50:08 +01:00
Björn Schießle
9b220d0b93 rename History to Versions 2013-02-27 15:46:49 +01:00
Björn Schießle
d9e75c2b92 remove admin settings for versions 2013-02-27 15:44:02 +01:00
Bernhard Posselt
888e4f21d2 timeout after a longer time 2013-02-27 15:44:00 +01:00
Jenkins for ownCloud
fd654e9c2f [tx-robot] updated from transifex 2013-02-27 14:37:12 +01:00
Bart Visscher
3a7322342e Merge pull request #1956 from owncloud/session-error-format
add styles before session init
2013-02-27 05:21:17 -08:00
Bart Visscher
a708b63402 Merge pull request #1961 from owncloud/trans_fix
fixed bug that would cause a failure because of undefined variable  inst...
2013-02-27 05:17:30 -08:00
Bernhard Posselt
49a0f42e3b fixed bug that would cause a failure because of undefined variable instead of %s in a translation string 2013-02-27 14:13:07 +01:00
Frank Karlitschek
49f2a2d25d Merge pull request #1953 from owncloud/escape_regular_expressions
escape regular expressions; fix typo in variable name
2013-02-27 04:29:17 -08:00
Bernhard Posselt
a09076c3ac Merge pull request #1955 from owncloud/login-button-alignment
quick fix for log in button not being aligned with input fields
2013-02-27 04:05:47 -08:00
Björn Schießle
f69fa2726c Merge pull request #1958 from owncloud/fixing-1933-master
the locale name is no longer part of the translation string
2013-02-27 03:15:03 -08:00
Bernhard Posselt
0828bb7e0e Merge pull request #1957 from owncloud/fix-895
Fix 895
2013-02-27 03:10:29 -08:00
Thomas Mueller
c71fdf04d7 fixes 1933 - the locale name is no longer part of the translation string 2013-02-27 11:41:50 +01:00