Commit Graph

10279 Commits

Author SHA1 Message Date
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
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
Bernhard Posselt a54be4acc4 Merge pull request #1948 from owncloud/improve_user_sorting
Sort after display name + LDAP server side sorting
2013-02-27 02:39:22 -08:00
Bernhard Posselt a1afc2e34f only add style.css to initsession 2013-02-27 11:36:05 +01:00