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

20357 commits

This branch
This branch
All branches
Author SHA1 Message Date
Mario Vavti
0938db8f7b Merge branch 'dev' into bs4 2017-03-19 13:33:45 +01:00
Mario Vavti
d2c971eda9 fix php warning and remove logging 2017-03-19 13:33:02 +01:00
Mario Vavti
57584ea429 remove redundant css 2017-03-19 13:28:06 +01:00
Mario Vavti
49d84a364d css fixes 2017-03-19 13:21:30 +01:00
Mario Vavti
89b5507354 fix custom fontsize for app 2017-03-19 12:10:16 +01:00
Mario Vavti
2a25ddff36 bs4 fixes 2017-03-19 10:51:58 +01:00
zotlabs
b0b96daec0 Merge branch 'dev' into merge 2017-03-18 17:00:09 -07:00
zotlabs
8764cdf16a Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge 2017-03-18 16:56:37 -07:00
zotlabs
a45dd09fc0 issue #699 2017-03-18 16:56:18 -07:00
zotlabs
320c32fd0f issue #699 2017-03-18 16:55:10 -07:00
zotlabs
4afeefb5ce various input filter fixes 2017-03-18 16:41:43 -07:00
Mario Vavti
b2ad4e8c2a bs4 fixes 2017-03-18 23:45:55 +01:00
Mario Vavti
2bdf63d069 more abook_edit and some css 2017-03-18 22:01:46 +01:00
Mario Vavti
b897fd8315 more abook_edit 2017-03-18 20:02:13 +01:00
Mario Vavti
82b35e2762 fix abook_edit and private mail 2017-03-18 20:00:32 +01:00
Mario Vavti
56f32104d5 Merge branch 'dev' into bs4 2017-03-18 17:29:38 +01:00
Mario Vavti
2556d05602 bs4 fixes 2017-03-18 17:28:46 +01:00
Klaus
7b06cb6682 Merge pull request #698 from dawnbreak/dev 
Missed one old Markdown()
 2017-03-18 14:19:47 +01:00
Klaus
cbd401c3e8 Missed one old Markdown() 2017-03-18 14:15:02 +01:00
Mario Vavti
9277806664 fix usermenu radius 2017-03-17 21:42:27 +01:00
Mario Vavti
828028259c css fixes 2017-03-17 20:48:06 +01:00
Mario Vavti
d10525a375 fix item_list and item_search templates. make item filer use a bootdtrap modal and some css and class fixes 2017-03-17 14:22:10 +01:00
zotlabs
d903758940 remove include/widgets.php 2017-03-16 18:36:58 -07:00
zotlabs
cf11ba1147 simplify the message signing spaghetti 2017-03-16 18:19:03 -07:00
zotlabs
446b5550a2 the rest of the standard widgets converted 2017-03-16 17:11:48 -07:00
Mario Vavti
4c2bdc9dc0 Merge branch 'dev' into bs4 2017-03-16 09:46:09 +01:00
zotlabs
051759580d namespace error 2017-03-16 01:16:29 -07:00
zotlabs
fb3f63bf59 input filter issue 2017-03-15 21:49:27 -07:00
zotlabs
f6b643e84e widgets cont. 2017-03-15 21:26:28 -07:00
zotlabs
16d750d1f6 widgets cont. 2017-03-15 20:56:12 -07:00
zotlabs
dfd626548f more widget migrations 2017-03-15 20:11:28 -07:00
zotlabs
92d7c32f61 more widgets 2017-03-15 19:30:57 -07:00
zotlabs
0ee48f6a58 filename issue 2017-03-15 19:13:16 -07:00
zotlabs
664c762b35 more widgets 2017-03-15 18:48:27 -07:00
zotlabs
9cb9608209 convert more widgets to classes 2017-03-15 18:31:34 -07:00
zotlabs
b20062efa6 Merge branch 'red' of https://github.com/zotlabs/hubzilla into red 2017-03-15 17:44:21 -07:00
zotlabs
8d4744d115 new composer.lock for red 2017-03-16 11:42:06 +11:00
zotlabs
14f16a7ef0 use absolute namespace 2017-03-15 17:05:16 -07:00
zotlabs
df6c07aaad Comanche: allow widgets to be class based and stored appropriately in Zotlabs 2017-03-15 16:55:47 -07:00
zotlabs
c95e9b9ba5 could not fix the merge conflicts in composer.lock so it will need to be regenerated in the red tree. 
also the autoload_classmap is a disgrace. We provide autoload functions so that we can dynamically
change the file tree without needing to regenerate a bunch of runtime stuff every time we add a file.
Merge branch 'dev' into red
 2017-03-15 16:09:08 -07:00
zotlabs
472a824a1e Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge 2017-03-15 16:02:45 -07:00
zotlabs
16df1c1ad4 Merge pull request #569 from dawnbreak/QA_testing 
[FEATURE] Extend Travis CI integration.
 2017-03-16 10:02:17 +11:00
zotlabs
e1fe637dcd Merge branch 'dev' into red 2017-03-15 15:57:37 -07:00
zotlabs
2dce86d38e Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge 2017-03-15 15:55:33 -07:00
zotlabs
bcd02edd80 ensure z_input_filter is called exactly once, since we now depend on the number of htmlspecialchars operations for 
markdown content. Also ensure that the content is escaped the correct number of times on imported items.
 2017-03-15 15:53:03 -07:00
Mario Vavti
a73ea134cd re-add spaces between tags 2017-03-15 21:22:16 +01:00
Mario Vavti
e7a5aa7b9c js fixes 2017-03-15 17:28:00 +01:00
Mario Vavti
aa33cacb62 style hashtags, mentions and categories. hide expand-aside button if not needed. css and class fixes 2017-03-15 16:42:55 +01:00
Mario Vavti
0c74c79b18 Merge branch 'dev' into bs4 2017-03-15 12:42:18 +01:00
Mario Vavti
0c973cc9fa various fixes 2017-03-15 12:41:37 +01:00