Streams/streams
Streams/streams
1
0
Fork 0
mirror of https://codeberg.org/streams/streams.git synced 2024-09-24 04:15:16 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
15764 commits 7 branches 31 tags 160 MiB
Commit graph

15764 commits

This branch
This branch
All branches
Author SHA1 Message Date
redmatrix
6826b4ad32 these were some really difficult bugs to find 2015-08-03 21:13:17 -07:00
redmatrix
b737e224b1 more work separating Diaspora from core 2015-08-03 16:52:51 -07:00
Haakon Meland Eriksen
2b1e672316 Hubzilla addons added 2015-08-03 22:29:22 +02:00
Haakon Meland Eriksen
5adb41a0ed Merge remote-tracking branch 'upstream/master' 2015-08-03 21:53:01 +02: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
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
Haakon Meland Eriksen
98fa996b3f Merge remote-tracking branch 'upstream/master' 2015-07-29 22:04:07 +02: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