aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitmodules45
m---------mod/admins0
m---------mod/audio_html50
m---------mod/dokuwiki6
m---------mod/etherpad0
-rw-r--r--mod/file/start.php6
m---------mod/friendrequest6
m---------mod/group_alias0
m---------mod/group_operators0
m---------mod/magic_topbar0
m---------mod/minify0
m---------mod/opensearch6
m---------mod/powered0
m---------mod/relatedgroups0
m---------mod/spotlight0
m---------mod/suicide0
m---------mod/videolist7
17 files changed, 75 insertions, 1 deletions
diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 000000000..08284e919
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,45 @@
+[submodule "mod/videolist"]
+ path = mod/videolist
+ url = git://gitorious.org/lorea/videolist.git
+[submodule "mod/dokuwiki"]
+ path = mod/dokuwiki
+ url = git://gitorious.org/lorea/dokuwiki.git
+[submodule "mod/group_operators"]
+ path = mod/group_operators
+ url = git://gitorious.org/lorea/group_operators.git
+[submodule "mod/powered"]
+ path = mod/powered
+ url = git://gitorious.org/lorea/powered.git
+[submodule "mod/group_alias"]
+ path = mod/group_alias
+ url = git://gitorious.org/lorea/group_alias.git
+[submodule "mod/etherpad"]
+ path = mod/etherpad
+ url = git@gitorious.org:lorea/elggpad.git
+[submodule "mod/spotlight"]
+ path = mod/spotlight
+ url = git://gitorious.org/lorea/spotlight.git
+[submodule "mod/suicide"]
+ path = mod/suicide
+ url = git://gitorious.org/lorea/suicide.git
+[submodule "mod/friendrequest"]
+ path = mod/friendrequest
+ url = git://gitorious.org/lorea/friendrequest.git
+[submodule "mod/admins"]
+ path = mod/admins
+ url = git://gitorious.org/lorea/admins.git
+[submodule "mod/opensearch"]
+ path = mod/opensearch
+ url = git://gitorious.org/lorea/opensearch.git
+[submodule "mod/minify"]
+ path = mod/minify
+ url = git://gitorious.org/lorea/minify.git
+[submodule "mod/magic_topbar"]
+ path = mod/magic_topbar
+ url = git://gitorious.org/lorea/magic_topbar.git
+[submodule "mod/audio_html5"]
+ path = mod/audio_html5
+ url = git://gitorious.org/lorea/audio_html5.git
+[submodule "mod/relatedgroups"]
+ path = mod/relatedgroups
+ url = git://gitorious.org/lorea/relatedgroups.git
diff --git a/mod/admins b/mod/admins
new file mode 160000
+Subproject 104726db4f1a89422d954bb2a1a42ea445995e1
diff --git a/mod/audio_html5 b/mod/audio_html5
new file mode 160000
+Subproject ad0149bc78bf67809d9c2636fe05987e2598b0c
diff --git a/mod/dokuwiki b/mod/dokuwiki
new file mode 160000
+Subproject 22580e31861a8811338e8d31af47dcf67a4ac29
diff --git a/mod/etherpad b/mod/etherpad
new file mode 160000
+Subproject ea4d37cfd11f632a6568bc83cae184a35be2808
diff --git a/mod/file/start.php b/mod/file/start.php
index e15a9ad61..3e1ae169d 100644
--- a/mod/file/start.php
+++ b/mod/file/start.php
@@ -233,6 +233,10 @@ function file_owner_block_menu($hook, $type, $return, $params) {
*/
function file_get_simple_type($mimetype) {
+ if($type = elgg_trigger_plugin_hook('file_simple_type', 'object', $params, null)) {
+ return $type;
+ }
+
switch ($mimetype) {
case "application/msword":
return "document";
@@ -396,4 +400,4 @@ function file_icon_url_override($hook, $type, $returnvalue, $params) {
$url = elgg_trigger_plugin_hook('file:icon:url', 'override', $params, $url);
return $url;
}
-} \ No newline at end of file
+}
diff --git a/mod/friendrequest b/mod/friendrequest
new file mode 160000
+Subproject b19fa6f54d89137ca55b3ddd343c5f22da16839
diff --git a/mod/group_alias b/mod/group_alias
new file mode 160000
+Subproject 4479b0124b507a8b6f0f211619e5e71c0d09e9f
diff --git a/mod/group_operators b/mod/group_operators
new file mode 160000
+Subproject 65f5a354fa140dc7df43460905dc564d4323579
diff --git a/mod/magic_topbar b/mod/magic_topbar
new file mode 160000
+Subproject 2c91295822abba9c80037f8ee41859d829dcfb4
diff --git a/mod/minify b/mod/minify
new file mode 160000
+Subproject 594901859d5afc1fa364322428bd7a6d5c6a3f9
diff --git a/mod/opensearch b/mod/opensearch
new file mode 160000
+Subproject 9a4204b81ee84e1d23b0bc442932dc93da52bad
diff --git a/mod/powered b/mod/powered
new file mode 160000
+Subproject 76a03d73554d1d328d83a42d62774601d4f0795
diff --git a/mod/relatedgroups b/mod/relatedgroups
new file mode 160000
+Subproject 9140a44f4d94ede22c5dcfbaeb2d6b75efe6d4c
diff --git a/mod/spotlight b/mod/spotlight
new file mode 160000
+Subproject 6fb54c50446101dc947cccd37e0d195dceb44f4
diff --git a/mod/suicide b/mod/suicide
new file mode 160000
+Subproject 30bc24b8f9b5addf2c2279ff4e93a2f891d168b
diff --git a/mod/videolist b/mod/videolist
new file mode 160000
+Subproject 9a449b126c89481baadb8810d2d304c93aded7a