Commit graph

13594 commits

Author SHA1 Message Date
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
redmatrix
c9ec4f46b6 for hubzilla we won't be obscuring items, only private mail, this will allow us to search and cache private posts 2015-05-05 18:36:05 -07:00
redmatrix
ecbe01e3f7 i think this is 100 2015-05-05 13:42:05 -07:00
redmatrix
ae1d0e5e75 update 99 2015-05-05 04:40:41 -07:00
redmatrix
5b5f0666f9 second pass name change 2015-05-05 03:59:51 -07:00
redmatrix
a3c37f1458 first pass name change 2015-05-05 03:56:10 -07:00
redmatrix
57fcfc9398 iteration #97 2015-05-05 01:25:27 -07:00
redmatrix
b22ae35c1a this will settle down eventually. 2015-05-05 01:10:45 -07:00
redmatrix
62f35ced47 change name 2015-05-05 00:51:08 -07:00
redmatrix
63823be5fc Merge branch 'master' of https://github.com/redmatrix/redmatrix 2015-05-05 00:50:25 -07:00
redmatrix
fd79c59865 are we there yet? 2015-05-04 21:49:48 -07:00
redmatrix
25c861c819 readme, ad nauseum 2015-05-04 21:38:53 -07:00
redmatrix
c57a1441f2 readme, yet again 2015-05-04 21:23:47 -07:00
redmatrix
e6a2095aa6 readme 2015-05-04 21:20:19 -07:00
redmatrix
7a63a88bdf readme 2015-05-04 21:14:08 -07:00
redmatrix
78bf3e4c25 readme 2015-05-04 18:51:31 -07:00
Paolo T
15fc4d05ec Merge pull request #317 from tuscanhobbit/dev
Italian translation
2015-05-04 16:36:00 +02:00
Paolo Tacconi
80e24b489f Italian translation 2015-05-04 16:34:27 +02:00
Mario Vavti
08f799fff5 fix center page content setting 2015-05-04 15:58:49 +02:00
Mario Vavti
ad7a629b96 remove obsolete linebreak 2015-05-04 15:04:21 +02:00
redmatrix
75d808f98f update readme 2015-05-04 01:15:09 -07:00
redmatrix
d3b359276f fine tuning 2015-05-03 22:59:47 -07:00