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

15757 commits

This branch
This branch
All branches
Author SHA1 Message Date
redmatrix
ce064188c6 Merge https://github.com/redmatrix/redmatrix into pending_merge 
Conflicts:
	include/zot.php
 2015-09-19 22:48:22 -07:00
redmatrix
5d6f59a598 clone new connections 2015-09-19 22:46:59 -07:00
redmatrix
f4a4cf1402 clone new connection requests 2015-09-19 15:36:07 -07:00
zottel
032ef0ca34 Merge remote-tracking branch 'upstream/master' 2015-09-19 20:11:59 +02:00
Haakon Meland Eriksen
5a7e8d8520 Merge remote-tracking branch 'upstream/master' 2015-09-19 11:35:31 +02:00
redmatrix
63146821d7 Merge https://github.com/redmatrix/redmatrix into pending_merge 2015-09-18 23:02:49 -07:00
redmatrix
9ed8eac8c6 include site identitfier on redmatrix delivery reports also 2015-09-18 23:02:03 -07:00
redmatrix
40bb1699a5 DB table for delivery reports 2015-09-18 22:55:47 -07:00
redmatrix
74827133b2 Merge https://github.com/redmatrix/redmatrix into pending_merge 
Conflicts:
	util/messages.po
 2015-09-18 22:46:21 -07:00
redmatrix
7c8706757d Merge https://github.com/redmatrix/redmatrix into pending_merge 2015-09-18 22:44:23 -07:00
redmatrix
3dc066a143 dummy update 2015-09-18 22:43:35 -07:00
redmatrix
43251ed8ce add reporting site to delivery report 2015-09-18 22:00:33 -07:00
redmatrix
1a16822987 Merge https://github.com/redmatrix/hubzilla into pending_merge 2015-09-18 14:32:23 -07:00
redmatrix
fdd4c1b9d1 more work on surviving hub re-installs 2015-09-18 14:31:29 -07:00
Haakon Meland Eriksen
1bd1050160 Added hot_deploy directly to .openshift/makers/hot_deploy 2015-09-18 18:58:43 +02:00
Haakon Meland Eriksen
525a0478b0 Added hot_deploy to deploy script - fixed echo 2015-09-18 18:55:56 +02:00
Haakon Meland Eriksen
ce28760c2a Merge remote-tracking branch 'upstream/master' 2015-09-18 18:51:39 +02:00
Haakon Meland Eriksen
438cb1d7e0 Added hot_deploy to deploy script 2015-09-18 18:51:03 +02:00
Mario Vavti
87c8cf4892 css fixes 2015-09-18 13:07:04 +02:00
redmatrix
f2fefb91d5 change photo permissions when attach permissions are changed through mod/filestorage, and fix lockview for photos. 2015-09-18 01:53:04 -07:00
zottel
4d05d477f8 Merge remote-tracking branch 'upstream/master' 2015-09-18 09:38:55 +02:00
redmatrix
cc95c3e9c8 start hooking in the new webfinger/zot merged discovery 2015-09-17 18:36:19 -07:00
redmatrix
f0a7a6a1e2 consolidate zotfinger and webfinger 2015-09-17 17:51:31 -07:00
jeroenpraat
4090843fef Converse width for a few related (old) schemas back to 1024px / Name default theme to Focus / Non expert custom display settings above expert display settings, so people can better find them. 2015-09-17 22:39:48 +02:00
Mario Vavti
c6c18261a0 missing refernce to array 2015-09-17 19:33:44 +02:00
Mario Vavti
d9e83eb53a Merge branch 'master' of https://github.com/redmatrix/hubzilla 2015-09-17 19:25:36 +02:00
Mario Vavti
1cf404177d quickfix for private messages - needs a lot more work 2015-09-17 19:25:13 +02:00
git-marijus
ed9ffec5ba Merge pull request #46 from anaqreon/master 
Corrected some missing space typos in docs
 2015-09-17 17:38:20 +02:00
jeroenpraat
582607c0f0 Another (hopefully final) Spanish update 2015-09-17 16:28:31 +02:00
Mario Vavti
6cd5826d21 Revert "moved submit button to the bottom in settings.tpl" 
This reverts commit 1500691cc2.
 2015-09-17 15:05:40 +02:00
Mario Vavti
b7e953f50e fix calculation of content height with margins 2015-09-17 14:14:01 +02:00
Andrew Manning
9f630b6653 Corrected some missing space typos in docs 2015-09-17 06:44:12 -04:00
mrjive
024af91df8 Merge pull request #1 from redmatrix/master 
updating from original codebase
 2015-09-17 09:27:13 +02:00
zottel
3017dbc8c1 Merge remote-tracking branch 'upstream/master' 2015-09-17 08:50:28 +02:00
redmatrix
5d33b34be7 Merge https://github.com/redmatrix/redmatrix into pending_merge 2015-09-16 21:57:57 -07:00
redmatrix
f2104b0a5a Merge https://github.com/redmatrix/redmatrix into pending_merge 2015-09-16 21:57:21 -07:00
redmatrix
84b004399e push revision 2015-09-16 21:56:55 -07:00
redmatrix
e8a01f0916 Merge https://github.com/redmatrix/redmatrix into pending_merge 2015-09-16 21:56:34 -07:00
redmatrix
4f1d579ba1 Merge https://github.com/redmatrix/hubzilla into pending_merge 2015-09-16 21:56:26 -07:00
redmatrix
c34d8286a3 change matrix to grid, begin webfinger optimisation 2015-09-16 21:27:58 -07:00
redmatrix
4eb389f2d9 Merge pull request #45 from anaqreon/master 
Started correcting vestiges of the RedMatrix and matrix, replacing wi…
 2015-09-17 11:49:55 +10:00
Andrew Manning
999ac60a87 Started correcting vestiges of the RedMatrix and matrix, replacing with Hubzilla and grid 2015-09-16 21:44:24 -04:00
redmatrix
30af694e30 Merge pull request #44 from mrjive/move_submit_button 
moved submit button to the bottom in settings.tpl
 2015-09-17 10:19:43 +10:00
redmatrix
fa76da1dab Merge pull request #43 from mrjive/toggleselect 
added toggle_select
 2015-09-17 10:19:27 +10:00
mrjive
1500691cc2 moved submit button to the bottom in settings.tpl 2015-09-16 04:46:47 -07:00
mrjive
fae5ea749a added toggle_select 2015-09-16 02:25:44 -07:00
zottel
c2dac55edb Merge remote-tracking branch 'upstream/master' 2015-09-16 09:56:11 +02:00
redmatrix
4c5a74284b serve as application/xrd+xml 2015-09-15 21:47:01 -07:00
redmatrix
d0a3cfe765 italian string correction 2015-09-15 19:59:06 -07:00
jeroenpraat
580f1f1213 Less margin 2015-09-15 22:00:12 +02:00