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

14002 commits

This branch
This branch
All branches
Author SHA1 Message Date
redmatrix
e8f19c1e15 Merge branch 'master' of https://github.com/redmatrix/redmatrix 
Conflicts:
	mod/connedit.php
 2015-07-14 17:10:13 -07:00
redmatrix
3687fef53c Merge https://github.com/redmatrix/redmatrix into pending_merge 2015-07-14 16:55:58 -07:00
redmatrix
a5989b0f31 coverup and ignore the illegal string offset message that some sites have been reporting. This does not fix it. A fix would be to examine the data that has been received and find out why it is mangled and trace this back to where it was mangled. 2015-07-14 16:54:16 -07:00
Mario Vavti
104cbcab72 make strings translateable 2015-07-14 21:32:18 +02:00
Mario Vavti
4fe64179c8 disable the inherited checkboxes for notself 2015-07-14 19:29:49 +02:00
Mario Vavti
cc1764989f fix mod_connedit.js after cleanup 2015-07-14 17:37:33 +02:00
Mario Vavti
f267bd55d6 revert this until further investigation 2015-07-14 14:20:23 +02:00
Mario Vavti
dd57864867 revert provide inherited perms for connection default permissions 2015-07-14 13:46:22 +02:00
Mario Vavti
d8edb66287 remove dbg 2015-07-14 13:21:39 +02:00
Mario Vavti
711dd1468d provide inherited perms for connection default permissions 2015-07-14 13:16:08 +02:00
Mario Vavti
a28da40fa8 css fixes 2015-07-14 12:52:50 +02:00
Mario Vavti
7f71297383 cleanup connedit 2015-07-14 12:46:40 +02:00
redmatrix
da5cec24e0 Merge branch 'master' of https://github.com/redmatrix/hubzilla 2015-07-13 17:48:54 -07:00
redmatrix
800eec5bee merge from redmatrix 2015-07-13 17:48:11 -07:00
redmatrix
6916c1076c Merge branch 'master' of https://github.com/redmatrix/redmatrix 2015-07-13 17:43:10 -07:00
redmatrix
86633bda48 Merge pull request #373 from zzottel/master 
change account_default_channel if default channel is removed
 2015-07-14 09:01:02 +10:00
zottel
a07be48017 change account_default_channel if default channel is removed 2015-07-13 17:30:04 +02:00
redmatrix
b7d3eb1605 Only let local logins install webpage elements 2015-07-11 16:36:58 -07:00
redmatrix
3ec2dc81f2 allow sys editing of menu 2015-07-11 16:30:06 -07:00
Mario Vavti
04c794da10 whitespace and comment out info again 2015-07-12 01:12:20 +02:00
Mario Vavti
f81874ca49 fix sys channel menu in a morre standard way 2015-07-12 01:04:57 +02:00
Mario Vavti
6ca4240d96 menu_id is still needed 2015-07-12 00:49:03 +02:00
Mario Vavti
dd32c3053c Merge branch 'master' of https://github.com/redmatrix/redmatrix 2015-07-12 00:40:29 +02:00
Mario Vavti
d8f03450e7 make menu creation for sys channel work 2015-07-12 00:40:12 +02:00
redmatrix
e91d4906d1 Merge pull request #14 from git-marijus/master 
Merge remote-tracking branch 'redmatrix/master'
 2015-07-12 08:04:12 +10:00
redmatrix
69a4cf73a3 Merge branch 'master' of https://github.com/redmatrix/redmatrix 2015-07-11 15:03:23 -07:00
redmatrix
8f9895f26a Merge https://github.com/redmatrix/redmatrix into pending_merge 2015-07-11 15:02:08 -07:00
redmatrix
bc6efba68a revision update 2015-07-11 15:01:41 -07:00
Mario Vavti
f41bab6f8a Merge remote-tracking branch 'redmatrix/master' 2015-07-11 13:26:27 +02:00
Mario Vavti
138e0fe445 fix issue with profile photo 2015-07-11 13:25:06 +02:00
Mario Vavti
ec2df365de Merge remote-tracking branch 'redmatrix/master' 2015-07-11 12:53:34 +02:00
Mario Vavti
d3581d8562 more revert 2015-07-11 12:52:06 +02:00
Mario Vavti
d8e7f36c74 revert moving section and aside padding to style.css - it brings trouble to other layouts 2015-07-11 12:42:11 +02:00
Mario Vavti
f7da424b8b Merge remote-tracking branch 'redmatrix/master' 2015-07-11 12:07:47 +02:00
Mario Vavti
edb3d970ca Merge branch 'master' of https://github.com/redmatrix/redmatrix 2015-07-11 12:05:56 +02:00
Mario Vavti
d592d911c5 add css file for mod display 2015-07-11 12:05:39 +02:00
Mario Vavti
54bb2651f5 merge 2015-07-11 11:58:53 +02:00
redmatrix
a497d8ee66 Merge branch 'master' of https://github.com/redmatrix/redmatrix 
Conflicts:
	mod/editpost.php
	util/messages.po
	view/nl/messages.po
	view/nl/strings.php
 2015-07-10 14:27:41 -07:00
redmatrix
4bf7e4a34d Merge https://github.com/redmatrix/redmatrix into pending_merge 2015-07-10 14:20:38 -07:00
redmatrix
ae6541cf74 revision update 2015-07-10 14:20:08 -07:00
Mario Vavti
6e30ccdd22 Merge branch 'master' of https://github.com/redmatrix/redmatrix 2015-07-10 21:48:42 +02:00
Mario Vavti
b6f28900e6 show status editor in /display on share action. 2015-07-10 21:48:24 +02:00
jeroenpraat
115097f139 update Dutch strings 2015-07-10 21:46:19 +02:00
Mario Vavti
b1f926ba89 merge redmatrix fixes 2015-07-10 20:46:46 +02:00
Mario Vavti
071a233fb8 css fixes 2015-07-10 13:44:23 +02:00
Mario Vavti
39d68bf7c7 do not change selected/active class color on hover 2015-07-10 13:34:36 +02:00
Mario Vavti
ebb07de788 re-enable selected/active class 2015-07-10 13:25:50 +02:00
Mario Vavti
fee607db56 more webpages - generic-content-wrapper fixes 2015-07-10 13:16:45 +02:00
Mario Vavti
1554b5a2ee add generic content wrapper to post/webpage editor and make editpost render correctly 2015-07-10 12:46:20 +02:00
Mario Vavti
7eb614c8aa schema focus: refine content width to be more in balance with the recent aside width 2015-07-10 11:15:05 +02:00