Tom Needham
|
370f202251
|
Rebase to current master
|
2013-03-05 00:25:56 +00:00 |
Jenkins for ownCloud
|
b738aaba2a
|
[tx-robot] updated from transifex
|
2013-03-04 00:07:35 +01: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 |
Michael Gapczynski
|
71bdccf347
|
Chunk size comment should say kB, not MB
|
2013-03-03 12:03:26 -05:00 |
Jenkins for ownCloud
|
844e18a8b1
|
[tx-robot] updated from transifex
|
2013-03-03 00:06:56 +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 |
Brice Maron
|
050de008b1
|
Avoid to display empty DisplayNames for menu and title
|
2013-03-02 16:09:36 +01: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 |
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 |
Jenkins for ownCloud
|
c9d9c381ec
|
[tx-robot] updated from transifex
|
2013-03-02 00:05:42 +01:00 |
Lukas Reschke
|
5e7970f761
|
Merge master
|
2013-03-01 23:11:03 +01: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 |
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 |
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 |
Lukas Reschke
|
93f15215c6
|
Check if requesttoken exists in session
Ref #1999
|
2013-03-01 14:59:51 +01:00 |
Lukas Reschke
|
630becb95f
|
Style fixes
|
2013-03-01 14:59:24 +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 |
Bart Visscher
|
84aa2c66d6
|
Merge pull request #1937 from owncloud/check-resharing
Check resharing setting
|
2013-02-28 11:39:11 -08: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 |
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
|
59835a9087
|
add checks for xml and dom when installing
|
2013-02-28 15:13:18 +01:00 |
Jenkins for ownCloud
|
a93b5b47a1
|
[tx-robot] updated from transifex
|
2013-02-28 00:05:40 +01:00 |
Lukas Reschke
|
b93ebe1860
|
Merge master
|
2013-02-27 23:36:52 +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 |
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 |
Lukas Reschke
|
470fc3817f
|
Remove the template autoescaping
Ref #1963
|
2013-02-27 20:53:52 +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 |
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 |
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 |
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 |
Bernhard Posselt
|
18b7a2bf21
|
add css and scripts before session init
|
2013-02-27 11:17:14 +01:00 |
Jenkins for ownCloud
|
348812f2ce
|
[tx-robot] updated from transifex
|
2013-02-27 00:09:33 +01:00 |
Arthur Schiwon
|
60d4fdda57
|
sort users according to display name
|
2013-02-26 22:56:55 +01:00 |
Robin Appelman
|
47b899e0c8
|
Disable prepared query caching while doing an upgrade
|
2013-02-26 22:41:48 +01:00 |
Bart Visscher
|
4a26d63867
|
Fix using wrong quotes for breaking long lines
Fixes #1925
|
2013-02-26 20:48:01 +01:00 |