Lukas Reschke
a34350c803
Merge pull request #3106 from IMM0rtalis/xframe_restriction_config
...
- xframe restriction configurable now
2013-04-24 08:02:12 -07:00
Robin Appelman
3d42d49d14
Add markdown to mimetype list
2013-04-24 16:54:34 +02:00
Morris Jobke
4660f194ea
Merge pull request #3109 from owncloud/fix-2928
...
fix wrong shared icon description
2013-04-24 07:47:14 -07:00
Lukas Reschke
4f96d7fb85
Allow loading of external media ressources
2013-04-24 16:45:51 +02:00
Daniel Molkentin
ff6fb0906b
Merge pull request #3100 from owncloud/ensure_index_php
...
Fix for #3049
2013-04-24 07:14:33 -07:00
Morris Jobke
637dd685db
fix wrong shared icon description
...
fix #2928
translation of string "Shared" has to be marked as located in "files" for the translation extractor
2013-04-24 16:13:17 +02:00
Frank Karlitschek
18debcf6a3
Merge pull request #3103 from owncloud/default-theme
...
check if there is a default/ folder in the theme directory if no theme e...
2013-04-24 07:08:57 -07:00
Robin Appelman
ab7fcebeb3
Files: fix the order fileactions are computed for a file
2013-04-24 15:26:36 +02:00
Daniel Molkentin
6ac2fdf44b
sync parameters in setup.php with the ones in the actual .htaccess
2013-04-24 15:11:58 +02:00
Daniel Molkentin
a86fe7920b
Try to prefer index.php over index.html in the same directory
...
Add JS redirect if that fails (HTTP-based redirects are disabled by
default in more recent Firefox versions).
2013-04-24 15:11:53 +02:00
Florian Scholz
03aa86d8a6
- xframe restriction configurable now
2013-04-24 14:45:40 +02:00
Bernhard Posselt
a8075943c3
use variable instead of relative path to file
2013-04-24 14:17:52 +02:00
kondou
6f5501bbc8
Fis syntax error and add user icon.
2013-04-24 14:17:13 +02:00
Bernhard Posselt
b98b56e4a8
check if there is a default/ folder in the theme directory if no theme exists
2013-04-24 13:45:40 +02:00
kondou
e15afcb011
Add space around checkboxes.
2013-04-24 11:58:12 +02:00
Morris Jobke
b1c9b296e8
Merge pull request #3089 from guruz/fix_ugly_config_writeability_error
...
Fix ugly error style on install
2013-04-24 02:24:23 -07:00
kondou
e8bb998ecc
Fix #3095 .
2013-04-24 11:13:12 +02:00
Jenkins for ownCloud
a7b4469b2e
[tx-robot] updated from transifex
2013-04-24 02:01:20 +02:00
David Reagan
4bee02f75c
Fixed comment in personal.js. Changed message text in changedisplayname.php.
2013-04-23 14:31:35 -07:00
Florin Peter
25ff32db6b
Added post proxy for getFileInfo.
...
This is needed for WebDAV and FileSize
@samtuke and @schiesbn you guys know a better solution?
2013-04-23 22:20:31 +02:00
David Reagan
7312cbec91
Made saving the display name work the same way as the email address. Fixed a few comparison operators. Increased the fadeOut time for the success and error messages.
2013-04-23 12:45:12 -07:00
Bernhard Posselt
9dde43db57
Merge pull request #3080 from owncloud/validate_redirect_mast
...
Disallow URLs containing a @
2013-04-23 12:21:39 -07:00
Florin Peter
f8819f54c2
Merge branch 'files_encryption' of https://github.com/owncloud/core into files_encryption
2013-04-23 19:09:01 +02:00
Florin Peter
baa6fd639f
improved file size handling
2013-04-23 19:08:52 +02:00
Frank Karlitschek
99cb37a6d1
Merge pull request #3092 from guruz/external_storage_check_for_curl
...
External Storage: Check for curl in PHP
2013-04-23 09:48:04 -07:00
Bart Visscher
c357f7b8cd
Merge pull request #3082 from owncloud/ldap_confcache_opt
...
LDAP: reset user/group-config association only after exists-check, may p...
2013-04-23 09:44:38 -07:00
Sam Tuke
b7d8da87d0
Development snapshot
...
working on stream handling (large files) in Util->encryptAll()
2013-04-23 18:41:01 +02:00
Morris Jobke
8fab7d5afb
fix syntax layout
2013-04-23 18:15:34 +02:00
Sam Tuke
c6bfc7315b
Stream writing improved: working with dolphin + kate, gedit & nautilus give errors, suspect those issues are clientside
...
.part file paths fixed in stream{}
2013-04-23 17:36:35 +02:00
Lukas Reschke
495868497c
Merge pull request #3077 from owncloud/rename-checksourcepath
...
Files: also check if the source path is valid when doing a rename or copy operation
2013-04-23 07:17:36 -07:00
Morris Jobke
e78a464002
remove log sort in admin section
...
doesn't work anymore, because now the datetime is saved as string (ref #2975 )
2013-04-23 14:56:33 +02:00
Morris Jobke
b9b2e0269a
fix logical issue while retrieving log via ajax
2013-04-23 14:40:21 +02:00
Sam Tuke
4aa80d02be
Merge branch 'master' into files_encryption
2013-04-23 14:13:40 +02:00
Sam Tuke
a1d241783e
Updated buglist
2013-04-23 14:12:28 +02:00
kondou
1e2efdddc9
Oneliners, <br>, proper errors & print_unescaped()
2013-04-23 12:38:25 +02:00
Markus Goetz
6141b24d96
External Storage: Check for curl in PHP
...
If no curl is found, disable the storage that needs it.
2013-04-23 12:36:30 +02:00
kondou
0d3afadab2
Don't split translation lines
2013-04-23 12:31:13 +02:00
kondou
06dfc95122
Fix syntax error.
2013-04-23 12:31:13 +02:00
kondou
f1bcf6ef02
Improve the password reset screen.
...
Fixing #2752
2013-04-23 12:31:13 +02:00
Markus Goetz
f1a63254fb
Fix ugly error style on install
...
By initializing the template engine first we can show the
'Can't write into config directory 'config'' error in a nice way instead
of plain unstyled HTML.
2013-04-23 11:06:28 +02:00
Jenkins for ownCloud
05ab9d2de7
[tx-robot] updated from transifex
2013-04-23 02:00:31 +02:00
Arthur Schiwon
b066c0ff44
LDAP: reset user/group-config association only after exists-check, may performance in some cases
2013-04-23 01:00:27 +02:00
Bernhard Posselt
edd37c779d
Merge pull request #3074 from owncloud/sqlite3-raiseerror
...
Fix raiseError call in the MDB2 sqlite3 driver
2013-04-22 14:34:09 -07:00
Lukas Reschke
6e78c4fcc0
Disallow URLs containing a @
2013-04-23 00:26:40 +03:00
Bernhard Posselt
4af4a5bd98
Merge pull request #3073 from owncloud/setup-error-message
...
Improve error message if user creation fails during setup
2013-04-22 13:28:18 -07:00
Bernhard Posselt
8b490e0ec3
Merge pull request #3078 from owncloud/files-dnd
...
Files: Fix XSS when creating dropshadow
2013-04-22 13:16:35 -07:00
Robin Appelman
1507d1ef26
Files: Fix XSS when creating dropshadow
2013-04-22 21:55:54 +02:00
Robin Appelman
3c90625ef1
Files: also check if the source path is valid when doing a rename or copy operation
2013-04-22 21:23:12 +02:00
Bart Visscher
2314067e75
Merge pull request #3019 from owncloud/fix-3004
...
Test if we want a 3rdparty style/script before checking the 3rdparty root
2013-04-22 20:46:13 +02:00
Robin Appelman
7c1a4d2f57
Fix raiseError call in the MDB2 sqlite3 driver
2013-04-22 20:34:00 +02:00