redmatrix
|
ec41899328
|
update some of the old attach.flag values to the new schema
|
2015-07-30 17:16:23 -07:00 |
|
redmatrix
|
26411ab385
|
Merge branch 'master' of https://github.com/redmatrix/redmatrix
|
2015-07-30 17:12:23 -07:00 |
|
redmatrix
|
d5a40cac25
|
Merge branch 'master' of https://github.com/redmatrix/redmatrix
several dav fixes
Conflicts:
include/items.php
|
2015-07-30 17:11:16 -07:00 |
|
redmatrix
|
4c6368d075
|
dummy update
|
2015-07-30 17:07:03 -07:00 |
|
redmatrix
|
1097cd2583
|
minor cleanup
|
2015-07-29 19:01:25 -07:00 |
|
redmatrix
|
b1ceb33ae0
|
Merge branch 'vobject'
Conflicts:
include/event.php
|
2015-07-29 18:59:28 -07:00 |
|
redmatrix
|
00fa2e2fe8
|
convert ics import to sabre/vobject
|
2015-07-29 18:57:52 -07:00 |
|
redmatrix
|
df41ce9536
|
incorrect function name
|
2015-07-29 17:04:50 -07:00 |
|
redmatrix
|
845024e1e7
|
add connection filter to non-zot posts
|
2015-07-29 17:04:17 -07:00 |
|
redmatrix
|
e3f605e242
|
PRIVACY: imported events
|
2015-07-29 16:30:00 -07:00 |
|
redmatrix
|
4c83e9b6b4
|
initial work on using sabre as a vcalendar parser
|
2015-07-28 21:55:28 -07:00 |
|
redmatrix
|
03756c65fc
|
make superblock block a channel if it's an owner as well as the current author; add @hostname to event hashes to make their use in vcalendar more RFC compliant
|
2015-07-28 17:55:21 -07:00 |
|
redmatrix
|
cbb6d37b6c
|
Merge branch 'master' of https://github.com/redmatrix/redmatrix
|
2015-07-27 20:59:37 -07:00 |
|
redmatrix
|
52ccbd6b64
|
align buttons on event calendar
|
2015-07-27 20:58:25 -07:00 |
|
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
|
70a5a7b717
|
Merge branch 'master' of https://github.com/redmatrix/hubzilla
|
2015-07-26 16:51:01 -07:00 |
|
redmatrix
|
3880b485cb
|
Merge branch 'master' of https://github.com/redmatrix/redmatrix
Conflicts:
mod/connedit.php
view/pt-br/messages.po
view/pt-br/strings.php
|
2015-07-26 16:50:33 -07:00 |
|
redmatrix
|
44e92d80c7
|
Merge https://github.com/redmatrix/redmatrix into pending_merge
|
2015-07-26 16:43:02 -07:00 |
|
redmatrix
|
4b96b76f5c
|
revision and string update
|
2015-07-26 16:42:36 -07:00 |
|
Mario Vavti
|
54336ba43b
|
comment out some popover infos - we provide enough visual feedback now
|
2015-07-26 21:24:33 +02:00 |
|
Mario Vavti
|
f6142d18c4
|
Provide connection status if status is "a-normal"
|
2015-07-26 20:54:09 +02:00 |
|
redmatrix
|
7d66122240
|
Merge pull request #22 from git-marijus/master
fix abook_pending reset to 1 loop if $new_friend is false and remove …
|
2015-07-26 07:18:23 +10:00 |
|
git-marijus
|
7f2b5a08c0
|
Merge pull request #378 from solstag/ptbrupdate
update pt-br strings
|
2015-07-25 18:03:48 +02:00 |
|
Mario Vavti
|
6e557aa153
|
fix abook_pending reset to 1 loop if $new_friend is false and remove unused var
|
2015-07-25 17:41:19 +02:00 |
|
Alexandre Hannud Abdo
|
a3de9f9e41
|
update pt-br strings
|
2015-07-24 22:37:09 -03: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
|
908da4589d
|
event privacy issue
|
2015-07-23 21:02:41 -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 |
|
redmatrix
|
ab4ce0e2f4
|
Merge pull request #377 from zzottel/master
make content filter by language work for excludes
|
2015-07-22 17:51:41 +10: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
|
db9a0282c4
|
provide content-disposition for exported ics file
|
2015-07-20 21:28:33 -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 |
|
redmatrix
|
9495d2c701
|
indicate where progress has been made
|
2015-07-20 17:13:47 -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 |
|
Mario Vavti
|
464625cd91
|
show icons instead of disabled checkboxes
|
2015-07-20 15:03:55 +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
|
736db4992b
|
string update
|
2015-07-19 13:20:04 -07:00 |
|
redmatrix
|
ed3d9d1f80
|
some photo/attach permissions issues
|
2015-07-18 16:39:12 -07:00 |
|