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

3627 commits

Author SHA1 Message Date
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
Bernhard Posselt
a8075943c3 use variable instead of relative path to file 2013-04-24 14:17:52 +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
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
Tom Needham
7eb6cc62f8 Make class properties protected instead of private to allow subclassing 2013-04-23 23:03:39 +01: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
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
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
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
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
Robin Appelman
5942d5aeac Improve error message if user creation fails during setup 2013-04-22 20:32:40 +02:00
Jenkins for ownCloud
f6808617b3 [tx-robot] updated from transifex 2013-04-22 02:00:20 +02:00
Robin Appelman
eed5e9f804 Cache: check one folder and one file each time the backgroundwatcher runs 
Because there are usually way less folders than files it walks trought the list of all folder quicker, this causes new files to be detected quicker
 2013-04-20 16:57:53 +02:00
Robin Appelman
15dae6198f Cache: add a backgroundjob to check for external changes to the filesystem 2013-04-20 16:38:03 +02:00
Jenkins for ownCloud
03c7a52bc5 [tx-robot] updated from transifex 2013-04-20 02:02:09 +02:00
Bart Visscher
0701d0019b Merge pull request #3020 from owncloud/cleaner-webdav-reason 
Cleaner isWebDAVWorking reason, otherwise people overlook the reason
 2013-04-19 07:56:41 -07:00
Bart Visscher
e1c5b31d65 Test if we want a 3rdparty style/script before checking the 3rdparty root 2013-04-19 16:09:39 +02:00
Robin Appelman
10be42f5b7 Cache: only look for child entires when doing a move operation when moving a folder 2013-04-19 15:06:48 +02:00
Bart Visscher
7ac49dd52a Cleaner isWebDAVWorking reason, otherwise people overlook the reason 2013-04-19 12:44:54 +02:00
Thomas Tanghus
4ccc9d896a Merge pull request #3010 from owncloud/fix-cookie_path 
Don't use empty session.cookie_path, otherwise we get multiple cookies
 2013-04-19 01:17:35 -07:00
Thomas Tanghus
e09c17de5b Added explanation 2013-04-18 22:29:50 +02:00
Bart Visscher
e4876c9117 Don't use empty session.cookie_path, otherwise we get multiple cookies 2013-04-18 21:11:58 +02:00
Thomas Tanghus
9facb67fab Let autoloader resolve paths under apps lib directory. 2013-04-18 08:30:09 +02:00
Jenkins for ownCloud
cbd8b792d9 [tx-robot] updated from transifex 2013-04-18 02:09:28 +02:00
Brice Maron
43d0f1fabf Warn when we do an upgrade 2013-04-17 21:29:14 +02:00
Bernhard Posselt
3b2a0523f8 Merge pull request #2978 from owncloud/displayname_can_be_null 
Remove not null constraint. Fix #2976
 2013-04-17 07:47:17 -07:00
Morris Jobke
867a527148 Merge pull request #2975 from owncloud/log-date 
use date and time instead of timestamp in log
 2013-04-17 06:49:46 -07:00
Thomas Tanghus
44668b36a7 Remove not null constraint. Fix #2976 2013-04-17 14:08:45 +02:00
Bernhard Posselt
f7e29eabf2 fix admin log display and use a more readable format 2013-04-17 14:05:51 +02:00
Bernhard Posselt
8471340db9 use date and time instead of timestamp 2013-04-17 12:24:18 +02:00
Thomas Tanghus
ec280e6f9f Merge pull request #2746 from owncloud/use-count-userexists 
Use count SQL to check for user existance
 2013-04-17 03:06:50 -07:00
AndreasErgenzinger
eef1cf529e additional safety checks 2013-04-17 10:41:07 +02:00
AndreasErgenzinger
7611d218df merge translations with those from theme 2013-04-17 10:34:29 +02:00
AndreasErgenzinger
6a5f5ce157 merge translations with those from theme 2013-04-17 10:29:32 +02:00
Bart Visscher
f3c06ae4e4 Merge pull request #2915 from Kondou-ger/handle_empty_datafolder_better 
Handle empty datafolder better.
 2013-04-17 00:44:14 -07:00
Jenkins for ownCloud
37868818ff [tx-robot] updated from transifex 2013-04-17 02:29:17 +02:00
Robin Appelman
8a50459223 Fix OC_User::getDisplaynames when using numeric user id's 
fixes #2948
 2013-04-17 01:08:27 +02:00
Michael Gapczynski
2040f0af78 Merge pull request #2943 from owncloud/always_load_cache_hooks_first 
always connect file cache updater hooks first
 2013-04-16 12:21:09 -07:00
Bart Visscher
8d1db84ed1 Merge pull request #2887 from owncloud/l10n-caching 
L10N: cache the result of findLanguage
 2013-04-16 09:11:33 -07:00
