redmatrix
|
a6cb90c81c
|
Merge branch 'master' into tres
Conflicts:
include/Import/refimport.php
include/activities.php
include/attach.php
include/event.php
include/externals.php
include/identity.php
include/items.php
include/notifier.php
include/photos.php
include/taxonomy.php
include/zot.php
mod/channel.php
mod/connedit.php
mod/events.php
mod/item.php
mod/like.php
mod/manage.php
mod/mood.php
mod/ping.php
mod/poke.php
mod/subthread.php
mod/tagger.php
mod/thing.php
|
2015-05-14 18:02:29 -07: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 |
|
Mario Vavti
|
ca36fce9a7
|
provide drop down submenu suggestions in edit mode
|
2015-05-10 21:17:37 +02: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 |
|
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
|
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
|
c186e6ed96
|
change notification colour
|
2015-05-06 21:25:59 -07:00 |
|
redmatrix
|
75b8bfc07a
|
Merge branch 'master' of https://github.com/redmatrix/redmatrix
|
2015-05-06 18:39:12 -07: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
|
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 |
|
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 |
|
jeroenpraat
|
35a446445b
|
Updating Dutch
|
2015-05-02 18:23:23 +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 |
|
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 |
|
Mario Vavti
|
d6152d809a
|
revert some changes in justified gallery
|
2015-04-28 22:06:09 +02:00 |
|
Mario Vavti
|
31b5b06e42
|
Provide webpage layout description
|
2015-04-25 22:35:24 +02:00 |
|
Mario Vavti
|
fcaa980a3f
|
css fixes
|
2015-04-24 22:51:59 +02:00 |
|
Mario Vavti
|
b7f6cceaea
|
provide block titles in blocklist
|
2015-04-24 22:37:22 +02:00 |
|
Mario Vavti
|
c6a75f407d
|
webpages layout fixes
|
2015-04-24 11:36:49 +02: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 |
|
Mario Vavti
|
b4dff3a9ff
|
provide headings for blocks and layouts
|
2015-04-22 10:31:36 +02:00 |
|
Mario Vavti
|
09096811ca
|
missing class
|
2015-04-21 23:30:12 +02:00 |
|
Mario Vavti
|
ba524e1a72
|
move .lockview to style.css and a typo
|
2015-04-21 23:27:30 +02:00 |
|
Mario Vavti
|
c52682c68f
|
missing dropdown class
|
2015-04-21 23:21:09 +02:00 |
|
Mario Vavti
|
e58e8f3f75
|
bring lockstate to webpages
|
2015-04-21 23:08:54 +02:00 |
|
Mario Vavti
|
21704ecb93
|
bring lockview to menu items, slightly change the way /lockview is called
|
2015-04-21 22:45:54 +02:00 |
|
Mario Vavti
|
0bd9fe0b11
|
rework and hopefully improve webpage menu creation workflow
|
2015-04-21 10:05:26 +02:00 |
|
friendica
|
6bc2766d79
|
issue #162
|
2015-04-20 20:49:55 -07:00 |
|
Mario Vavti
|
71117628bc
|
attach an id to menues, allow $menu_title to be empty, if no custom menu class is provided use default redbasic classes
|
2015-04-19 15:22:50 +02:00 |
|
Mario Vavti
|
dd5b97639e
|
Introduce wrap variable in comanche blocks (if set to none the block will not be wrapped in a div), fix menu item permissions (it was not possible to set them visible for everybody) and a typo
|
2015-04-19 13:25:05 +02:00 |
|
Mario Vavti
|
11b7fedd29
|
css fix
|
2015-04-18 16:23:14 +02:00 |
|
Mario Vavti
|
3ee78398aa
|
fix page-title margin
|
2015-04-18 13:32:40 +02:00 |
|
friendica
|
9f35971860
|
Merge https://github.com/redmatrix/redmatrix into pending_merge
|
2015-04-17 17:21:10 -07:00 |
|
friendica
|
3d99a6b5c4
|
hide event share button when editing an event
|
2015-04-17 17:20:24 -07:00 |
|
Mario Vavti
|
c02ff823f6
|
adjus webpage font size to match conv item font size
|
2015-04-17 13:53:09 +02:00 |
|
Mario Vavti
|
61e4ee753d
|
allow jot to be displayed expanded, remove deprected datetimepicker js and some random fixes
|
2015-04-17 11:20:22 +02:00 |
|
Mario Vavti
|
10cc643f65
|
wording and css fixes
|
2015-04-16 23:46:12 +02:00 |
|