harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
14,102 Commits 6 Branches 36 Tags
db70c76494997dfda4f850b4ee63ddae2c608bde
Commit Graph
14102 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
redmatrix db70c76494 diaspora_meta getting double json encoded 2015-08-02 23:05:15 -07:00
redmatrix 9f5dfe797b begin moving diaspora to plugin 2015-08-02 17:38:34 -07:00
redmatrix 49532aa6dd Merge branch 'master' of https://github.com/redmatrix/redmatrix 2015-08-02 16:47:36 -07:00
redmatrix ae15dde8fb revision update 2015-08-02 16:45:57 -07:00
redmatrix c1a953f960 Merge branch 'master' of https://github.com/redmatrix/redmatrix 
Conflicts:
	util/messages.po
 2015-07-31 15:45:13 -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 1d218784d1 undefined function 2015-07-30 20:37:32 -07:00
redmatrix f45cb8cf1f minor - add all the newly supported table columns 2015-07-30 20:04:02 -07:00
redmatrix 4035c6f161 incorrect photo permissions when uploaded via /cloud; issue #21 2015-07-30 19:50:06 -07:00
redmatrix fd947c205b make /cloud work again after all the shuffling this morning 2015-07-30 18:34:30 -07:00
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