Commit graph

13947 commits

Author SHA1 Message Date
redmatrix
0b7365e2db revert 36b5f6ac 2015-08-12 22:37:24 -07:00
jeroenpraat
3099562a21 Some corrections of Spanish strings. 2015-08-12 20:52:46 +02:00
jeroenpraat
588d22974c And Catalan! 2015-08-12 15:16:56 +02:00
jeroenpraat
4c2bbe3c41 Thanks to Manuel. Updated Spanish to 100 procent. 2015-08-12 15:11:04 +02:00
redmatrix
d882b3274b doc fixes 2015-08-11 22:32:53 -07:00
redmatrix
1aa48ddfaa Merge https://github.com/redmatrix/redmatrix into pending_merge 2015-08-11 22:32:33 -07:00
redmatrix
ad02d5589d Merge pull request #383 from solstag/commentpermgood
Require comment perms only for own posts, allow senders to deliver co…
2015-08-12 15:31:36 +10:00
redmatrix
f30d2b489a Merge https://github.com/redmatrix/redmatrix into pending_merge 2015-08-10 16:17:06 -07:00
redmatrix
81c740178d convert abook_flags from hubzilla during cloning 2015-08-10 16:16:26 -07:00
Alexandre Hannud Abdo
36b5f6acfe Require comment perms only for own posts, allow senders to deliver comments using stream perms. 2015-08-10 18:20:18 -03:00
jeroenpraat
eae88b0815 Update Dutch strings 2015-08-09 15:56:02 +02:00
redmatrix
2656aeaf9c ensure diaspora_signature is converted to json before we store it. 2015-08-08 15:18:34 -07:00
redmatrix
ec5d91d8cf closing tags 2015-08-06 21:07:25 -07:00
redmatrix
efa589300a Merge https://github.com/redmatrix/redmatrix into pending_merge 2015-08-05 16:12:30 -07:00
redmatrix
6413ba3230 connection filter fixes 2015-08-05 16:12:05 -07:00
jeroenpraat
510cb5df86 Update Dutch strings 2015-08-05 22:31:40 +02:00
redmatrix
a61fc00fa4 unobscure item before applying connection filter 2015-08-04 15:59:18 -07:00
redmatrix
56045093cc Merge https://github.com/redmatrix/redmatrix into pending_merge 2015-08-03 21:13:54 -07:00
redmatrix
6826b4ad32 these were some really difficult bugs to find 2015-08-03 21:13:17 -07:00
Paolo T
2f5a39bc2f Merge pull request #382 from tuscanhobbit/master
Italian translation
2015-08-03 09:24:39 +02:00
Paolo Tacconi
5d2f35dc60 Italian translation 2015-08-03 09:21:01 +02:00
redmatrix
ae15dde8fb revision update 2015-08-02 16:45:57 -07:00
redmatrix
5e985ef34f consistency of event form 2015-07-31 15:42:52 -07:00
redmatrix
6f9771768d event parse cleanup 2015-07-30 22:49:43 -07:00
redmatrix
acc9a8e43b escape $ in events 2015-07-30 22:29:10 -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
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
52ccbd6b64 align buttons on event calendar 2015-07-27 20:58:25 -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
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
git-marijus
7f2b5a08c0 Merge pull request #378 from solstag/ptbrupdate
update pt-br strings
2015-07-25 18:03:48 +02:00
Alexandre Hannud Abdo
a3de9f9e41 update pt-br strings 2015-07-24 22:37:09 -03: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
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
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