wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
10941 commits 157 branches 562 tags 714 MiB
Commit graph

3596 commits

Author SHA1 Message Date
Bart Visscher
dcbbca1f89 Merge pull request #2972 from AndreasErgenzinger/master 
Translations for themes
 2013-05-03 05:41:28 -07:00
Bart Visscher
05a0b4533b Merge pull request #2491 from riso/xsendfile_fix_zip 
improved handling of xsendfile zip generation race condition
 2013-05-03 05:37:01 -07:00
Tom Needham
cb5a69dd22 Merge pull request #3216 from owncloud/fix-api-3rdparty 
fix bug that would only return error responses for 3rdparty apps
 2013-05-02 15:40:10 -07:00
Thomas Müller
444a209a2a Merge pull request #3183 from miicha/patch-1 
fixing mimetype for "new" ms office formats
 2013-05-02 15:39:10 -07:00
Bernhard Posselt
11afb2e5a8 respect format output 2013-05-02 14:51:53 +02:00
Bernhard Posselt
0f38e6ec9c logout before output to not run into header already sent problems 2013-05-02 14:49:05 +02:00
Bernhard Posselt
ed0c23a9cc fix bug that would only return error responses for 3rdparty apps 2013-05-02 14:36:16 +02:00
joel hansson
7f58b0ef7c typo fix in a comment. 2013-05-01 12:29:15 +03:00
FlorinPeter
b464970142 Merge pull request #3169 from owncloud/fix_infinite_loop_for_file_cache 
fix for infinite loop causing on files_encryption branch when testing
 2013-04-29 17:05:41 -07:00
Jenkins for ownCloud
5764bf088e [tx-robot] updated from transifex 2013-04-30 01:59:18 +02:00
miicha
fbf9233648 fixing mimetype for "new" ms office formats 
right mime types for docx, pptx and xlsx
with the old mimetype I got a warning message from office everytime I opend such a file (it was downloaded as "filename.docx.doc")
 2013-04-30 02:38:05 +03:00
Florin Peter
f55aaad858 fix for infinite loop causing on files_encryption branch when testing "apps/files_encryption/test/crypt.php" on Method testSymmetricStreamEncryptShortFileContent 2013-04-29 15:43:48 +02:00
Frank Karlitschek
1f194b7bdc Merge pull request #3154 from owncloud/fix_3153 
Change app identifier for core api routes
 2013-04-28 03:51:21 -07:00
Jenkins for ownCloud
901e0c598d [tx-robot] updated from transifex 2013-04-28 02:01:38 +02:00
Lukas Reschke
51a1f41225 Merge pull request #3121 from owncloud/ocs_fix_api_response 
Fix the api response when a shipped and third party app both fail.
 2013-04-27 10:05:06 -07:00
Tom Needham
d33f6b9af6 Use correct variable when checking auth 2013-04-27 17:45:23 +01:00
Morris Jobke
0e5eccbdbc Merge pull request #3146 from owncloud/restart-hint 
web_server_restart needs to be true to display the hint
 2013-04-27 08:19:08 -07:00
Morris Jobke
86455d6ac3 Merge pull request #3145 from owncloud/magic_quotes_gpc-check 
Add check for Magic Quotes
 2013-04-27 08:14:40 -07:00
Raghu Nayyar
2bcb64e781 Merge pull request #3114 from owncloud/update-notification 
Add an update notification
 2013-04-26 21:12:38 -07:00
Jenkins for ownCloud
7b2c64236c [tx-robot] updated from transifex 2013-04-27 02:24:29 +02:00
Robin Appelman
8a838e0e03 Code style 2013-04-26 17:30:55 +02:00
Bart Visscher
7db5ec30c3 Add check for Magic Quotes 2013-04-26 16:32:58 +02:00
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
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
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
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
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
Bernhard Posselt
c9c1e483c5 use utf-8 encoding for json 2013-04-25 11:36:41 +02: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
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
d41b600725 Add an update notification on every page for admin users 2013-04-24 18:47:38 +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
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
Daniel Molkentin
6ac2fdf44b sync parameters in setup.php with the ones in the actual .htaccess 2013-04-24 15:11:58 +02:00
Florian Scholz
03aa86d8a6 - xframe restriction configurable now 2013-04-24 14:45:40 +02:00