Commit graph

13606 commits

Author SHA1 Message Date
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
redmatrix
5153f93d70 try and update user variables 2015-05-03 22:52:08 -07:00
friendica
f8447550e0 update readme 2015-05-03 22:46:36 -07:00
jeroenpraat
35a446445b Updating Dutch 2015-05-02 18:23:23 +02:00
friendica
b467dc4f00 Merge branch 'master' into tres 2015-05-01 13:19:19 -07:00
friendica
e4fe068ed5 more performance work 2015-04-30 18:16:54 -07:00
friendica
9fc87d43c9 Merge https://github.com/redmatrix/redmatrix into pending_merge 2015-04-30 17:53:47 -07:00
friendica
097002910e just a test, please do not try to implement this as there are severe security issues 2015-04-30 17:52:34 -07:00
Mario Vavti
e8d2dd7204 document [var=wrap]none[/var] for block elements 2015-04-30 18:18:46 +02:00
friendica
c4221f3273 Merge branch 'master' into tres
Conflicts:
	include/notifier.php
2015-04-29 21:49:43 -07:00
Mario Vavti
2376d2140a fix block view 2015-04-29 21:43:41 +02:00
Mario Vavti
310d122901 disable voting in blocks, layouts and webpages 2015-04-29 21:36:53 +02:00
Mario Vavti
e56b8fdfaf fix $noloc state in mod editwebpages 2015-04-29 16:45:05 +02:00
Mario Vavti
f987fc3e6f adjust placeholder naming 2015-04-29 16:33:03 +02:00
friendica
bc44b6f793 Merge https://github.com/redmatrix/redmatrix into pending_merge 2015-04-28 13:14:40 -07:00
friendica
8711c223f3 version update 2015-04-28 13:14:15 -07:00
redmatrix
a4ffbe77c7 Merge pull request #316 from oliverlorenz/patch-1
Thank you! Updated INSTALL.txt - outdated link corrected
2015-04-29 06:13:20 +10:00
Mario Vavti
d6152d809a revert some changes in justified gallery 2015-04-28 22:06:09 +02:00
Oliver Lorenz
c6400b30c9 Updated INSTALL.txt - outdated link corrected 2015-04-28 15:09:18 +02:00
Mario Vavti
31b5b06e42 Provide webpage layout description 2015-04-25 22:35:24 +02:00
friendica
e01873b4cf Merge https://github.com/redmatrix/redmatrix into pending_merge 2015-04-24 15:01:59 -07:00
friendica
268307b534 zotfeed issues 2015-04-24 15:01:37 -07:00
Mario Vavti
fcaa980a3f css fixes 2015-04-24 22:51:59 +02:00
Mario Vavti
cc3c1107bd add widget class to blocks again by default. we have the wrap variable now to remove the div wrapper if necessary. 2015-04-24 22:41:56 +02:00
Mario Vavti
b7f6cceaea provide block titles in blocklist 2015-04-24 22:37:22 +02:00
Mario Vavti
2583cab469 add title to element array 2015-04-24 14:14:33 +02:00
Mario Vavti
da0875a015 there is no key named term in this array 2015-04-24 12:43:41 +02:00
Mario Vavti
9894a7b2d0 copy/paste typo 2015-04-24 12:37:13 +02:00
Mario Vavti
c6a75f407d webpages layout fixes 2015-04-24 11:36:49 +02:00
friendica
98b3d7d6ff reset route 2015-04-24 00:59:02 -07:00
friendica
b3ac1cd993 mod/branchtopic - move an off-topic comment to its own thread as a fresh wall-to-wall post and the same delivery permissions as its parent. No adjustments are made for complex delivery chains. 2015-04-24 00:56:06 -07:00
friendica
41343b32c5 block unfederated posts from zot_feed 2015-04-23 21:45:42 -07:00
friendica
ca305f5421 Merge https://github.com/redmatrix/redmatrix into pending_merge 2015-04-23 21:29:27 -07:00
friendica
5ac177391b disconnect 2015-04-23 21:13:59 -07:00
friendica
6679734135 Merge branch 'master' into tres
Conflicts:
	include/Contact.php
	include/ItemObject.php
	include/api.php
	include/attach.php
	include/diaspora.php
	include/dir_fns.php
	include/enotify.php
	include/event.php
	include/expire.php
	include/items.php
	include/notifier.php
	include/notify.php
	include/photos.php
	include/taxonomy.php
	include/text.php
	include/widgets.php
	include/zot.php
	mod/admin.php
	mod/channel.php
	mod/dirsearch.php
	mod/display.php
	mod/editwebpage.php
	mod/events.php
	mod/home.php
	mod/item.php
	mod/manage.php
	mod/mood.php
	mod/network.php
	mod/page.php
	mod/photos.php
	mod/ping.php
	mod/post.php
	mod/thing.php
	mod/viewsrc.php
	view/css/mod_events.css
2015-04-23 19:49:41 -07:00
Mario Vavti
c696860cc5 webpages blocks fixes 2015-04-23 21:04:01 +02:00
friendica
4759fa662b explain a bit more about the structure and scope 2015-04-22 16:56:42 -07:00
Mario Vavti
29061b3ee3 do not show acl button if not owner 2015-04-22 12:31:30 +02:00
Mario Vavti
dfc88a41df fix webpages profile_tabs 2015-04-22 12:21:33 +02:00