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
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
Mario Vavti
61e4ee753d
allow jot to be displayed expanded, remove deprected datetimepicker js and some random fixes
2015-04-17 11:20:22 +02:00
Mario Vavti
10cc643f65
wording and css fixes
2015-04-16 23:46:12 +02:00
Mario Vavti
9addc4581e
provide a separate input field for rpost attachments
2015-04-16 23:26:11 +02:00
Mario Vavti
90d3a6c02d
make rpost respect default post permissions
2015-04-16 11:15:04 +02:00
Mario Vavti
b42bb09635
whitespace
2015-04-16 10:46:59 +02:00
Mario Vavti
86ac9c0d6b
move share webpage element from editwebpage to webpages and make it shareable with rpost
2015-04-16 10:43:14 +02:00
mrjive
a597c74b97
Update viewsrc.php
...
Adding the item ID to the item source view
2015-04-15 12:26:03 +02:00
friendica
2c8394a4b9
funny I should mention comanche preview (yesterday) as clicking the view link on a layout does nothing interesting at all. So I've made it do a crude but useable preview with page content of 'Lorem Ipsum'.
2015-04-14 21:48:42 -07:00
friendica
89536ff88b
Merge https://github.com/redmatrix/redmatrix into pending_merge
2015-04-14 16:22:59 -07:00
friendica
3a45206b99
default perms not being set in some cases
2015-04-14 16:22:33 -07:00
Mario Vavti
953819e7da
css fixes and remove expert mode for block page content type
2015-04-14 12:52:31 +02:00
Mario Vavti
79b5fb5b58
Merge branch 'master' of https://github.com/redmatrix/redmatrix
2015-04-14 11:50:34 +02:00
Mario Vavti
bf2a97147e
some more on webpages
2015-04-14 11:50:21 +02:00
Habeas Codice
213ca7f8b5
unquote binary
2015-04-13 16:18:11 -07:00
friendica
d3bc721138
item_check_service_class wasn't returning correct results
2015-04-13 16:03:09 -07:00
Mario Vavti
865b602cf8
webpages appearence
2015-04-13 23:38:36 +02:00
Mario Vavti
7c8b9397ae
reverse file activity logic
2015-04-12 13:13:22 +02:00
friendica
3fd2e4b716
program the affinity slider labels
2015-04-09 19:51:58 -07:00
friendica
2619b60721
make sure we redirect to a sane place after deleting a webpage element
2015-04-09 15:45:08 -07:00
friendica
7bec4b313a
system channel always has allow_code privileges
2015-04-08 23:05:36 -07:00
friendica
37afc81847
update features, allow sys account page deletion
2015-04-08 17:54:52 -07:00
friendica
dc2830755d
add common connection count to suggestions
2015-04-07 18:13:10 -07:00
friendica
558246257c
separate the hub query since it changes the logic default and cannot easily be grouped
2015-04-07 13:51:51 -07:00
friendica
5bc7c0e798
add endless scroll to viewconnections module
2015-04-06 22:36:46 -07:00
friendica
3a3563a4b1
commit 59828593c
broke some important poco stuff, looks like the cat might have climbed over the keyboard and deleted something that wasn't intended to be deleted.
2015-04-06 19:00:13 -07:00
friendica
821bbd41e1
Merge https://github.com/redmatrix/redmatrix into pending_merge
2015-04-06 16:14:58 -07:00
friendica
04959a095f
make the findpeople widget honour the local/global directory setting
2015-04-06 16:14:12 -07:00
Klaus Weidenbach
754ac2cff7
Fix Design Tool navigation for sys channel.
...
Fix creating menu for sys channel.
2015-04-06 23:52:13 +02:00
friendica
f1e73abd21
issue #226
2015-04-05 21:32:54 -07:00
friendica
649ada7100
provide ability to have randomised homepage content from a set of pages name home-*
2015-04-02 13:22:48 -07:00
friendica
d599ebe742
update resource links
2015-04-01 15:52:02 -07:00
friendica
6f78d7a85d
fix regdir
2015-03-31 21:06:48 -07:00
friendica
7f6ba91dfa
allow webpage for home to use its own layout file
2015-03-31 17:52:03 -07:00
friendica
cbaa2a9b84
don't included any deleted posts in the self query
2015-03-30 21:06:41 -07:00
friendica
d3c064cc34
title of preview button incorrect, fix ability to upload to webpages
2015-03-30 19:41:42 -07:00
Klaus Weidenbach
d0361582b0
Correcting reported Doxygen syntax warnings.
...
Fixed wrong Doxygen syntax and add some of the available FIXME to
Doxygen documentation.
Updated Doxygen configuration to add also all capital letter tags.
Adding some more Doxygen documentation.
2015-03-29 22:23:00 +02:00
friendica
0bb89778d3
add channel_lastpost timestamp to help optimise some outrageously expensive queries.
2015-03-26 19:55:52 -07:00
friendica
47292c612c
provide ways to over-ride the datetime pickers
2015-03-26 18:03:39 -07:00
friendica
f1a1660709
item_check_service_class - the join is totally unnecessary
2015-03-25 19:13:53 -07:00
friendica
296c4c38bc
improve description of that setting
2015-03-25 17:46:38 -07:00
friendica
75f3f4a808
admin config for default expiration
2015-03-25 17:43:02 -07:00
friendica
022305fe83
also allow service classes to set post expiration. These take priority over the site default.
2015-03-24 20:38:53 -07:00
friendica
c2acab21d4
improve performance of the zotfeed queries
2015-03-23 19:56:10 -07:00
friendica
0f8fdf1a3e
Merge https://github.com/friendica/red into pending_merge
2015-03-23 15:37:13 -07:00
friendica
f2127d4ba7
limit notification detail queries for items and events
2015-03-23 15:36:17 -07:00
Mario Vavti
dd930f180e
sql in -> IN
2015-03-23 11:06:13 +01:00
Mario Vavti
d6ad74c649
indicate new or updated items
2015-03-23 10:59:54 +01:00
friendica
62b2fa6ac7
operation snakebite, cont.
2015-03-22 20:30:23 -07:00
friendica
2bd19e6b51
$simple_update isn't so simple any more. Make sure we don't re-itnroduce the bug that session['loadtime'] was created to fix. It's questionable whether we still need to even look for item_unseen but I won't make that call today. We can also eliminate the restriction on not doing live updates from the discover tab since we aren't relying completely on item_unseen (which can only be set by the owner and won't work on a page with virtual owners).
2015-03-22 15:00:41 -07:00
friendica
f5f194c92b
allow complete undo of a vote, not just a change of vote
2015-03-22 14:55:41 -07:00
friendica
b198cf69cd
Merge https://github.com/friendica/red into pending_merge
2015-03-22 12:56:08 -07:00
friendica
6631540d20
provide visual feedback when deleting a like by liking it again.
2015-03-22 12:55:13 -07:00
Mario Vavti
e345d6793d
move the maintenance part to include/sharedwithme.php
2015-03-22 16:29:57 +01:00
friendica
1b17b0193e
fix multiple vote issues
2015-03-21 17:14:12 -07:00
friendica
b298bc8834
Merge https://github.com/friendica/red into pending_merge
2015-03-21 16:47:46 -07:00
friendica
a2e3ca6fd8
add loadtime search to channel and fix it for home. display and search need further investigation
2015-03-21 16:46:28 -07:00
Mario Vavti
5a1c388d4a
Merge branch 'master' of https://github.com/friendica/red
2015-03-21 15:17:59 +01:00
Mario Vavti
9980645ab8
fix acl for if we have an cid in /network and make $bang better visible
2015-03-21 13:37:55 +01:00
friendica
96afe7bf42
set to empty string so it doesn't get mis-handled as a null
2015-03-20 16:49:49 -07:00
friendica
07f8e7049a
Merge https://github.com/friendica/red into pending_merge
2015-03-20 16:47:38 -07:00
friendica
01716dea3d
config to hide version tag from siteinfo - on my site it's meaningless.
2015-03-20 16:46:07 -07:00
Mario Vavti
ead45292e1
some tabs title statuseditor restructuring
2015-03-21 00:06:18 +01:00
Mario Vavti
9a2ef38267
need the cloudpath before creating the object
2015-03-20 18:04:22 +01:00
Mario Vavti
6698d7b03a
possible improvement regarding deletion
2015-03-20 17:37:01 +01:00
friendica
274a30f2db
call parse_url from rpost and add the result to the content body if invoked with a url argument
2015-03-19 16:41:41 -07:00
friendica
b1fd6c53a5
tweaks to directory registrations which don't seem to be happening, also downgrade any directory that claims to be a primary directory for RED_GLOBAL.
2015-03-19 15:56:30 -07:00
friendica
63683734a2
make the channel item query match recent changes to network item query (and some slightly older changes in display item query), and allow '@' in linkified urls.
2015-03-18 19:06:05 -07:00
friendica
629f6bec74
ok it has to be owner.
2015-03-17 15:45:08 -07:00
friendica
7af012b1f9
The random bad signatures are because something somewhere is trimming the body text. It could be any one of hundreds of functions that touch the message body. We really want to trim the body text, so I'm putting back all the trim statements - in mod/item and item_store and item_store_update. The last fix for random bad sigs noted that one of the trims wasn't there, so the others were removed. The correct fix is for all the trims to be there. We will probably have a few (quite a few) bad sigs during the transition back to trimmed text but this should nail it for anybody on recent code and with new content.
2015-03-17 00:13:47 -07:00
friendica
bc22df9057
display a map for photos if allowed. Note: there is a bug in that if the map div starts with display:none one needs to reload the frame or zoom in or they end up at minimum resolution. Still trying to sort this out.
2015-03-16 22:06:03 -07:00
friendica
178b768e3c
openid cleanup
2015-03-16 17:08:50 -07:00
friendica
ccf4734f7b
make sure this sucker is quiet
2015-03-16 15:50:45 -07:00
friendica
52374bcd6e
phase one of the great file storage unification - use one button for uploads of any type (image or attachment). We'll sort out which one it is and deal with it appropriately.
2015-03-16 15:33:08 -07:00
friendica
6da40fc559
mod_id: load profile so the sidebar profile will work
2015-03-15 16:48:45 -07:00
friendica
6537a65053
mysql schema typo, do the install check for store before chcking smarty, as that is where the dir is created, change install doc to point to install/schema_xxxxx.sql instead of database.sql
2015-03-15 15:36:01 -07:00
friendica
cc2c7bbcd8
revert the revert - that is working. My test was bad.
2015-03-14 01:03:37 -07:00
friendica
88167718ba
revert and rethink
2015-03-14 00:51:16 -07:00
friendica
b76cdf82d2
create terms for Diaspora mention tags - which in Diaspora are handled differently than other tag links and have to be done separately; they aren't processed by linkify_tags which handles all of our other tag processing. Also move the abook_channel clause in mod_network to the join statement. This works fine in mysql and achievies the desired result. I hope postgres can handle an expression as a join clause.
2015-03-13 19:24:17 -07:00
zottel
e732fbe8e8
fix posts not showing up in network if author is not in connections
2015-03-14 00:22:47 +01:00
friendica
7d5efe88e0
use local_channel() connnections to match the abook against when joining the abook on the discover tab.
2015-03-13 15:39:19 -07:00
friendica
c412e6e640
revert that
2015-03-12 20:51:36 -07:00
friendica
93caead072
try to allow translation of ax regs
2015-03-12 20:43:53 -07:00
friendica
d60cb14c2f
support a fair number of the common AX regs
2015-03-12 20:05:43 -07:00
friendica
f2d84608af
Add some AX vars to openid server.
2015-03-12 18:48:32 -07:00
friendica
02a58dc5b0
more JS=1 weirdness
2015-03-12 16:20:29 -07:00
friendica
71f2a797cb
try and add some regs
2015-03-12 15:19:54 -07:00
Mario Vavti
d11bec6f58
add generic_addon_settings template and minor fixes
2015-03-12 22:22:52 +01:00
Mario Vavti
0905180385
Merge branch 'master' of https://github.com/friendica/red
2015-03-12 10:20:21 +01:00
Mario Vavti
8113ee1c4a
some work on feature/addon settings
2015-03-12 10:19:56 +01:00
Habeas Codice
1578c49976
substr() is a mysql alias for substring(). substring() is in the SQL standard and is supported by both
...
databases.
2015-03-12 00:28:49 -07:00
friendica
76fedfe1f8
openid stuff
2015-03-11 21:49:29 -07:00
friendica
64ae17aa6a
Merge branch 'master' into openid
2015-03-11 19:35:23 -07:00
friendica
b3a9a6c802
remove the now redundant audio/video buttons and label the editor text style buttons which didn't have them. Unused editor buttons were commented in case we need to bring them back. If things go smoothly we can remove them. Use the link icon going forward - for all links.
2015-03-11 18:56:28 -07:00
friendica
d6ce32ef78
parse_url changes for oembed/zvideo/etc.
2015-03-11 17:31:15 -07:00
friendica
a40c19d19d
Merge branch 'master' into openid
2015-03-11 01:03:30 -07:00
friendica
bfd123c59a
openid server
2015-03-11 01:03:14 -07:00
friendica
844b2ae587
cleanup of old delegation stuff
2015-03-10 20:19:17 -07:00
friendica
9d1df58759
sql optimisation for affinity searches. A new index was added which wasn't added retro-actively to existing DBs as an update. It isn't clear if this helps sites any more than just restricting the abook table to certain channel_id's is (and this field is already indexed).
2015-03-10 18:55:56 -07:00
friendica
5b35f1e6c4
Change logic of "don't create a status post for this photo upload" and turn it into a bona-fide on/off toggle. This takes up one more vertical line, but we have it to spare, and the single button (while concise visually) provided no feedback of the current state, or indicate whether a second click toggled it. Some addons use this setting so addons will need to be pulled when this is pulled in order to remain in sync.
2015-03-10 15:43:15 -07:00
friendica
3466547784
missing include
2015-03-10 02:27:10 -07:00
friendica
98dffd77ef
channel delegation
2015-03-10 02:23:14 -07:00
friendica
0134a41015
more work on queue optimisations
2015-03-09 19:57:35 -07:00
Habeas Codice
a611eed172
Whoops... should've actually checked the pg manual before merging #920 :-)
...
replace if(cond,val,val) with case when cond then val else val end, works on
both DBs
2015-03-09 17:54:14 -07:00
friendica
26a414fe4b
make network page default options work more or less universally instead of just from the navbar, and fix some saved-search weirdness related to the delete-term icon
2015-03-09 16:27:12 -07:00
friendica
16bcca6aab
up the count of directory tags
2015-03-09 15:24:05 -07:00
friendica
e7d3244276
Allow site to over-ride directory options. Bugger off.
2015-03-09 15:16:52 -07:00
friendica
aff7588832
fix comanche regions after comanche refactor a few days ago
2015-03-09 00:44:58 -07:00
habeascodice
f7d1fb9c5a
Merge pull request #920 from dawnbreak/master
...
Add alert to admin page about old PHP version. Fixing (un)blocking accounts in admin.
2015-03-08 16:51:42 -07:00
Klaus Weidenbach
c6d45858bb
Fixing (un)blocking accounts in /admin/users.
...
When I look at the instructions in sql_conventions about setting bit
flags I don't understand how this could have worked before. Changed the
behavior for (un)blocking so that it should work now.
2015-03-08 22:22:45 +01:00
Klaus Weidenbach
23ea974615
Add alert to admin page about old PHP version.
...
Add an alert message to admin summary page when a PHP version < 5.4 was
detected as this has reached EOL and will not be supported with the new
SabreDAV library.
Some styleguide optimisation.
Add NULL_DATE example to doc/sql_conventions.bb.
Display a "0" when no plugins active in summary page.
Added some more numbers to summary admin page, expired accounts,
channels. Hope I interpreted them right. I have no idea how to get
blocked accounts.
2015-03-08 17:51:58 +01:00
friendica
1351f9c81a
Merge https://github.com/friendica/red into pending_merge
2015-03-07 15:22:00 -08:00
friendica
aac4affe65
directory: fix public forum listing
2015-03-07 15:21:23 -08:00
Mario Vavti
9cd7546be5
hopefully fix #919
2015-03-07 15:56:28 +01:00
friendica
53e908d7b7
when fixing "naked links" make sure not to double link double urls as seen in archive.org - which has the complete unescaped target url, scheme and all, as part of its own.
2015-03-06 20:45:26 -08:00
friendica
73891dc582
reverse smilie storage also
2015-03-06 03:04:04 -08:00
friendica
f6da235a7d
major cleanup of directory options
2015-03-05 23:31:01 -08:00
friendica
bd4d2f3b44
make alpahabetic searches start with A
2015-03-05 19:16:50 -08:00
friendica
ea8ea5a351
reverse the logic of "don't show emoticons" setting which seems awkward
2015-03-05 18:30:15 -08:00
friendica
22391a2437
straighten out some directory stuff, which required some Comanche structural changes
2015-03-05 18:24:49 -08:00
friendica
ec5c989352
make destructive queue management functions an expert option
2015-03-05 15:53:25 -08:00
Mario Vavti
3fa4123161
only allow theme selection forms if there are any themes to select
2015-03-05 12:47:18 +01:00
Mario Vavti
beace0f57a
more yes/no labels
2015-03-05 10:20:49 +01:00
friendica
76eb0a7e56
Deprecate the "wall uploads" photo album. Photo uploads (from any source) with no album specified will go now into an album based on YYYY-MM.
2015-03-04 18:55:17 -08:00
friendica
410f3335a9
parse_url: if url returns an image/audio/video file instead of a webpage, return the bbcode for the appropriate content type. This results in two web fetches of the url in question, but the first one is just a HEAD. This way we won't try and download and parse an entire video. TODO: img's are checked to see if they should be zid-ified, but audio/video currently are not.
2015-03-04 15:17:39 -08:00
friendica
39c17adc0b
remove broken sql query from early queue manager.
2015-03-04 11:20:52 -08:00
friendica
684ce972fe
Merge https://github.com/friendica/red into pending_merge
2015-03-04 02:35:20 -08:00
friendica
fb0f823be7
provide a list of potential addons and what they do for members who can't see the descriptions on the admin/plugins page
...
Not all of these are in red-addons repository, please add any that haven't been listed. We should probably provide a list of addon repositories at the end.
2015-03-04 02:32:59 -08:00
Mario Vavti
e5e96dfbff
cleanup removeaccount
2015-03-04 11:11:36 +01:00
Mario Vavti
431a462d60
cleanup removeme
2015-03-04 11:01:16 +01:00
Mario Vavti
eceafd5777
fix wording
2015-03-04 10:26:25 +01:00
Mario Vavti
4b08ccd873
clean up account settings
2015-03-04 10:11:48 +01:00
friendica
df90677f90
add the tag hijacking preference to Diaspora settings
2015-03-03 17:43:13 -08:00
friendica
d83460cd2a
The never ending saga of parent = 0 bugs on Dreamhost.
2015-03-01 18:58:50 -08:00
friendica
bc1afbc762
Merge https://github.com/friendica/red into pending_merge
2015-03-01 15:57:56 -08:00
friendica
ba7bdd79b7
queue management actions. Still needs further work such as indication of last successful connection or indication that the hub was marked offline, but these are potentially expensive queries.
2015-03-01 15:55:27 -08:00
Mario Vavti
af06766627
provide some more yes/no labels
2015-03-01 16:59:44 +01:00
friendica
05dff886c8
don't report already delivered queue items in admin queue summary
2015-02-26 20:07:08 -08:00
friendica
a00c072f02
high level queue inspector - needs a lot more, like the ability to dump certain destinations and indicating known dead sites, but this is a start
2015-02-26 20:00:47 -08:00
friendica
2a2cc309ce
solve some (hopefully most) missing delivery issues
2015-02-25 01:39:45 -08:00
friendica
08f054130f
require access token to view, query, or join directories in private realms, if the realm is so configured.
2015-02-24 16:36:27 -08:00
friendica
1383915f86
notes about private realm registrations and multiple primary directories.
2015-02-22 22:58:09 -08:00
RedMatrix
035441550c
Merge pull request #908 from zzottel/master
...
set html title to item title in channel/mid and display pages
2015-02-21 08:29:14 +11:00
RedMatrix
912c9fdd58
Merge pull request #907 from tuscanhobbit/dev
...
Added version tag to siteinfo/json
2015-02-21 08:26:31 +11:00
zottel
48080d4103
correct indent
2015-02-20 14:11:28 +01:00
zottel
2c7e8bea88
show item title in channel/mid and display pages
2015-02-20 14:07:56 +01:00
Paolo Tacconi
2765500844
Fixes to version tag in siteinfo/json
2015-02-20 10:29:33 +01:00
Paolo Tacconi
5aad4a19f8
Added version tag to siteinfo/json
2015-02-20 10:09:59 +01:00
friendica
3ea77f0c10
INSTALL: 'store' is created during setup but not 'store/[data]/smarty3' and we explicitly check for the latter and report that it isn't there or isn't writable. Doh.
2015-02-19 15:14:14 -08:00
friendica
e00be4de23
The Diaspora communications policies allow comments to public posts literally from anybody. Allow this policy model by default for commenters from that network. This policy decision can be set or disabled on the addon/features settings page.
2015-02-17 19:47:36 -08:00
friendica
533f39debe
bring back like/dislike summaries on photos
2015-02-16 17:01:13 -08:00
friendica
b4f639239f
mopping up the public site ratings
2015-02-16 11:09:12 -08:00
friendica
a1c4bbfa5c
quick fix for photos page until calls to like_puller() are fixed
2015-02-16 01:22:11 -08:00
friendica
eb3c5916d7
pubsites ratings (mod/pubsites really really needs to be templatised, this was quick and dirty)
2015-02-16 01:17:15 -08:00
friendica
1c4b919980
force site_url to be lowercase when stored. Otherwise rating hubs on postgres could get real messy.
2015-02-15 23:45:22 -08:00
friendica
8774089005
preparatory work for site ratings
2015-02-15 21:22:05 -08:00
friendica
2e3daf77bb
site firehose
2015-02-15 20:20:23 -08:00
friendica
9067d4c157
taganyone wasn't working
2015-02-15 18:38:26 -08:00
friendica
0249fbb7e6
lost ability to delete events
2015-02-15 16:04:59 -08:00
friendica
7ad425bbda
failure to auto update comments if it's your own.
2015-02-14 21:57:47 -08:00
friendica
4b513d3322
issue #896
2015-02-12 19:22:07 -08:00
friendica
084ca3f4a1
typo
2015-02-12 18:49:42 -08:00
friendica
da2349bb6a
provide relief to sites that are severely impacted by the slow ITEM_UNSEEN searches. This does not incorporate any other flag optimisations as that will require a major DB update and possibly involve significant downtime. This is just to bite off a little chunk now and provide some much needed relief.
2015-02-12 17:45:25 -08:00
friendica
c62d605608
well that was certainly fun. And the reason why likes and other acitivity deletions weren't propagating. Hopefully this is the last reason and there aren't more lurking further down the chain.
2015-02-11 16:11:21 -08:00
friendica
79223b6b3d
item voting tools
2015-02-10 19:10:18 -08:00
friendica
79da33dafd
improvements in duplicate like detection, especially w/r/t event participation
2015-02-10 17:49:46 -08:00
friendica
268691ffb4
correct the object type if it isn't stored/linked to an item yet
2015-02-10 01:05:49 -08:00
friendica
81e7b47b76
more progress on event confirmations
2015-02-10 00:11:37 -08:00
friendica
fce51876c9
bring some styling back to the colorbox and improve the event preview ability
2015-02-09 18:58:43 -08:00
friendica
ed810a360f
event form - provide map ability for location field and add preview ability
2015-02-09 15:57:22 -08:00
friendica
0e74ebc6a9
title missing sending to diaspora (which doesn't support titles but let's not go there).
2015-02-09 15:12:15 -08:00
friendica
b31fe5c55d
help text for the "adjust for viewer timezone" toggle switch since you apparently need an IQ of 230 or greater to be able to use it correctly.
2015-02-08 23:37:34 -08:00
friendica
08b757a22c
Merge branch 'master' into tres
...
Conflicts:
mod/events.php
view/css/mod_events.css
2015-02-08 20:57:37 -08:00
friendica
b8add899a2
undo extra logging
2015-02-08 19:28:18 -08:00
friendica
7893b64955
make default calendar view ambivalent to the state of the ignore flag.
2015-02-08 15:14:45 -08:00
friendica
11dfeb652b
Merge https://github.com/friendica/red into pending_merge
2015-02-08 13:53:46 -08:00
friendica
9b1c09fe83
restrict "mark all events seen" to only the events that are presented in the notification view.
2015-02-08 13:52:46 -08:00
marijus
712bc643b5
revert to get_rel_link()
2015-02-06 11:34:23 +01:00
marijus
ed050e8ede
fix objurl until get_rel_link() gets sorted
2015-02-06 10:40:55 +01:00
friendica
e7a68eaef0
style the checkboxes in the event form
2015-02-05 21:01:02 -08:00
friendica
4b348d2489
Merge branch 'master' into tres
...
Conflicts:
view/css/mod_events.css
view/theme/redbasic/css/style.css
2015-02-05 19:38:43 -08:00
friendica
abcc70722c
event form cleanup backported from trinidad - still need to style the checkboxes
2015-02-05 19:37:55 -08:00
friendica
561bab4ece
remote rating and addition of rate-me to channel profile sidebar
2015-02-04 17:32:29 -08:00
friendica
1ceb0a7fba
hide channel address in directory from hovertip if not logged into the matrix
2015-02-03 23:36:37 -08:00
friendica
0357180164
remove extra debugging
2015-02-03 23:33:06 -08:00
friendica
127bf82187
probably enough for now - couldn't get the censorship filter in today, I think that's the only bit missing.
2015-02-03 23:30:07 -08:00
friendica
0cc29af6d0
order ratings friends first
2015-02-03 22:55:01 -08:00
friendica
4ead2cd79d
final cleanup on ratings feature
2015-02-03 21:19:29 -08:00
friendica
86771547e6
finish off the sync functions
2015-02-03 18:35:54 -08:00
friendica
17ffe122b3
ratings - mopping up, most everything but directory sync implemented
2015-02-03 18:10:55 -08:00
friendica
5cb2f55dbb
rating form work
2015-02-03 16:52:09 -08:00
friendica
c417a43338
styling for the directory page when it comes to ratings
2015-02-03 15:50:12 -08:00
friendica
36b756e4cd
honour block public setting - especially for standalones
2015-02-03 15:16:03 -08:00
friendica
df632c4232
run ratingsearch on the server
2015-02-03 15:06:16 -08:00
friendica
4362aa4c26
for now punt if have no poi, but we should get it from the server
2015-02-03 11:18:00 -08:00
friendica
6067274b51
start to tie ratings to the directory page
2015-02-02 23:58:44 -08:00
friendica
77379029f5
add ratings to the directory sync arrays
2015-02-02 21:07:46 -08:00
friendica
1807db6cb0
send rating information to directories
2015-02-02 20:13:07 -08:00
friendica
fa710106e5
sign the ratings, fix the bugs
2015-02-02 17:58:51 -08:00
friendica
03bb236651
Merge branch 'master' into pocorate
2015-02-02 17:33:55 -08:00
friendica
fb6deb113b
improved directory registration - honour standalones and do the right thing
2015-02-02 17:32:54 -08:00
friendica
125ebfeb0c
add signatures
2015-02-02 16:54:55 -08:00
friendica
aafed50a0e
Merge branch 'master' into tres
2015-02-01 20:30:47 -08:00
friendica
e58bef049d
admin/dbsync not reporting failed updates
2015-02-01 15:41:01 -08:00
friendica
b1a92d620e
two tracks proceeding in parallel - first adding the ability to store a digital signature with ratings so that directories can pass them around, second provide some directory registration functions so we can obtain a list of directories from somewhere (to pass ratings around between them). This gives the primary directory role some value as that is where you register your directory.
2015-02-01 15:10:52 -08:00
friendica
e6a5f78003
Merge branch 'master' into tres
...
Conflicts:
include/zot.php
2015-01-31 00:50:20 -08:00
RedMatrix
b381579959
Merge pull request #881 from cvogeley/master
...
Add allowed and not allowed emails to the UI in the
2015-01-30 18:14:10 +11:00
friendica
4a243b63f7
cleanup event form and various required indicators on inputs
2015-01-29 20:09:48 -08:00
friendica
3e22de0be0
how did that stuff merge? grrrr....
2015-01-29 18:17:24 -08:00
friendica
43f5fbddc6
enable ratings only in this branch until we're ready to push
2015-01-29 15:21:50 -08:00
friendica
df6d54c64e
Merge branch 'master' into pocorate
2015-01-29 15:21:19 -08:00
friendica
d7dae3c72a
Merge https://github.com/friendica/red into pending_merge
2015-01-29 15:19:16 -08:00
friendica
e2edc2c968
disable ratings until we're a bit further along. It's all changing.
2015-01-29 15:17:50 -08:00
friendica
912be23e16
Merge branch 'master' into tres
...
Conflicts:
include/group.php
include/text.php
mod/acl.php
mod/channel.php
mod/connections.php
mod/display.php
mod/group.php
mod/item.php
mod/locs.php
mod/network.php
mod/photos.php
mod/ping.php
mod/starred.php
mod/viewsrc.php
2015-01-29 15:09:35 -08:00
friendica
ff68ea6087
more message restrict conversions
2015-01-29 14:51:41 -08:00
Christian Vogeley
f81df92ef8
Add allowed and not allowed emails to the UI in the
...
admin menu
2015-01-29 20:27:35 +01:00
RedSwede
bee939d79a
fix issue 848 + code comments
2015-01-29 16:06:39 +01:00
friendica
fd0b6c967f
Merge branch 'master' into pocorate
2015-01-29 00:28:23 -08:00
friendica
c993ddd86e
prate module
2015-01-29 00:28:02 -08:00
friendica
b9a760783d
Merge https://github.com/friendica/red into pending_merge
2015-01-28 21:11:07 -08:00
friendica
e157371c39
remote_user => remote_channel
2015-01-28 20:58:59 -08:00
friendica
a496036066
local_user => local_channel
2015-01-28 20:56:04 -08:00
Habeas Codice
d59bd31a68
Merge branch 'master' of https://github.com/friendica/red
2015-01-28 17:40:39 -08:00
friendica
9b3b0b5e88
basic query for number of raters. Should probably be a join or subselect but that will take a bit more fiddling
2015-01-28 17:39:53 -08:00
Habeas Codice
64181abc6f
fix implicit boolean
2015-01-28 17:34:53 -08:00
friendica
1ef2d1c5c4
updates to put rating info into the local xlink before sending it to known directory servers
2015-01-28 16:52:17 -08:00
marijus
87814670c1
no need for new line here - spacing is done via css
2015-01-28 08:56:56 +01:00
friendica
a2cdd1499c
Merge branch 'master' into tres
...
Conflicts:
include/socgraph.php
2015-01-27 20:00:43 -08:00
friendica
145b30adfc
allow RSS connections in the type 'a' autocomplete results as that is used for channel sources. Without it a feed cannot be selected as a channel source.
2015-01-27 18:34:18 -08:00
friendica
525c62ab1d
Merge https://github.com/friendica/red into pending_merge
2015-01-27 11:48:39 -08:00
friendica
f62383e648
allow doc/help system to use subdirs
2015-01-27 11:48:10 -08:00
marijus
65aa6cf708
move userReadableSize() and getIconFromType() from /include/RedDAV/RedBrowser.php to include/text.php and add template for mod/sharedwithme
2015-01-27 19:00:16 +01:00
friendica
efb6842d74
superblock enhancements
2015-01-26 20:47:53 -08:00
friendica
ac594183c6
Merge branch 'master' into tres and add some work on the item_deleted flag refactor
...
Conflicts:
include/attach.php
include/onedirsync.php
include/zot.php
mod/locs.php
2015-01-26 18:27:03 -08:00
friendica
d73972e8e2
provide a json feed of search results
2015-01-26 17:09:33 -08:00
friendica
b428fdf66e
abstract poco into a single function in socgraph so we can provide different wrappers for it providing slightly different functionality.
2015-01-25 16:27:09 -08:00
friendica
0125e9d288
Hide all the scary decision making stuff that sends intellectually challenged beings into siezures and brain melt-downs and online freak-outs.
2015-01-25 14:06:57 -08:00
friendica
4ca2ec7638
rework the new connection stuff so we don't need a "permissions have been changed but not saved" message.
2015-01-25 13:30:40 -08:00
anaqreon
1cbfe5adf1
misspelling
2015-01-25 15:49:07 -05:00
Habeas Codice
1d80bcf2e7
standardize sql
2015-01-24 21:16:43 -08:00
Habeas Codice
0405f2bcb9
Merge branch 'master' of https://github.com/friendica/red
2015-01-23 17:26:37 -08:00
Habeas Codice
891d231bbe
rand() fixes
2015-01-23 17:25:05 -08:00
marijus
0cbe64c360
some more kiss
2015-01-24 01:13:02 +01:00
marijus
8789c96e78
some code restructure
2015-01-23 14:50:39 +01:00
friendica
4c2a1e572a
start on item_restrict conversion
2015-01-22 21:04:54 -08:00
friendica
6e0e3b2433
more expanding item flags
2015-01-22 18:41:10 -08:00
friendica
e46eba1258
heavy lifting converting item flag bits
2015-01-22 17:41:16 -08:00
marijus
e874376268
this will require more fixing in include/enotify
2015-01-23 02:09:28 +01:00
marijus
87dcc4c145
possible performance improvement for sharedwithme update query
2015-01-22 22:50:38 +01:00
Habeas Codice
c05f0ec407
Merge branch 'master' of https://github.com/friendica/red
2015-01-21 21:27:07 -08:00
Habeas Codice
6d291d880e
directory server dba sql fixes
2015-01-21 21:25:50 -08:00
marijus
cad8228db3
Merge branch 'master' of https://github.com/friendica/red
2015-01-22 04:58:34 +01:00
marijus
3731ff97ff
make $links an array of links
2015-01-22 04:57:59 +01:00
friendica
b946ac63a1
couple of hubloc manager issues
2015-01-21 19:09:12 -08:00
friendica
0010eaa411
Merge https://github.com/friendica/red into pending_merge
2015-01-21 18:34:31 -08:00
friendica
8472e706bc
hubloc manage issue
2015-01-21 18:34:15 -08:00
marijus
4ff71fc0c7
change mod/sharedwithme backend to use activity object - this is not backwards compatible
2015-01-22 02:34:38 +01:00
friendica
29436081a8
slow progress removing bitfields on item table
2015-01-21 16:06:25 -08:00
friendica
51848c6190
working through the xchan table to remove bitfields, mostly complete except for updating the updater
2015-01-20 19:33:19 -08:00
friendica
ee3eee425c
that should take care of the bitfields in hubloc
2015-01-20 16:13:18 -08:00
friendica
6f11f20992
first cut at unpacking bitfields in hubloc, fixed hubloc_error and hubloc_deleted
2015-01-20 15:35:42 -08:00
RedMatrix
39dad87adc
Merge pull request #862 from pafcu/help
...
Add some database documentation + mod/help.php bugfix
2015-01-19 10:19:08 +11:00
marijus
b4faf4d90b
fix link
2015-01-18 15:31:13 +01:00
marijus
9ac0922ff2
fix goaway link
2015-01-18 15:29:05 +01:00
marijus
973398b915
fix profile tabs link
2015-01-18 15:15:48 +01:00
marijus
1c2d956d7f
basic proof of concept file activity support - will send activity via the filestorage module and via attach_delete()
2015-01-18 14:44:58 +01:00
Stefan Parviainen
319b279b3a
Don't try to open unexisting files in help
2015-01-18 10:26:05 +01:00
friendica
8f8700ddd2
mod_prep usability enhancements, doc updates
2015-01-16 00:53:04 -08:00
friendica
ec4d3a2349
fix to poco chatrooms
2015-01-15 20:56:55 -08:00
friendica
43254029ad
errors in mod_poco
2015-01-15 20:43:53 -08:00
friendica
dfe31dc3b7
more heavy lifting on poco rep
2015-01-15 19:05:42 -08:00
friendica
9c15844845
make sure mod/prep follows the poco_rating allow preference
2015-01-15 17:50:24 -08:00
friendica
597b07e8cc
poco rating - add a test module for pulling out ratings
2015-01-15 17:32:41 -08:00
friendica
e7932d97a2
editing stuff for poco reputation
2015-01-15 16:37:47 -08:00
friendica
1c9299ed42
more backend work on poco rating
2015-01-15 14:05:18 -08:00
friendica
56bc3bcdce
provide correct permissions role default for old-timers that didn't have any role configured.
2015-01-14 19:27:55 -08:00
friendica
168b67fa41
correct some activity object types (for comments), also fix a foreach warning resulting from recent tag work
2015-01-14 18:36:23 -08:00
friendica
7a24943c34
some back-end code to support location activity objects. Work in progress.
2015-01-14 14:46:01 -08:00
friendica
1005618faf
honor disable_discover_tab in mod/home - it isn't a tab here but basically block public content from showing if it's set.
2015-01-14 13:52:34 -08:00
friendica
a93f2b1b8f
now that's useful...
2015-01-13 18:41:11 -08:00
friendica
dfdef0af0d
provide a setting to control ALLOWCODE permissions at the channel level - it isn't always appropriate to apply this to all channels in an account.
2015-01-13 18:30:30 -08:00
friendica
98acefe228
revert recent 3.0 changes to mod/cloud so we can work on this completely in another branch and not destabilise core
2015-01-13 18:12:04 -08:00
friendica
111bbe65d9
Merge branch 'moretagging' of git://github.com/pafcu/red into pafcu-moretagging
...
Conflicts:
mod/profiles.php
2015-01-13 18:07:49 -08:00
friendica
e528483d81
hide friends broken, add parameter for item search by verb
2015-01-13 14:42:54 -08:00
Stefan Parviainen
47a2668b30
Allow tags in event description and location
2015-01-13 18:23:52 +01:00
Stefan Parviainen
93735df2c7
Allow tags in mail, many profile fields, and admin info
2015-01-13 17:54:40 +01:00
friendica
1b3e52af2d
theme toggle issue when viewing mod/cloud of another channel
2015-01-12 18:33:39 -08:00
friendica
2f9fe0280e
document the pros and cons of the not-yet written hassle-free connection auto-permission setting.
2015-01-12 17:20:28 -08:00
friendica
cdc52ba884
change deletion behaviour of linked photo items. Previously deleting the visible item in the conversation deleted the photo as well. Now photos must be deleted in the photos module. Deleting the linked item removes any attached conversation elements (likes, etc.) and sets the conversation item to hidden. This may create an issue in the future if we move the photo tags, title, or other photo elements to the linked item rather than the photo. Noting here so this can potentially be discovered and remembered at that time.
2015-01-12 16:27:27 -08:00
friendica
9fc9af87e3
Merge https://github.com/friendica/red into pending_merge
2015-01-12 11:26:11 -08:00
friendica
962c6207ae
double perms msg
2015-01-12 11:25:48 -08:00
Stefan Parviainen
adc9564b5c
Refactor mention code to make it more reusable
2015-01-12 20:01:07 +01:00
friendica
580c30f516
another attempt to explain default permissions on connedit page
2015-01-11 21:18:29 -08:00
friendica
a088a8f03c
remove extraneous debug file left over from postgres work.
2015-01-11 20:02:24 -08:00
friendica
3f4f3e244a
that was not intended to be merged with master yet. Put it under a define
2015-01-11 15:22:58 -08:00
friendica
0259051a87
basic backend work for creating consensus items
2015-01-11 14:41:33 -08:00
friendica
b018b39e64
Merge branch 'master' into trinidad
2015-01-11 14:02:27 -08:00
Christian Vogeley
f0c7612bcd
Merge remote-tracking branch 'upstream/master'
...
Conflicts:
doc/html/classRedmatrix_1_1Import_1_1Import-members.html
doc/html/classRedmatrix_1_1Import_1_1Import.js
2015-01-11 16:22:59 +01:00
Christian Vogeley
43f143a211
Fix for issue #763 Error creating new channel within the limits of the
...
subscription plan
2015-01-11 16:12:36 +01:00
friendica
4c31598555
Merge branch 'master' into trinidad
2015-01-10 14:59:24 -08:00
friendica
10102ac2ac
connection clone issues
2015-01-10 14:59:10 -08:00
friendica
df0f67843e
Merge branch 'master' into trinidad
2015-01-10 13:05:04 -08:00
Habeas Codice
0368fe49f3
Fix unescaped image data
2015-01-10 11:08:37 -08:00
marijus
978d78b953
basic changes for file activity
2015-01-09 15:18:45 +01:00
friendica
fab09ef1bc
Merge branch 'master' into trinidad
2015-01-08 16:03:30 -08:00
pafcu
80c77b7f92
Merge pull request #833 from pafcu/oneautocompleter
...
Fixes for the new autocompletion
2015-01-08 18:25:38 +02:00
Stefan Parviainen
32c6eab01c
Fix saved searches on network page, fix caching mith multiple autocompleters
2015-01-08 17:16:08 +01:00
Stefan Parviainen
833d51527b
Honor requested count in navbar search
2015-01-08 16:05:00 +01:00
friendica
0657195125
Merge branch 'master' into trinidad
2015-01-07 14:39:09 -08:00
friendica
087d6744fc
Merge https://github.com/friendica/red into pending_merge
2015-01-07 14:39:07 -08:00
friendica
ce953e2f41
syncing connections issue, incorrect return_url after deleting connection
2015-01-07 14:35:03 -08:00
Stefan Parviainen
f2e648308c
Return results from acl.php in standard form
2015-01-07 20:45:00 +01:00
Stefan Parviainen
34ecbcceea
Make nav search use textcomplete
2015-01-07 19:39:50 +01:00
friendica
3ef487418d
don't allow admin to delete the sys channel from the channel manage page
2015-01-06 20:12:34 -08:00
friendica
c05586fbe7
begin the grand unification for 3.0. Start by splitting DAV into a web accessible component and a DAV accessible component so that we can eliminate the http-auth prompts for web-accessed resources.
2015-01-06 11:55:42 -08:00
friendica
39459c2d65
undo these bits of trinidad - we're going to do things differently
2015-01-05 18:22:15 -08:00
friendica
aa18a43eff
Merge branch 'master' into trinidad
2015-01-04 14:54:37 -08:00
friendica
3983348b96
the last checkin removed hostname from the address for autocomplete searches. This one allows it if explicitly added with a '@'. So 'mike' will find all mikes. 'mike@z' will find mike@zothub but not mike@popcorn.
2015-01-04 14:51:41 -08:00
friendica
47526cdecf
Merge branch 'master' into trinidad
2015-01-04 14:48:14 -08:00
friendica
57d8271eba
only check the LHS of xchan_addr for autocomplete, don't match on the hostname.
2015-01-04 14:47:08 -08:00
friendica
82a37ebae3
Merge branch 'master' into trinidad
2015-01-04 12:30:51 -08:00
RedMatrix
ebb1a61684
Merge pull request #816 from pafcu/acl
...
Autocomplete improvements
2015-01-05 07:30:07 +11:00
Stefan Parviainen
cb181993a8
Fix wrong require
2015-01-04 14:54:52 +01:00
Stefan Parviainen
ac4c17dd4c
Typo
2015-01-04 14:31:27 +01:00
Stefan Parviainen
57809f20a4
Sorting of autocomplete
2015-01-04 14:23:23 +01:00
Stefan Parviainen
386f361855
Autocmplete suggestions for non-local users, also suggest from visited channel's connections
2015-01-04 12:54:23 +01:00
friendica
edd1ad37c4
Merge branch 'master' into trinidad
2015-01-04 00:48:18 -08:00
marijus
0779e3ae53
provide some info for buttons
2015-01-03 13:42:05 +01:00
friendica
1ef1d1c2b7
Merge branch 'master' into trinidad
2015-01-02 19:22:46 -08:00
friendica
31648d65c8
some work on the edit connection workflow explanation and connedit page. This needs a lot more attention, but it was screaming for any improvement in documenting why we tell you that the permissions have been changed but not saved.
2015-01-02 19:20:52 -08:00
friendica
3157304bbd
Merge branch 'master' into trinidad
2015-01-02 17:26:38 -08:00
pafcu
0e4a10c7ec
Merge pull request #810 from pafcu/aclsort
...
Sort acl results according to match position (only type='c' for now)
2015-01-02 13:19:18 +02:00
Stefan Parviainen
6b5f8bfbe4
Sort acl results according to match position (only type='c' for now)
2015-01-02 12:08:36 +01:00
friendica
8b844ed978
Merge branch 'master' into trinidad
2015-01-01 23:48:27 -08:00
friendica
c7aa8bf1b4
syntax issues (with some php versions?), unchecked intval
2015-01-01 23:47:14 -08:00
friendica
82d0a4af45
Merge branch 'master' into trinidad
2015-01-01 22:33:28 -08:00
friendica
68c612c597
fix shares that are processed with markdown (regression, this was pulled from diaspora2bb a couple weeks back as it was affecting diaspora input, but here we're dealing with red input only)
2015-01-01 22:30:54 -08:00
RedMatrix
817b54688e
Merge pull request #805 from pafcu/moretpl
...
Move some HTML out to templates
2015-01-02 12:10:50 +11:00
Stefan Parviainen
85e76773a0
Use grouped select field for role selection
2015-01-01 15:54:16 +01:00
Stefan Parviainen
686b6ee118
Use grouped select field for timezone selection
2015-01-01 14:44:50 +01:00
Stefan Parviainen
70f0019905
Checkboxify yesno-fields, but use CSS to show them as switches in Redbasic
2015-01-01 10:08:20 +01:00
friendica
abd345f80f
Merge branch 'master' into trinidad
2014-12-30 15:25:06 -08:00
RedMatrix
ae9d08267c
Merge pull request #797 from anaqreon/imagelink
...
Imagelink
2014-12-31 10:23:50 +11:00
RedMatrix
4a82967639
Merge pull request #791 from pafcu/notifications
...
Improved notifications
2014-12-31 10:21:38 +11:00
Andrew Manning
c49b521884
Added url tag around image for inserted links
2014-12-30 16:16:57 -06:00
pafcu
0623b47237
Merge pull request #793 from pafcu/filestorageurlfix
...
Encode URL offered in filestorage. Fixes #780
2014-12-30 22:40:53 +02:00
Stefan Parviainen
f6b16e1d5a
Encode URL offered in filestorage. Fixes #780
2014-12-30 18:11:45 +01:00
Stefan Parviainen
e6a3ea2c95
Make showing wall posts, intros and private messages under Notices optional
2014-12-30 15:27:33 +01:00
Stefan Parviainen
2710510392
Sort notifications
2014-12-30 15:21:29 +01:00
marijus
8e034a3b6b
fix recursive file permissions
2014-12-30 13:56:27 +01:00
friendica
2f650b74d3
Merge branch 'master' into trinidad
2014-12-29 23:58:14 -08:00
friendica
5cfe051139
initial trinidad checkin
2014-12-29 23:48:04 -08:00
RedMatrix
619733e297
Merge pull request #789 from pafcu/chanman
...
Don't show current channel separately in channel manager, highlight it i...
2014-12-30 08:57:37 +11:00
Stefan Parviainen
e69e59d260
Don't show current channel separately in channel manager, highlight it instead
2014-12-29 22:07:40 +01:00
friendica
3065650683
filter posts you author from unseen notifications - note there are other ways to do this, but involve some code complexity. This is easier to implement but may have a slight impact on the ping query performance. It's not horrid, just mentioning for the record.
2014-12-28 23:21:49 -08:00
RedMatrix
7b98a6fcb0
Merge pull request #772 from pafcu/chanman
...
Some work on the channel manager
2014-12-29 09:29:12 +11:00
RedMatrix
8d144396b1
Merge pull request #769 from pafcu/profiles
...
Redirect /profiles to default profile when multi_profiles is off. Fixes ...
2014-12-29 09:28:47 +11:00
friendica
50943f439c
issue #777 , make photo cache time configurable, read the comments.
2014-12-27 18:19:51 -08:00
Stefan Parviainen
40a327b68f
Allow quick access to mail and connections from Channel Manager
2014-12-27 14:06:09 +01:00
Stefan Parviainen
6a679d26ce
Fix #771 , add tooltips to mail and intros count in channel manager, always show counts (even when 0, makes it easier to understand what the icons are)
2014-12-27 13:36:05 +01:00
Stefan Parviainen
754fec9a54
Redirect /profiles to default profile when multi_profiles is off. Fixes #768
2014-12-27 12:46:59 +01:00
friendica
82d3c2a7e0
Merge https://github.com/friendica/red into pending_merge
2014-12-26 15:45:50 -08:00
Thomas Willingham
0130fb077f
Cruft left over from stuff we don't have anymore.
2014-12-26 16:59:52 +00:00
friendica
7ba92feabf
doc update
2014-12-26 00:13:22 -08:00
Thomas Willingham
5fd26eceb4
Pass sitename to apps
2014-12-22 15:39:04 +00:00
friendica
d3830aea96
provide last successful poll run time (using relative time) in siteinfo so that we can tell folks that have no idea what we're talking about that their poller definitely isn't running and this is probably why nothing works correctly.
2014-12-21 18:40:25 -08:00
friendica
b840c27995
Merge https://github.com/friendica/red into pending_merge
2014-12-21 14:45:46 -08:00
friendica
2b3cc585a2
fix double encoding of homepage in profile activity - not as straight-forward as it looked
2014-12-21 14:43:06 -08:00
marijus
27d786c979
files: make mod/filestorage.php load via ajax and some design work. work in progress...
2014-12-21 20:11:30 +01:00
Stefan Parviainen
fe80dbb3a7
Access list of smilies over JSON
2014-12-20 17:33:35 +01:00
friendica
6d8214f96b
provide link to help for channel permission roles when creating a channel
2014-12-19 01:48:47 -08:00
friendica
9c445e9817
incorrect check for sys ownership
2014-12-19 00:28:36 -08:00
friendica
ab2d11b37e
mod/import: try ten times to create a unique webbie if the chosen one is in use.
2014-12-18 19:48:23 -08:00
friendica
2fcbb9c4b3
fix some directory anomolies
2014-12-16 18:33:16 -08:00
friendica
07e747ed0e
add divmore to directory entries
2014-12-16 17:29:16 -08:00
friendica
4d5f28f07a
Merge https://github.com/friendica/red into pending_merge
2014-12-16 14:29:38 -08:00
friendica
5b49211035
edit and preview removed from additional features and turned into core functionality (always enabled).
2014-12-16 14:28:07 -08:00
Thomas Willingham
d82c7c2067
Minor doco
2014-12-16 18:13:04 +00:00
friendica
17e27d0d87
add Thomas's Diaspora repair script as include/fixd.php - altered so it can be re-run if necessary with a count of remaining hublocs to be fixed. Some sites are down so it probably can't ever get to zero. The check for a null join is quite an expensive query. It could block your DB for a couple minutes while it runs.
...
Also some preliminary work on a means to take the channel module out of list/forum mode if a specific mid is requested.
2014-12-16 00:25:41 -08:00
friendica
2e990743e7
Merge https://github.com/friendica/red into pending_merge
2014-12-15 14:37:57 -08:00
friendica
f28103d595
wall tags
2014-12-15 14:37:31 -08:00
Thomas Willingham
c6d0695edf
Issue #743
2014-12-15 19:32:28 +00:00
Thomas Willingham
5fac8e80de
Issue #739
2014-12-13 15:00:00 +00:00
Thomas Willingham
c91aa863d8
Missing ''
2014-12-10 21:56:44 +00:00
Thomas Willingham
81fdb1cdfc
Bring back 'no special theme for mobile'
2014-12-10 21:41:59 +00:00
Stefan Parviainen
97d1072f9b
Make it clear that title and categories are optional
2014-12-08 16:49:48 +01:00
Thomas Willingham
81f3b20610
Merge pull request #726 from pafcu/tagsinotherchannels
...
Show tags in other channels profile field to make it easier to navigate ...
2014-12-08 13:43:06 +00:00
Thomas Willingham
934172c2fc
Merge pull request #724 from pafcu/suggestionsindir
...
Show suggestions in directory
2014-12-08 13:34:56 +00:00
Thomas Willingham
99b5bef68e
Merge pull request #723 from pafcu/diropts
...
Directory sorting as a dropdown, forum filter as checkbox, option to sor...
2014-12-08 13:31:34 +00:00
Stefan Parviainen
62dabecf97
Show tags in other channels profile field to make it easier to navigate to the channels
2014-12-07 16:19:22 +01:00
Stefan Parviainen
c8818d8349
Suggestions in dir redux. Suggestions are now showed in directory if suggest=1 parameter is given to directory.
2014-12-07 13:40:21 +01:00
Stefan Parviainen
83ea120ac9
Revert "Revert "Directory shows channel suggestions by default""
...
This reverts commit bfde28f28e
.
2014-12-07 13:40:21 +01:00
Stefan Parviainen
647311db3e
Directory sorting as a dropdown, forum filter as checkbox, option to sort oldest first
2014-12-07 12:31:12 +01:00
Thomas Willingham
78c37bc325
Put dir back - the fat lady didn't sing afterall.
2014-12-04 01:34:58 +00:00
Thomas Willingham
460d379e7e
Don't allow affinity of 0 in connedit.
2014-12-02 00:59:20 +00:00
Thomas Willingham
2aaa33c135
The other half of 'any theme for any device'. Closes #71
2014-11-30 18:57:58 +00:00
Thomas Willingham
d67c5a6ffd
Handle included txt files (ie, install doco) as BBCode, otherwise it strips all
...
white space. Was going to use Markdown, but lots of not-markdown gets parsed
then, so...
2014-11-30 00:36:30 +00:00
Habeas Codice
d3ffdbf2a4
Merge remote-tracking branch 'upstream/master'
2014-11-26 11:02:30 -08:00
Habeas Codice
1a57f3ed51
fix true toggle
2014-11-26 11:01:18 -08:00
friendica
ddc8557b69
hide online presence maps to DNT
2014-11-24 15:36:11 -08:00
friendica
756abd6678
add event export (this month) to event UI
2014-11-24 02:50:14 -08:00
friendica
79e5c2456b
add link to search forums in the directory
2014-11-23 18:54:33 -08:00
friendica
5bb794cc28
allow directory searches to be filtered by (public forums) and/or (! public forums)
2014-11-23 18:22:19 -08:00
friendica
38aa8204cc
Merge https://github.com/friendica/red into pending_merge
2014-11-23 14:51:20 -08:00
friendica
d191e7c348
project roadmap
2014-11-23 14:51:04 -08:00
Habeas Codice
8ac3b938fd
added dbdriver to siteinfo json to better track affected sites
2014-11-22 13:27:52 -08:00
Habeas Codice
cf739c0361
Merge remote-tracking branch 'upstream/master'
2014-11-21 15:39:14 -08:00
Habeas Codice
db29dc6bff
implicit type conversion
2014-11-21 15:33:21 -08:00
friendica
e74a3926fe
yet another option for the homepage
2014-11-20 17:38:41 -08:00
Habeas Codice
c8af19c69c
Merge remote-tracking branch 'upstream/master'
2014-11-19 21:11:11 -08:00
Habeas Codice
92d0a9404f
Should fix issue #704
...
submitter please verify and close
2014-11-19 21:10:19 -08:00
friendica
50244f943d
minor photo flag issue - and some more whitespace edits
2014-11-19 16:29:35 -08:00
friendica
3224848bad
turn the "adult photo flagging" (which prevents a particularly flagged photo from showing up in your top level albums) into a feature so it doesn't clutter the normal photo edit form. This feature was a quick hack and needs more work; but it could be important to somebody.
2014-11-18 19:02:28 -08:00
friendica
11f0b45a90
blog mode - turn the comment link into a button and group with the likes/dislikes
2014-11-18 16:58:36 -08:00