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

14827 commits

This branch
This branch
All branches
Author SHA1 Message Date
redmatrix
d96ca61f2b Merge https://github.com/redmatrix/redmatrix into pending_merge 2015-09-11 14:57:26 -07:00
redmatrix
fc58b8cc0d log the remote message if there was one 2015-09-11 14:56:31 -07:00
redmatrix
c8503daf5a Merge https://github.com/redmatrix/hubzilla into pending_merge 2015-09-11 14:33:36 -07:00
redmatrix
45e1f93e56 Merge https://github.com/redmatrix/redmatrix into pending_merge 
Conflicts:
	util/messages.po
 2015-09-11 14:33:07 -07:00
redmatrix
77807d439e minor change on invite 2015-09-11 14:32:18 -07:00
redmatrix
e062c4e6b5 another tactic to deal with orphan hublocs from re-installs, or at least allow the descendant channel to survive 2015-09-11 14:30:07 -07:00
Michael Meer
755edd2110 ensure that living sites are marked as alive 2015-09-11 14:06:37 +02:00
Mario Vavti
f51124397f center page content by default - css file 2015-09-11 11:56:56 +02:00
Mario Vavti
e42111545b center page content by default 2015-09-11 11:54:35 +02:00
Mario Vavti
5112b4b963 css fix 2015-09-11 09:26:24 +02:00
zottel
99c5c7ab28 Merge remote-tracking branch 'upstream/master' 2015-09-11 08:15:19 +02:00
Haakon Meland Eriksen
edb1473f13 Merge remote-tracking branch 'upstream/master' 2015-09-11 06:42:11 +02:00
redmatrix
f2171173fe separate the links 2015-09-10 19:35:26 -07:00
redmatrix
7f30863df2 forum mode - use linked avatar and name for title instead of "Channel: xxxxx" or "Forum: xxxx" 2015-09-10 19:31:42 -07:00
redmatrix
a6a2c02b6a duplicated code 2015-09-10 19:21:32 -07:00
redmatrix
d3ee99d677 Merge https://github.com/redmatrix/redmatrix into pending_merge 
Conflicts:
	mod/like.php
 2015-09-10 19:20:21 -07:00
redmatrix
4abfd4053a sync likes 2015-09-10 19:18:12 -07:00
redmatrix
05e0ed5173 export likes to clones 2015-09-10 19:17:20 -07:00
redmatrix
00b480527a provide remote delivery report at logger_debug level 2015-09-10 17:53:06 -07:00
redmatrix
e4231efd20 Merge https://github.com/redmatrix/hubzilla into pending_merge 2015-09-10 16:51:53 -07:00
redmatrix
922d2165b3 Merge https://github.com/redmatrix/redmatrix into pending_merge 
Conflicts:
	include/zot.php
 2015-09-10 16:51:22 -07:00
redmatrix
9cee52c668 Merge https://github.com/redmatrix/redmatrix into pending_merge 2015-09-10 16:49:09 -07:00
redmatrix
50e32c3d8a zot_refresh: always try the hubloc pointed to by xchan_addr first 2015-09-10 16:48:08 -07:00
Mario Vavti
5e576bff63 fix radius setting 2015-09-10 22:22:51 +02:00
Mario Vavti
e1338f5a7f make redmatrix focus scheme default for hubzilla 2015-09-10 22:19:51 +02:00
jeroenpraat
672143d3a2 update Spanish strings 2015-09-10 13:18:24 +02:00
redmatrix
2d94a038a5 ensure connections have a name 2015-09-10 01:21:18 -07:00
zottel
174d55cf3d Merge remote-tracking branch 'upstream/master' 2015-09-10 08:32:33 +02:00
redmatrix
f2889d24e6 decentralise likes of things so they can be cloned 2015-09-09 22:03:23 -07:00
redmatrix
db58b62235 don't auto-open the editor in forum mode. Save the forum selection text until we open it. 2015-09-09 19:54:16 -07:00
redmatrix
f3b560b453 fix the lock state when using forum mode 2015-09-09 18:57:06 -07:00
redmatrix
43e064749c major changes to "forum mode" on the network/matrix page 2015-09-09 18:50:15 -07:00
redmatrix
4af339da63 slight hack to improve public forum detection in the forum widget 2015-09-09 18:18:27 -07:00
redmatrix
4cd6e7ec91 Merge https://github.com/redmatrix/hubzilla into pending_merge 2015-09-09 17:00:02 -07:00
redmatrix
197b5de9da update bug reporting doco 2015-09-09 16:59:26 -07:00
redmatrix
cdfddc0fc5 Merge pull request #37 from MicMee/master 
typo
 2015-09-10 06:26:07 +10:00
Michael Meer
f4d3ec908d typo 2015-09-09 17:08:53 +02:00
redmatrix
918aaa64e2 profile photo issues #36 2015-09-09 03:40:53 -07:00
zottel
2417396a93 Merge remote-tracking branch 'upstream/master' 2015-09-09 09:53:51 +02:00
redmatrix
0a051ff2cd preserve code blocks on item import if channel has code rights. When importing the channel itself, 
turn code access off unless this is the admin.
 2015-09-08 22:46:34 -07:00
redmatrix
d702133ded move mod_admin to Comanche finally 2015-09-08 20:48:35 -07:00
redmatrix
2aaee311f3 differentiate Community Server from Enterprise Server 2015-09-08 19:57:07 -07:00
redmatrix
e8d431c2f6 issues with "use this photo for profile photo" #36 2015-09-08 19:51:52 -07:00
redmatrix
0f4c012321 Merge https://github.com/redmatrix/redmatrix into pending_merge 
Conflicts:
	include/items.php
	mod/menu.php
 2015-09-08 19:16:07 -07:00
redmatrix
f13a8f725c export TERM_FILE when mirroring 2015-09-08 19:14:29 -07:00
redmatrix
e6690c818d export TERM_FILE when mirroring 2015-09-08 19:13:43 -07:00
redmatrix
5d32aa94d9 Merge https://github.com/redmatrix/redmatrix into pending_merge 
Conflicts:
	include/menu.php
	mod/menu.php
	mod/mitem.php
 2015-09-08 18:46:15 -07:00
redmatrix
d413b6eba8 merge conflicts 2015-09-08 18:45:58 -07:00
redmatrix
f0847e6f32 debugging menu sync 2015-09-08 18:40:56 -07:00
redmatrix
50d7554ccd add sync packets for menus 2015-09-08 18:40:19 -07:00