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

13915 commits

This branch
This branch
All branches
Author SHA1 Message Date
redmatrix
475dc7b686 Merge branch 'master' of https://github.com/redmatrix/redmatrix 
Conflicts:
	boot.php
	include/api.php
	include/enotify.php
 2015-05-13 17:07:12 -07:00
redmatrix
c82082d2bb restrict webpage list to undeleted items 2015-05-13 16:27:04 -07:00
redmatrix
d6f98e6511 product was a bad string to use because we may require it for e-commerce, and RED_PLATFORM is equally problematic for other reasons. 2015-05-13 16:01:00 -07:00
redmatrix
c3c202d650 issue #187 2015-05-12 22:57:55 -07:00
redmatrix
4ca06ebd79 Merge branch 'master' of https://github.com/redmatrix/redmatrix 2015-05-12 21:57:06 -07:00
redmatrix
19a2bdeb91 cut/paste error 2015-05-12 21:40:49 -07:00
redmatrix
a67ada15f3 repo updaters 2015-05-12 21:35:30 -07:00
redmatrix
018e702281 Merge branch 'master' of https://github.com/redmatrix/redmatrix 
Conflicts:
	mod/mitem.php
	view/nl/strings.php
 2015-05-12 19:00:54 -07:00
redmatrix
1e0e812440 provide a method for loading site/custom widgets 2015-05-12 18:11:54 -07:00
redmatrix
1970670596 replace project name with $product or $Product in strings to avoid merge issues across different project names. Currently a place-holder. The strings themselves have not yet been modified. 2015-05-12 17:06:47 -07:00
redmatrix
5dcdb676fd version update 2015-05-12 16:45:44 -07:00
jeroenpraat
643d7db4a3 Dutch 100\% again 2015-05-12 23:03:13 +02:00
redmatrix
f2a0dac653 fix a couple of miscellaneous errors which showed up in the logs 2015-05-11 22:57:12 -07:00
redmatrix
aeb69dcbbe let the site admin import a record directly from the probe diagnostic 2015-05-11 19:36:07 -07:00
redmatrix
61e205f593 Merge https://github.com/redmatrix/redmatrix into pending_merge 2015-05-11 17:50:38 -07:00
redmatrix
cddcf9d3ab missing translation 2015-05-11 17:50:17 -07:00
redmatrix
5386686a1e missing merge conflict 2015-05-11 17:46:58 -07:00
redmatrix
aceb7ae8e9 Merge branch 'master' of https://github.com/redmatrix/redmatrix 
Conflicts:
	view/pt-br/messages.po
	view/pt-br/strings.php
 2015-05-11 17:15:07 -07:00
redmatrix
f4fc6b7782 Merge pull request #319 from solstag/ptbrupdate 
update pt-br transation
 2015-05-12 10:13:42 +10:00
Alexandre Hannud Abdo
e9bdd46cc6 update pt-br transation 2015-05-11 09:09:29 -03:00
redmatrix
1dc5b6a03a Merge branch 'master' of https://github.com/redmatrix/hubzilla into merger 2015-05-10 13:33:16 -07:00
redmatrix
2c7a4c254d correcting upstream 2015-05-10 13:30:30 -07:00
redmatrix
e0b5bce5a6 Merge pull request #1 from anaqreon/patch-1 
Misspelling
 2015-05-11 06:29:46 +10:00
redmatrix
0a644a2f41 Merge branch 'master' of https://github.com/redmatrix/redmatrix 
Conflicts:
	mod/mitem.php
	view/de/messages.po
	view/de/strings.php
 2015-05-10 13:26:44 -07:00
redmatrix
2cb8b19972 Merge https://github.com/redmatrix/redmatrix into pending_merge 2015-05-10 13:18:04 -07:00
redmatrix
3140650b8f rev update 2015-05-10 13:17:41 -07:00
Mario Vavti
70e5bf04e1 uid > channel id to make submenus visible for observers 2015-05-10 21:52:48 +02:00
Mario Vavti
ca36fce9a7 provide drop down submenu suggestions in edit mode 2015-05-10 21:17:37 +02:00
anaqreon
fff5dd5ecd Misspelling 2015-05-10 14:57:46 -04:00
Mario Vavti
fad37eb6d0 copy/paste typo 2015-05-10 15:08:18 +02:00
Mario Vavti
616338c17e provide ability to create submenus 2015-05-10 15:00:18 +02:00
zzottel
2114bfafca Merge pull request #318 from zzottel/master 
update to German strings
 2015-05-08 14:57:01 +02:00
zottel
9ef31e0402 update to German strings 2015-05-08 14:55:52 +02:00
redmatrix
37a63365f1 Merge branch 'master' of https://github.com/redmatrix/redmatrix 2015-05-07 16:44:28 -07:00
Mario Vavti
cd8ecb8649 provide wrap variable for comanche menus 2015-05-07 23:02:14 +02:00
jeroenpraat
ef384be35f Update Dutch 2015-05-07 14:32:24 +02:00
Mario Vavti
4f235de3c5 provide a possibility to include js/css libs 2015-05-07 13:26:14 +02:00
Mario Vavti
8ca10dcbab adjust icon size 2015-05-07 10:35:22 +02:00
redmatrix
90591bcbc9 missed one... 2015-05-06 22:56:08 -07:00
redmatrix
d01206af5a forgot to save 2015-05-06 21:43:52 -07:00
redmatrix
e85593e970 Hopefully this will make item_cache the default 2015-05-06 21:43:15 -07:00
redmatrix
c186e6ed96 change notification colour 2015-05-06 21:25:59 -07:00
redmatrix
25b599a4bd convert ITEM_WALL from bitfield to standalone 2015-05-06 21:03:33 -07:00
redmatrix
75b8bfc07a Merge branch 'master' of https://github.com/redmatrix/redmatrix 2015-05-06 18:39:12 -07:00
redmatrix
f17c1f9694 no need to obscure the diaspora signature if we're not obscuring the posts 2015-05-06 18:38:30 -07:00
Mario Vavti
a1ed2bf2ac comanche doco 2015-05-06 14:17:52 +02:00
Mario Vavti
257c670d5c avoid double slash after editing layout 2015-05-06 12:16:53 +02:00
Mario Vavti
9391f6f905 allow blocks to have custom classes and add a new template called zen which gives you an empty page to work with 2015-05-06 10:53:26 +02:00
redmatrix
245080a6d7 Merge https://github.com/redmatrix/redmatrix into pending_merge 2015-05-05 19:24:35 -07:00
redmatrix
f559c91b7a turn consensus items into diaspora polls for that network 2015-05-05 19:23:21 -07:00