Jörn Friedrich Dreyer
606b672a3d always connect file cache updater hooks first 2013-04-16 13:07:55 +02:00
Jenkins for ownCloud
d0b3e8aceb [tx-robot] updated from transifex 2013-04-16 02:17:30 +02:00
Arthur Schiwon
2fa34d6772 Make FileCache upgrade more robust, fixes #2650 2013-04-15 11:56:30 +02:00
kondou
d759dca203 Handle empty datafolder better. 
If datafolder is erased, the default value will be shown as a placeholder.

If installation is submitted without a datafolder the default value will be used.
 2013-04-13 15:56:01 +02:00
Frank Karlitschek
8efd71099f Merge pull request #2909 from owncloud/addHook 
allow Storages to join MountPoint initialization
 2013-04-13 05:19:27 -07:00
Jenkins for ownCloud
19afc216cf [tx-robot] updated from transifex 2013-04-13 02:15:54 +02:00
Arthur Schiwon
e3b733f23d allow Storages to join MountPoint initialization 2013-04-13 00:33:21 +02:00
Jenkins for ownCloud
33ee2e2f10 [tx-robot] updated from transifex 2013-04-12 02:11:02 +02:00
Robin Appelman
2180a4c420 -L10N: cache the result of findLanguage 2013-04-12 00:58:14 +02:00
Jörn Friedrich Dreyer
121c8bd303 Merge pull request #2747 from owncloud/cache-contructed-cache-objects 
Remember the contructed OC\Files\Cache\* classes in OC\Files\Storage\Com...
 2013-04-10 08:09:09 -07:00
Bernhard Posselt
526076f2e0 Merge pull request #2781 from owncloud/fix-2592 
Correct undefined variable in post_shared hook, fixes #2592
 2013-04-10 05:53:50 -07:00
Robin Appelman
258ad38fd3 Fix touch for creating new files 2013-04-10 13:48:24 +02:00
Jenkins for ownCloud
c06bc81c79 [tx-robot] updated from transifex 2013-04-10 02:09:39 +02:00
eMerzh
8db76ef7d2 Merge pull request #2147 from eMerzh/split_config 
[OC6] Allow to load splited config files
 2013-04-09 09:56:16 -07:00
Bernhard Posselt
352af6005f Merge pull request #2801 from OpenLarry/patch-1 
fixes #2679 - 5.0.3 Renaming -> Nothing happens
 2013-04-09 03:40:40 -07:00
Bernhard Posselt
16b513e4dc added correct check for gd and check for php-intl 2013-04-09 12:22:55 +02:00
Bernhard Posselt
6fc0319e1b Merge pull request #2754 from owncloud/cookie-path 
Just send the cookies in the ownCloud directory
 2013-04-09 02:36:20 -07:00
Bernhard Posselt
8cd4cadb22 Merge pull request #2799 from owncloud/add-mimetype-filter-to-getdirectorycontent 
Add mimetype filter to getDirectoryContent function
 2013-04-09 02:25:40 -07:00
Björn Schießle
2d489a94c6 Merge pull request #2797 from owncloud/fixing-2792-master 
fixes #2792 - only touch if writable
 2013-04-09 01:50:05 -07:00
Bernhard Posselt
5bb248efd6 Merge pull request #2764 from owncloud/remove-limit-from-count-query 
Remove wrong limit parameter from count query in compatibility function
 2013-04-09 00:19:09 -07:00
Bernhard Posselt
74f90eabe4 Merge pull request #2798 from owncloud/fixing-2789-master 
fixes #2789 - no internet connectivity check if there is non on purpose
 2013-04-09 00:18:13 -07:00
Jenkins for ownCloud
5ef389610f [tx-robot] updated from transifex 2013-04-09 02:14:02 +02:00
Michael Gapczynski
d51a94161e Initialize collectionTypes variable as false 2013-04-08 17:46:52 -04:00
OpenLarry
49313b334a fixes #2679 2013-04-09 00:26:16 +03:00
Thomas Müller
89818e279b Merge pull request #2785 from owncloud/vobject_stringproperty 
Add OC\VObject\StringProperty. Partial fix for owncloud/apps#762
 2013-04-08 14:23:38 -07:00
Thomas Mueller
46722d8282 fixes #2789 - no internet connectivity check if there is non on purpose 2013-04-08 22:41:20 +02:00
Bart Visscher
a07a8794b8 Add mimetype filter to getDirectoryContent function 2013-04-08 22:40:03 +02:00
Thomas Mueller
d069ee8a8b fixes #2792 - only touch if writable 2013-04-08 22:22:49 +02:00
Thomas Tanghus
ae9548bc6e Add OC\VObject\StringProperty. Partial fix for owncloud/apps#762 2013-04-08 14:57:43 +02:00
Jenkins for ownCloud
ccde0212b1 [tx-robot] updated from transifex 2013-04-08 02:18:28 +02:00
Michael Gapczynski
e704bcd96e Correct undefined variable in post_shared hook, fixes #2592 2013-04-07 20:05:54 -04:00