redmatrix
|
a6cb90c81c
|
Merge branch 'master' into tres
Conflicts:
include/Import/refimport.php
include/activities.php
include/attach.php
include/event.php
include/externals.php
include/identity.php
include/items.php
include/notifier.php
include/photos.php
include/taxonomy.php
include/zot.php
mod/channel.php
mod/connedit.php
mod/events.php
mod/item.php
mod/like.php
mod/manage.php
mod/mood.php
mod/ping.php
mod/poke.php
mod/subthread.php
mod/tagger.php
mod/thing.php
|
2015-05-14 18:02:29 -07:00 |
|
redmatrix
|
51b89f0ed8
|
Merge branch 'master' of https://github.com/redmatrix/redmatrix
Conflicts:
doc/DerivedTheme1.md
doc/Developers.md
doc/Features.md
doc/Plugins.md
doc/Privacy.md
doc/README.md
doc/Remove-Account.md
doc/Translations.md
doc/about.bb
doc/account_basics.bb
doc/accounts_profiles_channels_basics.bb
doc/addons.bb
doc/addons_gnusocial.bb
doc/bbcode.html
doc/campaign.bb
doc/classRedmatrix_1_1Import_1_1Import-members.html
doc/classRedmatrix_1_1Import_1_1Import.html
doc/cloud.bb
doc/connecting_to_channels.bb
doc/connecting_to_channels.md
doc/credits.bb
doc/de/channels.bb
doc/de/features.bb
doc/de/main.bb
doc/de/registration.bb
doc/developers.bb
doc/encryption.bb
doc/external-resource-links.bb
doc/extra_features.bb
doc/faq_admins.bb
doc/faq_developers.bb
doc/faq_members.bb
doc/features.bb
doc/hidden_configs.bb
doc/history.md
doc/html/index.php
doc/main.bb
doc/permissions.bb
doc/plugins.bb
doc/problems-following-an-update.bb
doc/profiles.bb
doc/red2pi.bb
doc/registration.bb
doc/roadmap.bb
doc/sv/main.bb
doc/what_is_zot.bb
doc/zot.md
|
2015-05-13 19:23:13 -07:00 |
|
redmatrix
|
364025e550
|
remove project name dependency from most of the doc files to ease project merging, there are going to be some edge cases requiring manual tweaking as most of this was done by script.
|
2015-05-13 17:59:45 -07:00 |
|
redmatrix
|
475dc7b686
|
Merge branch 'master' of https://github.com/redmatrix/redmatrix
Conflicts:
boot.php
include/api.php
include/enotify.php
|
2015-05-13 17:07:12 -07:00 |
|
redmatrix
|
c82082d2bb
|
restrict webpage list to undeleted items
|
2015-05-13 16:27:04 -07:00 |
|
redmatrix
|
d6f98e6511
|
product was a bad string to use because we may require it for e-commerce, and RED_PLATFORM is equally problematic for other reasons.
|
2015-05-13 16:01:00 -07:00 |
|
redmatrix
|
c3c202d650
|
issue #187
|
2015-05-12 22:57:55 -07:00 |
|
redmatrix
|
018e702281
|
Merge branch 'master' of https://github.com/redmatrix/redmatrix
Conflicts:
mod/mitem.php
view/nl/strings.php
|
2015-05-12 19:00:54 -07:00 |
|
redmatrix
|
aeb69dcbbe
|
let the site admin import a record directly from the probe diagnostic
|
2015-05-11 19:36:07 -07:00 |
|
redmatrix
|
cddcf9d3ab
|
missing translation
|
2015-05-11 17:50:17 -07:00 |
|
redmatrix
|
5386686a1e
|
missing merge conflict
|
2015-05-11 17:46:58 -07:00 |
|
redmatrix
|
0a644a2f41
|
Merge branch 'master' of https://github.com/redmatrix/redmatrix
Conflicts:
mod/mitem.php
view/de/messages.po
view/de/strings.php
|
2015-05-10 13:26:44 -07:00 |
|
Mario Vavti
|
ca36fce9a7
|
provide drop down submenu suggestions in edit mode
|
2015-05-10 21:17:37 +02:00 |
|
Mario Vavti
|
616338c17e
|
provide ability to create submenus
|
2015-05-10 15:00:18 +02:00 |
|
redmatrix
|
90591bcbc9
|
missed one...
|
2015-05-06 22:56:08 -07:00 |
|
redmatrix
|
25b599a4bd
|
convert ITEM_WALL from bitfield to standalone
|
2015-05-06 21:03:33 -07:00 |
|
redmatrix
|
75b8bfc07a
|
Merge branch 'master' of https://github.com/redmatrix/redmatrix
|
2015-05-06 18:39:12 -07:00 |
|
Mario Vavti
|
257c670d5c
|
avoid double slash after editing layout
|
2015-05-06 12:16:53 +02:00 |
|
redmatrix
|
c9ec4f46b6
|
for hubzilla we won't be obscuring items, only private mail, this will allow us to search and cache private posts
|
2015-05-05 18:36:05 -07:00 |
|
redmatrix
|
5b5f0666f9
|
second pass name change
|
2015-05-05 03:59:51 -07:00 |
|
redmatrix
|
a3c37f1458
|
first pass name change
|
2015-05-05 03:56:10 -07:00 |
|
friendica
|
c4221f3273
|
Merge branch 'master' into tres
Conflicts:
include/notifier.php
|
2015-04-29 21:49:43 -07:00 |
|
Mario Vavti
|
310d122901
|
disable voting in blocks, layouts and webpages
|
2015-04-29 21:36:53 +02:00 |
|
Mario Vavti
|
e56b8fdfaf
|
fix $noloc state in mod editwebpages
|
2015-04-29 16:45:05 +02:00 |
|
Mario Vavti
|
f987fc3e6f
|
adjust placeholder naming
|
2015-04-29 16:33:03 +02:00 |
|
Mario Vavti
|
31b5b06e42
|
Provide webpage layout description
|
2015-04-25 22:35:24 +02:00 |
|
friendica
|
e01873b4cf
|
Merge https://github.com/redmatrix/redmatrix into pending_merge
|
2015-04-24 15:01:59 -07:00 |
|
Mario Vavti
|
b7f6cceaea
|
provide block titles in blocklist
|
2015-04-24 22:37:22 +02:00 |
|
Mario Vavti
|
2583cab469
|
add title to element array
|
2015-04-24 14:14:33 +02:00 |
|
Mario Vavti
|
da0875a015
|
there is no key named term in this array
|
2015-04-24 12:43:41 +02:00 |
|
Mario Vavti
|
9894a7b2d0
|
copy/paste typo
|
2015-04-24 12:37:13 +02:00 |
|
Mario Vavti
|
c6a75f407d
|
webpages layout fixes
|
2015-04-24 11:36:49 +02:00 |
|
friendica
|
98b3d7d6ff
|
reset route
|
2015-04-24 00:59:02 -07:00 |
|
friendica
|
b3ac1cd993
|
mod/branchtopic - move an off-topic comment to its own thread as a fresh wall-to-wall post and the same delivery permissions as its parent. No adjustments are made for complex delivery chains.
|
2015-04-24 00:56:06 -07:00 |
|
friendica
|
ca305f5421
|
Merge https://github.com/redmatrix/redmatrix into pending_merge
|
2015-04-23 21:29:27 -07:00 |
|
friendica
|
5ac177391b
|
disconnect
|
2015-04-23 21:13:59 -07:00 |
|
friendica
|
6679734135
|
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
|
2015-04-23 19:49:41 -07:00 |
|
Mario Vavti
|
c696860cc5
|
webpages blocks fixes
|
2015-04-23 21:04:01 +02:00 |
|
Mario Vavti
|
29061b3ee3
|
do not show acl button if not owner
|
2015-04-22 12:31:30 +02:00 |
|
Mario Vavti
|
dfc88a41df
|
fix webpages profile_tabs
|
2015-04-22 12:21:33 +02:00 |
|
Mario Vavti
|
9e490d022b
|
fix webpage perms
|
2015-04-22 12:00:15 +02:00 |
|
Mario Vavti
|
b4dff3a9ff
|
provide headings for blocks and layouts
|
2015-04-22 10:31:36 +02:00 |
|
Mario Vavti
|
e58e8f3f75
|
bring lockstate to webpages
|
2015-04-21 23:08:54 +02:00 |
|
Mario Vavti
|
21704ecb93
|
bring lockview to menu items, slightly change the way /lockview is called
|
2015-04-21 22:45:54 +02:00 |
|
Mario Vavti
|
0bd9fe0b11
|
rework and hopefully improve webpage menu creation workflow
|
2015-04-21 10:05:26 +02:00 |
|
friendica
|
53339d19a3
|
issue #176, sender copy of item not obscured if using private mention
|
2015-04-20 20:14:07 -07:00 |
|
friendica
|
a707e9b9f5
|
issue #178, searching for words such as 'data' would return private items regardless of their unobscured content.
|
2015-04-19 23:16:17 -07:00 |
|
friendica
|
9cc8b44579
|
issue #157, provide default directory sort order
|
2015-04-19 23:04:14 -07:00 |
|
Michael Johnston
|
dadcfd3ff6
|
switch from IMG_XXX constants to IMAGETYPE_XXX constants
|
2015-04-19 18:06:42 -04:00 |
|
friendica
|
0883512e30
|
log this since we may need it to track down failures
|
2015-04-18 17:40:44 -07:00 |
|