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

16344 commits

This branch
This branch
All branches
Author SHA1 Message Date
redmatrix
a768bb1ab2 Merge branch 'master' into dev 2016-04-20 17:41:51 -07:00
redmatrix
683da1aa77 revup #337 2016-04-20 01:19:13 -07:00
redmatrix
9040ee53e4 missing class instance pointer in Pconfig module upgrade 2016-04-19 19:09:35 -07:00
redmatrix
974390d5d2 remove test files which were committed by accident 2016-04-19 19:02:48 -07:00
redmatrix
324771f858 Merge branch 'master' into dev 2016-04-19 15:51:41 -07:00
redmatrix
dd7fdf0c2b Merge branch 'master' of https://github.com/redmatrix/hubzilla into master_merge 2016-04-19 13:04:59 -07:00
redmatrix
bb7b756974 revup #337 2016-04-19 13:04:44 -07:00
redmatrix
f53478f142 a bit more namespace wrangling 2016-04-18 20:47:11 -07:00
redmatrix
2a4e8972e0 module updates 2016-04-18 20:38:38 -07:00
redmatrix
2a61817bad Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge 2016-04-18 19:17:20 -07:00
Mario Vavti
094d4cc325 Merge branch 'master' into dev 2016-04-18 16:45:58 +02:00
Mario Vavti
a49fa5f87c bring back bbcode buttons for mod/editpost 2016-04-18 16:45:34 +02:00
Mario Vavti
ca59ecd107 Merge branch 'master' into dev 2016-04-18 10:57:20 +02:00
Mario Vavti
f761ea5fc9 fix rpost bbcode buttons and autocomplete 2016-04-18 10:56:51 +02:00
redmatrix
1698732cff convert all the _well_known service controllers which are a bit touchy when it comes to the router 2016-04-18 01:35:09 -07:00
redmatrix
a9f68e4d2a Merge branch 'master' into dev 2016-04-18 01:02:44 -07:00
redmatrix
f12af17238 revup #337 2016-04-18 01:02:03 -07:00
redmatrix
d1ecf3f323 some issues with GNU-Social's implementation of events in feeds. The summary element is over-riding content, so put summary into the xcal namespace. Some investigation reveals that both projects are non-compliant in the xcal space. Will deal with this later. 2016-04-18 00:59:42 -07:00
redmatrix
9cddbc9a47 Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge 2016-04-17 19:58:59 -07:00
redmatrix
966773cdbb pull in the new object router and a few selected samples for the new controller layout 2016-04-17 19:55:36 -07:00
redmatrix
d2e61122c5 Merge commit '521d404' into dev 2016-04-17 19:42:43 -07:00
jeroenpraat
7229cd56ed Making sure the great new context help works with all thmes and schema's (3rd party themes: maybe abit of tweaking is still needed). Also fixing some minor cosmetic things. 2016-04-18 01:57:54 +02:00
redmatrix
521d404013 remove the date hack on public feeds which was a temporary fix for an issue limiting the number of posts returned and no longer needed. 2016-04-17 16:37:44 -07:00
redmatrix
5591eac973 Merge pull request #345 from anaqreon/context-help 
New help panel that slides in from the top and pushes the content ...
 2016-04-18 06:47:57 +10:00
jeroenpraat
c8dec1fae5 Spanish and Dutch strings update 2016-04-17 19:27:40 +02:00
redmatrix
c366bbaa54 Merge branch 'master' into dev 2016-04-17 04:31:20 -07:00
redmatrix
72e7c50968 revup #337 2016-04-17 04:29:50 -07:00
Andrew Manning
f4cca21fdf Recover lost language translation accommodation and doc/context restructuring 2016-04-17 07:29:08 -04:00
Andrew Manning
d7fe48d1b6 New help panel that slides in from the top and pushes the content down so it is not covered. Panel toggles with help button. Still some bugs with small screen viewing. 2016-04-17 07:09:42 -04:00
redmatrix
08a651dc9d Merge branch 'master' into dev 2016-04-16 00:39:29 -07:00
redmatrix
65571249b2 revup #337 2016-04-16 00:38:45 -07:00
redmatrix
0865d0ef51 Convert Channel to new module 2016-04-15 22:36:07 -07:00
redmatrix
b57f69d14d cleanup and test of new router 2016-04-15 20:43:05 -07:00
redmatrix
07650b4646 get init() working with class modules 2016-04-15 16:13:55 -07:00
redmatrix
ce582ccada Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge 2016-04-15 14:27:44 -07:00
redmatrix
ee5163ce64 Merge branch 'master' into dev 2016-04-15 14:27:28 -07:00
Mario Vavti
bbe33f9503 Merge branch 'master' into dev 2016-04-15 12:42:12 +02:00
Mario Vavti
2cb04ccb8f nav: move js and css out of template, provide a help button in the panel on small screens and lots of whitespace cleanup 2016-04-15 12:39:22 +02:00
redmatrix
aaa327ca05 testing the new router/module code 2016-04-15 01:25:15 -07:00
Mario Vavti
ce34c4086d Merge branch 'master' of https://github.com/redmatrix/hubzilla 2016-04-15 09:53:34 +02:00
Mario Vavti
fe9df64fc2 fix some slight crossbrowser rendering issues with jot 2016-04-15 09:52:40 +02:00
redmatrix
f124f4a9f5 Merge branch 'master' into dev 2016-04-15 00:49:17 -07:00
redmatrix
a1af2cbb30 Merge branch 'master' of https://github.com/redmatrix/hubzilla into master_merge 2016-04-15 00:48:38 -07:00
redmatrix
ec9e914798 revup + strings #337 2016-04-15 00:48:18 -07:00
Wave
ec5bd9d679 Merge pull request #343 from wave72/master 
Updated Italian strings
 2016-04-15 09:31:38 +02:00
Paolo Tacconi
c38c79d71c Merge branch 'redmatrix-master' 2016-04-15 09:22:27 +02:00
Paolo Tacconi
45a854762b Resolved conflict in view/it/hstrings.php 2016-04-15 09:20:58 +02:00
Paolo Tacconi
1806da0851 Updated Italian strings 2016-04-15 09:09:59 +02:00
redmatrix
521641f3a8 filter out a bit more dreport noise - especially for private posts to multiple recipients. 2016-04-14 21:53:39 -07:00
redmatrix
a29c0371f1 commit 1.4 2016-04-14 20:11:36 -07:00