redmatrix
|
3763f74a10
|
Merge branch 'master' of https://github.com/redmatrix/redmatrix
Conflicts:
include/items.php
include/text.php
mod/item.php
view/nl/messages.po
|
2015-05-20 20:49:06 -07:00 |
|
redmatrix
|
0689816772
|
check for success before updating remote id
|
2015-05-20 19:27:05 -07:00 |
|
redmatrix
|
6466774b6e
|
PRIVACY: possible privacy leakage under a defined set of circumstances
|
2015-05-20 18:46:23 -07:00 |
|
redmatrix
|
acc8e10a45
|
merge redmatrix fix
|
2015-05-19 18:28:52 -07:00 |
|
redmatrix
|
d63bcde6e2
|
Merge branch 'master' of https://github.com/redmatrix/redmatrix
|
2015-05-19 18:26:46 -07:00 |
|
redmatrix
|
fe00d29047
|
issue with deleting imported design elements and re-installing them
|
2015-05-19 18:25:27 -07:00 |
|
redmatrix
|
77e2ef45f0
|
mail_obscure - AES-256 is way too slow, simplify. Ideally a substitution cipher would be adequate for our requirements.
|
2015-05-19 02:16:12 -07:00 |
|
redmatrix
|
b7ae85e89a
|
get rid of photo_flags in the code
|
2015-05-18 20:10:44 -07:00 |
|
redmatrix
|
da7abbb089
|
bring the new photo schema into play
|
2015-05-18 19:43:53 -07:00 |
|
redmatrix
|
eae241df56
|
Merge branch 'master' of https://github.com/redmatrix/redmatrix
|
2015-05-18 17:38:07 -07:00 |
|
redmatrix
|
c2ca2a09e7
|
this should fix undeletable blocks and layouts
|
2015-05-18 17:32:36 -07:00 |
|
redmatrix
|
4c319a98a8
|
fix some merge errors
|
2015-05-18 17:20:59 -07:00 |
|
redmatrix
|
7c7a5cba8f
|
Merge branch 'master' into tres
|
2015-05-17 19:49:36 -07:00 |
|
redmatrix
|
76558df966
|
Merge branch 'master' of https://github.com/redmatrix/redmatrix
Conflicts:
include/bb2diaspora.php
include/diaspora.php
include/enotify.php
mod/admin.php
mod/cloud.php
mod/dav.php
mod/home.php
mod/invite.php
mod/like.php
mod/mitem.php
mod/p.php
mod/pubsites.php
mod/setup.php
mod/siteinfo.php
util/messages.po
|
2015-05-17 19:48:57 -07:00 |
|
redmatrix
|
91d7b0f7eb
|
more work isolating the projectname from core.
|
2015-05-17 16:28:16 -07:00 |
|
redmatrix
|
f0cb3cba12
|
Merge branch 'master' into tres
|
2015-05-14 22:12:56 -07:00 |
|
redmatrix
|
291f3beccf
|
Merge branch 'master' of https://github.com/redmatrix/redmatrix
|
2015-05-14 22:12:37 -07:00 |
|
redmatrix
|
47564d4310
|
provide default permissions ('all') for existing and newly created OAuth app clients, which will be extended in the future to allow specific permissions.
|
2015-05-14 21:57:20 -07:00 |
|
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 |
|