Commit graph

10993 commits

Author SHA1 Message Date
Bart Visscher
f5b0d904fb web_server_restart needs to be true to display the hint 2013-04-26 16:21:56 +02:00
icewind1991
5474fea1f6 Merge pull request #3136 from owncloud/mount-cleanup
Separation of mount management
2013-04-26 06:55:21 -07:00
Bart Visscher
d825669265 Merge pull request #3002 from owncloud/priorize_common_languages
Priorize common languages.
2013-04-26 06:30:59 -07:00
Bart Visscher
686f836736 Merge pull request #3026 from owncloud/cli-no-session
Don't start the session when in cli mode
2013-04-26 06:20:39 -07:00
Bart Visscher
948e3d5b7c Merge pull request #3028 from owncloud/simplyfy-resource-locating
Simplify resource locating in templatelayout
2013-04-26 05:56:09 -07:00
Robin Appelman
172499d5f3 Don't start the session when in cli mode 2013-04-26 14:53:59 +02:00
Bart Visscher
7e89a017bf Merge pull request #2955 from owncloud/displaynames-numeric
Fix OC_User::getDisplaynames when using numeric user id's
2013-04-26 05:51:07 -07:00
Bart Visscher
67b6ee661d Merge pull request #2783 from Kondou-ger/improve_passwordresetscreen
Improve the password reset screen.
2013-04-26 05:33:09 -07:00
Bart Visscher
b46f6e4f97 Simplify app js locating for layout pages 2013-04-26 14:21:51 +02:00
Bart Visscher
ea4ae857a1 Simplify app css locating for layout pages 2013-04-26 14:21:50 +02:00
Bart Visscher
710acde9a1 Merge pull request #1872 from herbrechtsmeier/forcessl-with-ssl-proxy
Overwrite host and webroot when forcessl is enabled
2013-04-26 05:10:49 -07:00
Bart Visscher
26e2672a5a Merge pull request #2787 from owncloud/fix-password-autocomplete-2632
turn off autocompletion for password field
2013-04-26 01:59:20 -07:00
Jenkins for ownCloud
d6978d0c45 [tx-robot] updated from transifex 2013-04-26 10:06:52 +02:00
Thomas Mueller
9fe3022c93 adding resource type 2013-04-26 09:59:00 +02:00
Jenkins for ownCloud
7ea2f785f4 [tx-robot] updated from transifex 2013-04-26 01:58:21 +02:00
Robin Appelman
809b5f81f6 Further seperation of mount management logic 2013-04-26 00:01:36 +02:00
Robin Appelman
bcd9a69033 Cache: seperate handing of numeric storage id's to it's own class 2013-04-26 00:00:18 +02:00
Morris Jobke
e6f84397aa Merge pull request #3098 from jerrac/displaynamesaveontimeout
On the Personal Settings page, made the display name save like the email address saves
2013-04-25 14:10:16 -07:00
icewind1991
80e91e1ac6 Merge pull request #3132 from owncloud/mount-setupfs
Make sure the filesystem is initialized when searching for mounts
2013-04-25 08:07:07 -07:00
Robin Appelman
cea56df59e Have the filecache updater testcase clean the filesystem properly 2013-04-25 16:56:48 +02:00
Robin Appelman
31d7f4df2a Make sure the filesystem is initialized when searching for mounts 2013-04-25 16:11:48 +02:00
Lukas Reschke
632221bed0 Correct the parameter description
Thanks @kabum
2013-04-25 14:27:08 +03:00
Lukas Reschke
2d4af5dfca Correct function description
$password is not supported
2013-04-25 14:20:32 +03:00
Thomas Tanghus
2397772847 Merge pull request #3126 from owncloud/json-utf8
use utf-8 encoding for json
2013-04-25 03:18:52 -07:00
Bernhard Posselt
c9c1e483c5 use utf-8 encoding for json 2013-04-25 11:36:41 +02:00
Bart Visscher
63b2699720 Merge pull request #3094 from owncloud/log-ajax
fix logical issue while retrieving log via ajax
2013-04-25 01:21:59 -07:00
Tom Needham
b3e7485612 Correct the api response when both a shipped app and/or a third party app fail 2013-04-25 01:08:11 +01:00
Jenkins for ownCloud
a0df5903b0 [tx-robot] updated from transifex 2013-04-25 01:55:56 +02:00
Thomas Tanghus
c84281990c Merge pull request #2993 from owncloud/resolve_apps_lib_path
Let autoloader resolve paths under apps lib directory.
2013-04-24 13:33:05 -07:00
Lukas Reschke
b6fee2d257 Remove uneeded link 2013-04-24 22:39:04 +03:00
raghunayyar
175fc0c737 Clubbing Exact styles together. 2013-04-24 23:47:39 +05:30
Lukas Reschke
1ee224d8cb Merge pull request #3108 from owncloud/fileactions-order
Files: fix the order fileactions are computed for a file
2013-04-24 10:55:38 -07:00
Lukas Reschke
d41b600725 Add an update notification on every page for admin users 2013-04-24 18:47:38 +02:00
Raghu Nayyar
063e1238bf Merge pull request #3096 from owncloud/add_missing_space_for_new_groups
Fixing #3095
2013-04-24 09:33:37 -07:00
Jenkins for ownCloud
62b9c88bb9 [tx-robot] updated from transifex 2013-04-24 18:31:36 +02:00
Jenkins for ownCloud
88fd3b088d [tx-robot] updated from transifex 2013-04-24 17:46:20 +02:00
icewind1991
dd1c876009 Merge pull request #3112 from owncloud/markdown-mimetype
Add markdown to mimetype list
2013-04-24 08:18:10 -07:00
icewind1991
3b576c5f77 Merge pull request #3111 from owncloud/csp-audio
Allow loading of external media ressources
2013-04-24 08:17:42 -07:00
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