Commit graph

10381 commits

Author SHA1 Message Date
Björn Schießle
7c360c2491 add post_moveToTrash and post_restore signals to the trash bin 2013-03-01 12:20:29 +01:00
Frank Karlitschek
09dc15d2b1 5.0 RC 1 2013-03-01 07:53:14 +01:00
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
Lukas Reschke
301d065686 Sed was wrong 2013-02-28 20:21:14 +01:00
Lukas Reschke
dee16deacd Merge master 2013-02-28 20:03:06 +01: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
Michael Gapczynski
b5989c933f Merge branch 'master' into shared-folder-etags
Conflicts:
	apps/files_sharing/lib/sharedstorage.php
2013-02-28 10:39:23 -05: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
Lukas Reschke
5f8bd07927 [Files] Use p() instead of echo 2013-02-27 23:40:30 +01:00
Lukas Reschke
b93ebe1860 Merge master 2013-02-27 23:36:52 +01:00
Lukas Reschke
7311c2bb5d Remove uneeded OAuth files 2013-02-27 23:26:00 +01:00
Lukas Reschke
39e28c0170 Typo... 2013-02-27 23:19:38 +01:00
Lukas Reschke
6f14bec70a Add a missing ) 2013-02-27 23:15:18 +01:00
Lukas Reschke
229c907a57 [core] From echo to p 2013-02-27 22:55:39 +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
Lukas Reschke
40e51d13d2 Remove uneeded file 2013-02-27 22:35:37 +01: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
Lukas Reschke
0b5b495535 [user_webdavauth] From echo to p 2013-02-27 22:06:50 +01:00
Lukas Reschke
df1d90433d [user_ldap] From echo to p 2013-02-27 22:04:57 +01:00
Lukas Reschke
fc5331eaec [files_versions] From echo to p 2013-02-27 21:50:22 +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
Lukas Reschke
3ba8881bac [files_trashbin] From echo to p 2013-02-27 21:46:37 +01:00
Lukas Reschke
c9415e6529 [files] Unescape file size 2013-02-27 21:40:06 +01:00
Bart Visscher
56f3917f36 Use the plain urlencoded path info for the routing matching 2013-02-27 21:38:58 +01:00
Lukas Reschke
221ecf63ab [files_sharing] From echo to p 2013-02-27 21:37:14 +01:00
Lukas Reschke
236507a19f [files_external] From echo to p 2013-02-27 21:31:27 +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
Lukas Reschke
7f8eddffe4 [files_encryption] Use p() instead of echo() 2013-02-27 21:20:37 +01:00
Lukas Reschke
85209287bb [Files] Use htmlspecialchars() 2013-02-27 21:19:11 +01:00
Lukas Reschke
4860d03270 [Files] Use p() instead of echo 2013-02-27 21:14:15 +01:00
Lukas Reschke
470fc3817f Remove the template autoescaping
Ref #1963
2013-02-27 20:53:52 +01: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