redmatrix
b2c5020af7
diaspora disallowed by default
2015-06-10 18:51:39 -07:00
redmatrix
bc1b7afc85
start to partition the dav
2015-06-10 18:11:15 -07:00
redmatrix
a14d2de1f0
Merge branch 'master' of https://github.com/redmatrix/redmatrix
2015-06-10 17:58:02 -07:00
redmatrix
04551ac32b
Merge https://github.com/redmatrix/redmatrix into pending_merge
2015-06-10 17:45:04 -07:00
redmatrix
9a5d9fb8c5
put block_public back where it is needed, which is in mod_public and not mod_home
2015-06-10 17:44:04 -07:00
redmatrix
ca870dbf31
more work on item table optimisation
2015-06-10 16:59:04 -07:00
redmatrix
2128d5a256
Merge branch 'master' of https://github.com/redmatrix/redmatrix
2015-06-10 15:47:23 -07:00
Alexandre Hannud Abdo
a31fdd3fbb
correctly fix attachment permissions from private mentions
...
by postponing code that removes the attachment tag from the body
2015-06-10 15:37:10 -03:00
Mario Vavti
edd2d1e8d4
show login without checking for block_public, local or remote channel
2015-06-10 13:24:16 +02:00
Mario Vavti
20a317b5b7
really show login form if it is enabled
2015-06-10 11:58:45 +02:00
redmatrix
eb6a1f8387
Merge branch 'master' of https://github.com/redmatrix/redmatrix
2015-06-09 19:39:21 -07:00
redmatrix
9592f7f3e6
put mirror_frontpage setting into admin/site
2015-06-09 19:37:12 -07:00
redmatrix
d08c43d80c
toggle diaspora protocol on a per-channel level in addition to the existing per site setting. Default is enabled if the site setting is enabled.
2015-06-09 18:50:11 -07:00
redmatrix
faa7f97c25
s/broder/border/
2015-06-09 16:52:53 -07:00
redmatrix
03357481f7
Merge branch 'master' of https://github.com/redmatrix/redmatrix
...
Conflicts:
install/schema_mysql.sql
mod/home.php
mod/page.php
view/nl/messages.po
view/nl/strings.php
2015-06-09 16:52:00 -07:00
redmatrix
805e2a28ee
add nomadic identities as webfinger aliases
2015-06-09 16:29:51 -07:00
redmatrix
54b61f817d
provide a mechanism for loading the frontpage without redirecting.
2015-06-08 21:19:05 -07:00
redmatrix
507e10fa45
remove debugging
2015-06-08 16:57:30 -07:00
redmatrix
39f0e6fe62
add site_dead flag to prevent delivery to dead sites. Allow sys channel webpages to be viewed even if site is configured "block public".
2015-06-08 16:55:17 -07:00
redmatrix
5b482c1daf
magic auth issues on dreamhost
2015-06-07 23:04:46 -07:00
redmatrix
9823541c4b
make sure these are included
2015-06-07 21:36:50 -07:00
redmatrix
3c5a5a9ebf
more frontpage tweaks
2015-06-07 18:59:14 -07:00
redmatrix
60cfea5d1f
reverse logic of homepage login setting
2015-06-07 18:27:05 -07:00
redmatrix
0537ff1e4a
frontpage tweaks
2015-06-07 18:15:26 -07:00
redmatrix
65bea5e02c
frontpage changes
2015-06-07 16:19:59 -07:00
redmatrix
ec1dcb8f2e
Merge branch 'master' of https://github.com/redmatrix/redmatrix
...
Conflicts:
util/messages.po
2015-06-06 17:31:22 -07:00
jeroenpraat
93237f8d0a
Added translatable strings to the Display Settings page and refreshed util/messages.po.
2015-06-06 19:49:30 +02:00
Mario Vavti
d84f77bbc6
use the right webpage layout for an installed webpage if it exists
2015-06-04 23:04:58 +02:00
redmatrix
7cbc504874
Merge branch 'master' of https://github.com/redmatrix/redmatrix
2015-06-02 17:47:47 -07:00
Mario Vavti
6277fb76dd
update help link
2015-06-02 11:09:57 +02:00
redmatrix
e3606ec56f
move the photo and attachment permission syncing past the tag replacement so that attachments get the correct permissions when private mentions are used.
2015-06-01 16:26:12 -07:00
redmatrix
84c085dcd7
bare bones ASLD
2015-05-31 22:16:14 -07:00
redmatrix
f3b95f591a
Merge branch 'master' of https://github.com/redmatrix/redmatrix
2015-05-31 19:26:00 -07:00
Habeas Codice
0df0fb4b46
fix unable to crop profile pic on postgres
2015-05-30 19:49:32 -07:00
redmatrix
cd3284d081
Merge https://github.com/redmatrix/redmatrix into pending_merge
2015-05-30 15:04:11 -07:00
redmatrix
edd228decb
strip images from directory text entries
2015-05-30 15:03:44 -07:00
Mario Vavti
8516b3259f
whitespace
2015-05-29 16:14:54 +02:00
Mario Vavti
d11d130021
add some yes/no labels and minor template fixes
2015-05-29 15:23:51 +02:00
Mario Vavti
b8d3280763
some fixes to make menu sharing work and expose it in the ui.
2015-05-29 13:08:01 +02:00
Mario Vavti
5f1ae2930b
show created/edited dates for menus
2015-05-29 11:07:57 +02:00
redmatrix
3c82156d63
untested menu element import, be aware that the menu api does not over-write on duplicate name - it just fails. We'll need to sort this out eventually. Also it was planned to offer a choice of whether to preserve links from the source site or change the baseurl to the local one. Currently we convert them all to local links.
2015-05-28 20:50:29 -07:00
redmatrix
8fe3daab21
Merge branch 'master' of https://github.com/redmatrix/redmatrix
...
Conflicts:
install/schema_mysql.sql
mod/impel.php
view/pt-br/messages.po
view/pt-br/strings.php
2015-05-28 19:06:31 -07:00
redmatrix
1a86e3321b
catch a window that wasn't yet saved when the last checkin occurred
2015-05-27 21:46:36 -07:00
redmatrix
12c17f1265
menu encoding for sharing/exchange
2015-05-27 21:09:21 -07:00
redmatrix
b381ec5734
Merge branch 'master' of https://github.com/redmatrix/redmatrix
...
Conflicts:
mod/impel.php
2015-05-27 19:27:38 -07:00
redmatrix
2dd02cc166
missing row in sql query which is used further down
2015-05-27 19:26:42 -07:00
redmatrix
11301d51a5
some high-level stuff we may need for shareable menus. Also make the client register function do the right thing even though I refuse to make it work. If **you** want service federation with things like pumpio and openid connect, it's time for **you** to put your own skin in the game and quit treating project volunteers like excrement just because you can't get up off your lazy buttocks.
2015-05-27 17:30:36 -07:00
redmatrix
9a0264f5d2
some work on issue #329
2015-05-25 19:17:35 -07:00
redmatrix
675aa96f22
Merge branch 'master' of https://github.com/redmatrix/redmatrix
2015-05-25 17:01:02 -07:00
redmatrix
23abfb0a5b
add toggle for ALLOWCODE to admin/channel and also fix the ability to toggle the censor flag from that page.
2015-05-25 16:56:28 -07:00
redmatrix
dfa4984089
Merge branch 'master' of https://github.com/redmatrix/redmatrix
2015-05-24 20:21:30 -07:00
redmatrix
1828771557
timezone setting not saved issue #336
2015-05-24 18:09:41 -07:00
redmatrix
d537fc854b
typo and update to rfc7033 (webfinger) as well as webfinger diagnostic page
2015-05-24 17:59:31 -07:00
redmatrix
27137e48eb
Merge branch 'master' of https://github.com/redmatrix/redmatrix
2015-05-24 17:16:12 -07:00
redmatrix
d9061fd09e
Merge https://github.com/redmatrix/redmatrix into pending_merge
2015-05-24 15:59:03 -07:00
redmatrix
52e38d7c24
search result heading not translatable
2015-05-24 15:57:59 -07:00
redmatrix
851f2f64df
Merge branch 'master' of https://github.com/redmatrix/redmatrix
...
Conflicts:
index.php
mod/setup.php
2015-05-24 15:50:05 -07:00
redmatrix
a332dfcf6b
Merge pull request #331 from solstag/jqueryprop
...
Fix accepting contacts by using correct jquery calls.
2015-05-24 12:50:43 +10:00
Klaus Weidenbach
e90c331bf6
Add PHP's xml module check and upload limits to setup.
...
And some documentation.
2015-05-24 02:58:52 +02:00
Alexandre Hannud Abdo
d37c51ef2e
Fix accepting contacts by using correct jquery calls.
...
Not sure what the operation on disabled is supposed to do, but
it also seemed to requier prop instead of attr.
See for reference:
http://api.jquery.com/prop/
"""
The checked attribute value does not change with the state of the checkbox,
while the checked property does.
"""
2015-05-22 10:15:29 -03:00
redmatrix
5795e2a58b
more migration of page types
2015-05-21 22:17:17 -07:00
redmatrix
25bd332aab
Merge branch 'master' of https://github.com/redmatrix/redmatrix
2015-05-21 20:39:10 -07:00
redmatrix
81d94dae2c
preserve lock on edited comments
2015-05-21 02:03:44 -07:00
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
