diff options
| author | friendica <info@friendica.com> | 2015-04-23 19:49:41 -0700 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2015-04-23 19:49:41 -0700 |
| commit | 6679734135fb04f4a7beccb81663bf1e9574f062 (patch) | |
| tree | 887488543d98b5dd297d917718bdd99844e83ba5 /view/pdl | |
| parent | 08b757a22cd2804bfec8ecf682b6987b8c06ca49 (diff) | |
| parent | c696860cc53bc25558d83de5eda65d9b583da382 (diff) | |
| download | volse-hubzilla-6679734135fb04f4a7beccb81663bf1e9574f062.tar.gz volse-hubzilla-6679734135fb04f4a7beccb81663bf1e9574f062.tar.bz2 volse-hubzilla-6679734135fb04f4a7beccb81663bf1e9574f062.zip | |
Merge branch 'master' into tres
Conflicts:
include/Contact.php
include/ItemObject.php
include/api.php
include/attach.php
include/diaspora.php
include/dir_fns.php
include/enotify.php
include/event.php
include/expire.php
include/items.php
include/notifier.php
include/notify.php
include/photos.php
include/taxonomy.php
include/text.php
include/widgets.php
include/zot.php
mod/admin.php
mod/channel.php
mod/dirsearch.php
mod/display.php
mod/editwebpage.php
mod/events.php
mod/home.php
mod/item.php
mod/manage.php
mod/mood.php
mod/network.php
mod/page.php
mod/photos.php
mod/ping.php
mod/post.php
mod/thing.php
mod/viewsrc.php
view/css/mod_events.css
Diffstat (limited to 'view/pdl')
| -rw-r--r-- | view/pdl/mod_directory.pdl | 1 | ||||
| -rw-r--r-- | view/pdl/mod_editblock.pdl | 3 | ||||
| -rw-r--r-- | view/pdl/mod_editlayout.pdl | 3 | ||||
| -rw-r--r-- | view/pdl/mod_editwebpage.pdl | 3 | ||||
| -rw-r--r-- | view/pdl/mod_id.pdl | 4 | ||||
| -rw-r--r-- | view/pdl/mod_network.pdl | 1 | ||||
| -rw-r--r-- | view/pdl/mod_ratings.pdl | 1 |
7 files changed, 14 insertions, 2 deletions
diff --git a/view/pdl/mod_directory.pdl b/view/pdl/mod_directory.pdl index 0bc8ed936..452ab66c7 100644 --- a/view/pdl/mod_directory.pdl +++ b/view/pdl/mod_directory.pdl @@ -1,6 +1,5 @@ [region=aside] [widget=findpeople][/widget] -[widget=dirsafemode][/widget] [widget=dirsort][/widget] [widget=dirtags][/widget] [widget=suggestions][/widget] diff --git a/view/pdl/mod_editblock.pdl b/view/pdl/mod_editblock.pdl new file mode 100644 index 000000000..cef69f194 --- /dev/null +++ b/view/pdl/mod_editblock.pdl @@ -0,0 +1,3 @@ +[region=aside] +[widget=design_tools][/widget] +[/region]
\ No newline at end of file diff --git a/view/pdl/mod_editlayout.pdl b/view/pdl/mod_editlayout.pdl new file mode 100644 index 000000000..cef69f194 --- /dev/null +++ b/view/pdl/mod_editlayout.pdl @@ -0,0 +1,3 @@ +[region=aside] +[widget=design_tools][/widget] +[/region]
\ No newline at end of file diff --git a/view/pdl/mod_editwebpage.pdl b/view/pdl/mod_editwebpage.pdl new file mode 100644 index 000000000..cef69f194 --- /dev/null +++ b/view/pdl/mod_editwebpage.pdl @@ -0,0 +1,3 @@ +[region=aside] +[widget=design_tools][/widget] +[/region]
\ No newline at end of file diff --git a/view/pdl/mod_id.pdl b/view/pdl/mod_id.pdl new file mode 100644 index 000000000..71ef7f898 --- /dev/null +++ b/view/pdl/mod_id.pdl @@ -0,0 +1,4 @@ +[region=aside] +[widget=fullprofile][/widget] +[/region] + diff --git a/view/pdl/mod_network.pdl b/view/pdl/mod_network.pdl index 11cadb5aa..7a39017e3 100644 --- a/view/pdl/mod_network.pdl +++ b/view/pdl/mod_network.pdl @@ -2,7 +2,6 @@ [region=aside] [widget=collections][/widget] -[widget=archive][/widget] [widget=suggestions][/widget] [widget=savedsearch][/widget] [widget=filer][/widget] diff --git a/view/pdl/mod_ratings.pdl b/view/pdl/mod_ratings.pdl index 0b6e32283..df1486c9b 100644 --- a/view/pdl/mod_ratings.pdl +++ b/view/pdl/mod_ratings.pdl @@ -1,4 +1,5 @@ [region=aside] +[widget=pubsites][/widget] [widget=vcard][/widget] [widget=rating][/widget] [widget=suggestions][/widget] |