redmatrix
|
3269d4632f
|
Merge branch 'master' of https://github.com/redmatrix/redmatrix
Conflicts:
util/messages.po
|
2015-07-27 18:01:20 -07:00 |
|
redmatrix
|
0b232a610c
|
logic issue in connection filter
|
2015-07-27 13:48:41 -07:00 |
|
redmatrix
|
85f546e691
|
crude but more or less functional event import from thunderbird ics files
|
2015-07-26 22:44:49 -07:00 |
|
redmatrix
|
9e6aea7382
|
backend code for importing events from "simple" ics calendar files.
|
2015-07-26 21:39:46 -07:00 |
|
redmatrix
|
cc5b0cde1d
|
Merge branch 'master' of https://github.com/redmatrix/redmatrix
Conflicts:
include/diaspora.php
|
2015-07-23 21:07:35 -07:00 |
|
redmatrix
|
bd131433b6
|
Merge https://github.com/redmatrix/redmatrix into pending_merge
|
2015-07-23 18:50:08 -07:00 |
|
redmatrix
|
27fa908233
|
patch to allow theme based widgets
|
2015-07-23 18:49:37 -07:00 |
|
redmatrix
|
c0e67db070
|
refresh diaspora xchan every month or so since receiving profile update messages from that network reliably are just as unlikely as receiving any other kind of message from that network reliably. The problem is that if somebody changes their profile name or photo once every few years and you miss it because of their shitty unreliable communications, your data could be stale for a long time.
|
2015-07-22 19:02:45 -07:00 |
|
zottel
|
5c52120fb4
|
make content filter by language work for excludes
|
2015-07-22 09:34:32 +02:00 |
|
redmatrix
|
c90f14c066
|
Merge branch 'master' of https://github.com/redmatrix/redmatrix
Conflicts:
doc/to_do_code.bb
|
2015-07-21 17:13:48 -07:00 |
|
redmatrix
|
3ec6a431b6
|
ics calendar export - commas need to be escaped
|
2015-07-21 17:07:16 -07:00 |
|
redmatrix
|
5146e6e76b
|
Merge https://github.com/redmatrix/redmatrix into pending_merge
|
2015-07-20 19:35:00 -07:00 |
|
redmatrix
|
d87c7ceeb0
|
there is no stricmp() in php, use strcasecmp() - also only detect language if we plan to use it.
|
2015-07-20 19:33:42 -07:00 |
|
Mario Vavti
|
4d45bc9da1
|
Fixes regarding the new default profile photo size. The default profile photos are just renamed. People which provided the originals are invited to reproduce them in the new 300 by 300 px format.
|
2015-07-20 21:01:11 +02:00 |
|
redmatrix
|
6645846ad3
|
allow per-connection content filter to specify a detected language to include/exclude (in addition to text, tags, and regexes)
|
2015-07-20 02:04:51 -07:00 |
|
redmatrix
|
24ec104819
|
silence warning about non array diaspora_meta but report it in the logs so we can find out what it actually is and why.
|
2015-07-19 21:18:13 -07:00 |
|
redmatrix
|
15b6e8faa4
|
Merge branch 'master' of https://github.com/redmatrix/redmatrix
Conflicts:
include/identity.php
include/widgets.php
util/messages.po
view/it/messages.po
view/it/strings.php
|
2015-07-19 21:08:34 -07:00 |
|
redmatrix
|
fd8e6f3130
|
typo
|
2015-07-19 21:04:02 -07:00 |
|
redmatrix
|
ec00c5b18a
|
the view_photos and post_photos permissions are redundant and are now mapped to view_storage and write_storage
|
2015-07-19 17:53:52 -07:00 |
|
redmatrix
|
ed3d9d1f80
|
some photo/attach permissions issues
|
2015-07-18 16:39:12 -07:00 |
|
redmatrix
|
fd16de335c
|
Merge https://github.com/redmatrix/redmatrix into pending_merge
|
2015-07-16 20:21:20 -07:00 |
|
redmatrix
|
3c60a0c22c
|
provide any single year of exported items
|
2015-07-16 20:20:42 -07:00 |
|
redmatrix
|
ec249d465b
|
provide a way to export a single year of items (to potentially keep from exhausting resources either on export or import)
|
2015-07-16 20:19:20 -07:00 |
|
redmatrix
|
4299ae65a4
|
abook clone sync - change logic to also unset existing cross-project flags besides just setting them
|
2015-07-16 18:07:23 -07:00 |
|
redmatrix
|
c3dbacfb88
|
don't including rating stuff from cloned abooks
|
2015-07-16 17:53:59 -07:00 |
|
Mario Vavti
|
39a09eb525
|
fix missing div and a regression introduced in ec23a94b6d which broke tag removal for photos
|
2015-07-16 22:04:52 +02:00 |
|
zottel
|
2bd05971ab
|
fix observer tags for now (issue #17)
|
2015-07-16 08:28:37 +02:00 |
|
redmatrix
|
498e2f7279
|
since we've got a fresh start without a lot of legacy sites to support, provide 'naked' or authored=none (no date and attribution) as the default for webpages. It will be up to designers to add this if they desire it rather than force everybody to take it away. The code for adding it isn't yet provided.
|
2015-07-15 22:59:55 -07:00 |
|
redmatrix
|
070397ef14
|
make tagadelic results (including categories in wall-to-wall posts) visible to wall visitors by checking ownership rather than authorship. It is doubtful the queries will scale on redmatrix so moved forward to hubzilla tree.
|
2015-07-15 21:43:42 -07:00 |
|
redmatrix
|
964e461e09
|
allow plugins to provide module handlers for arbitrary modules that haven't been installed on the system.
|
2015-07-15 21:01:18 -07:00 |
|
redmatrix
|
b9fd8b4614
|
Merge branch 'master' of https://github.com/redmatrix/redmatrix
Conflicts:
include/zot.php
|
2015-07-15 18:41:50 -07:00 |
|
redmatrix
|
7db515b77c
|
fix for empty recip array resulting from a mangled xchan
|
2015-07-15 18:31:37 -07:00 |
|
redmatrix
|
7f6e4d5f4a
|
more clone sync issues across projects
|
2015-07-15 18:21:04 -07:00 |
|
redmatrix
|
95cf1668de
|
Merge branch 'master' of https://github.com/redmatrix/redmatrix
|
2015-07-15 18:15:25 -07:00 |
|
redmatrix
|
59b67d52e6
|
clone sync fixes across red/hz
|
2015-07-15 18:14:19 -07:00 |
|
redmatrix
|
10406c6d15
|
Merge branch 'master' of https://github.com/redmatrix/redmatrix
|
2015-07-14 17:17:45 -07:00 |
|
redmatrix
|
46aacfe64d
|
stream_perms_xchans() set to empty quoted string when no results rather than return an empty string
|
2015-07-14 17:15:53 -07:00 |
|
redmatrix
|
e8f19c1e15
|
Merge branch 'master' of https://github.com/redmatrix/redmatrix
Conflicts:
mod/connedit.php
|
2015-07-14 17:10:13 -07:00 |
|
redmatrix
|
3687fef53c
|
Merge https://github.com/redmatrix/redmatrix into pending_merge
|
2015-07-14 16:55:58 -07:00 |
|
redmatrix
|
a5989b0f31
|
coverup and ignore the illegal string offset message that some sites have been reporting. This does not fix it. A fix would be to examine the data that has been received and find out why it is mangled and trace this back to where it was mangled.
|
2015-07-14 16:54:16 -07:00 |
|
Mario Vavti
|
7f71297383
|
cleanup connedit
|
2015-07-14 12:46:40 +02:00 |
|
redmatrix
|
800eec5bee
|
merge from redmatrix
|
2015-07-13 17:48:11 -07:00 |
|
redmatrix
|
6916c1076c
|
Merge branch 'master' of https://github.com/redmatrix/redmatrix
|
2015-07-13 17:43:10 -07:00 |
|
zottel
|
a07be48017
|
change account_default_channel if default channel is removed
|
2015-07-13 17:30:04 +02:00 |
|
redmatrix
|
b7d3eb1605
|
Only let local logins install webpage elements
|
2015-07-11 16:36:58 -07:00 |
|
redmatrix
|
a497d8ee66
|
Merge branch 'master' of https://github.com/redmatrix/redmatrix
Conflicts:
mod/editpost.php
util/messages.po
view/nl/messages.po
view/nl/strings.php
|
2015-07-10 14:27:41 -07:00 |
|
Mario Vavti
|
efa55437d4
|
increase width of the aside area and make default profile image size 300x300
|
2015-07-09 13:59:16 +02:00 |
|
redmatrix
|
43354ab385
|
inconsistent naming of block item types
|
2015-07-08 18:05:38 -07:00 |
|
Mario Vavti
|
e12d58a75c
|
fix typo to make directory safe mode default to on work again
|
2015-07-08 21:28:36 +02:00 |
|
redmatrix
|
6b41074396
|
Merge branch 'master' of https://github.com/redmatrix/redmatrix
|
2015-07-07 16:50:25 -07:00 |
|