redmatrix
|
e8f19c1e15
|
Merge branch 'master' of https://github.com/redmatrix/redmatrix
Conflicts:
mod/connedit.php
|
2015-07-14 17:10:13 -07:00 |
|
Mario Vavti
|
104cbcab72
|
make strings translateable
|
2015-07-14 21:32:18 +02:00 |
|
Mario Vavti
|
4fe64179c8
|
disable the inherited checkboxes for notself
|
2015-07-14 19:29:49 +02:00 |
|
Mario Vavti
|
cc1764989f
|
fix mod_connedit.js after cleanup
|
2015-07-14 17:37:33 +02:00 |
|
Mario Vavti
|
f267bd55d6
|
revert this until further investigation
|
2015-07-14 14:20:23 +02:00 |
|
Mario Vavti
|
7f71297383
|
cleanup connedit
|
2015-07-14 12:46:40 +02:00 |
|
redmatrix
|
6916c1076c
|
Merge branch 'master' of https://github.com/redmatrix/redmatrix
|
2015-07-13 17:43:10 -07:00 |
|
Mario Vavti
|
f81874ca49
|
fix sys channel menu in a morre standard way
|
2015-07-12 01:04:57 +02:00 |
|
Mario Vavti
|
d8f03450e7
|
make menu creation for sys channel work
|
2015-07-12 00:40:12 +02:00 |
|
redmatrix
|
a497d8ee66
|
Merge branch 'master' of https://github.com/redmatrix/redmatrix
Conflicts:
mod/editpost.php
util/messages.po
view/nl/messages.po
view/nl/strings.php
|
2015-07-10 14:27:41 -07:00 |
|
Mario Vavti
|
fee607db56
|
more webpages - generic-content-wrapper fixes
|
2015-07-10 13:16:45 +02:00 |
|
Mario Vavti
|
1554b5a2ee
|
add generic content wrapper to post/webpage editor and make editpost render correctly
|
2015-07-10 12:46:20 +02:00 |
|
Mario Vavti
|
115c18353e
|
move profile image up and refine the aside width
|
2015-07-09 14:44:24 +02:00 |
|
Mario Vavti
|
efa55437d4
|
increase width of the aside area and make default profile image size 300x300
|
2015-07-09 13:59:16 +02:00 |
|
redmatrix
|
6b41074396
|
Merge branch 'master' of https://github.com/redmatrix/redmatrix
|
2015-07-07 16:50:25 -07:00 |
|
Mario Vavti
|
f6cf992aee
|
fix sorting of channel suggestions
|
2015-07-07 22:48:01 +02:00 |
|
Mario Vavti
|
f67d9d59af
|
rename function get_directory_settings => get_directory_setting and move sort options to directory title bar
|
2015-07-07 22:29:27 +02:00 |
|
Mario Vavti
|
adfb4072e8
|
various css fixes
|
2015-07-07 12:13:15 +02:00 |
|
Mario Vavti
|
807471d2a5
|
move if clause outside of the div
|
2015-07-07 09:56:30 +02:00 |
|
Mario Vavti
|
ee01e67fa7
|
use default style for default webpage
|
2015-07-07 09:41:27 +02:00 |
|
redmatrix
|
97e8275dc2
|
Merge branch 'master' of https://github.com/redmatrix/redmatrix
|
2015-06-29 22:19:44 -07:00 |
|
redmatrix
|
0b347ccc14
|
turn the connection filter into a feature.
|
2015-06-29 20:35:56 -07:00 |
|
redmatrix
|
6e8ad5089e
|
Merge branch 'master' of https://github.com/redmatrix/redmatrix
Conflicts:
view/nl/messages.po
view/nl/strings.php
|
2015-06-29 18:01:51 -07:00 |
|
Mario Vavti
|
7ef4397634
|
fix directory location
|
2015-06-29 14:25:04 +02:00 |
|
redmatrix
|
63f2e9b412
|
Merge branch 'master' of https://github.com/redmatrix/redmatrix
Conflicts:
include/zot.php
mod/connedit.php
util/messages.po
|
2015-06-28 22:33:13 -07:00 |
|
redmatrix
|
de13497333
|
no this isn't it. well ok, it's part of it, but not the important part. it's still pretty cool.
|
2015-06-28 21:16:56 -07:00 |
|
redmatrix
|
b06b6f798f
|
localise event calendar
|
2015-06-25 18:23:48 -07:00 |
|
Mario Vavti
|
e9cc06dc11
|
directory: only provide connect button if we are not already connected
|
2015-06-24 21:12:20 +02:00 |
|
redmatrix
|
833098e346
|
Merge branch 'master' of https://github.com/redmatrix/redmatrix
Conflicts:
include/items.php
mod/item.php
|
2015-06-23 17:30:35 -07:00 |
|
Mario Vavti
|
b6c4601d8f
|
some work on directory
|
2015-06-23 13:06:22 +02:00 |
|
Mario Vavti
|
a4775aab9b
|
Bring /help in line with the rest of the app
|
2015-06-22 14:02:14 +02:00 |
|
redmatrix
|
ae6612025d
|
Merge branch 'master' of https://github.com/redmatrix/redmatrix
Conflicts:
include/items.php
util/messages.po
|
2015-06-21 20:51:07 -07:00 |
|
redmatrix
|
68534fd5dc
|
some diaspora import issues uncovered during dry-run tests
|
2015-06-21 17:30:23 -07:00 |
|
Mario Vavti
|
c1e0987b88
|
do not show default in scheme selection dropdown. default.php and default.css should be symlinks. adjust doco accordingly.
|
2015-06-21 17:53:44 +02:00 |
|
Mario Vavti
|
8b563951ff
|
more generic-content-wrapper and some css fixes
|
2015-06-19 15:49:06 +02:00 |
|
Mario Vavti
|
1432b1e83f
|
cloud.tpl
|
2015-06-19 12:45:18 +02:00 |
|
Mario Vavti
|
de84f48e2f
|
bring some more generic-content-wrappers and fix some of them
|
2015-06-19 12:44:11 +02:00 |
|
redmatrix
|
2963be60e5
|
more photos work
|
2015-06-17 18:26:56 -07:00 |
|
redmatrix
|
6ab20eb1b5
|
lots of work on merging photo and file albums/folders
|
2015-06-17 17:44:31 -07:00 |
|
redmatrix
|
8c7472c6c3
|
Merge branch 'master' of https://github.com/redmatrix/redmatrix
Conflicts:
view/nl/messages.po
view/nl/strings.php
|
2015-06-15 17:30:08 -07:00 |
|
Mario Vavti
|
905cd1da5b
|
do not allow/show acl button on photo edit if not owner
|
2015-06-15 13:04:16 +02:00 |
|
redmatrix
|
5733491ac8
|
more work on items
and
Merge branch 'master' of https://github.com/redmatrix/redmatrix
Conflicts:
include/items.php
view/it/messages.po
view/it/strings.php
|
2015-06-11 17:56:56 -07:00 |
|
Mario Vavti
|
c8fe408a62
|
fix rendering of affinity slider
|
2015-06-11 11:35:21 +02:00 |
|
redmatrix
|
eb6a1f8387
|
Merge branch 'master' of https://github.com/redmatrix/redmatrix
|
2015-06-09 19:39:21 -07:00 |
|
redmatrix
|
9592f7f3e6
|
put mirror_frontpage setting into admin/site
|
2015-06-09 19:37:12 -07:00 |
|
redmatrix
|
d08c43d80c
|
toggle diaspora protocol on a per-channel level in addition to the existing per site setting. Default is enabled if the site setting is enabled.
|
2015-06-09 18:50:11 -07:00 |
|
redmatrix
|
03357481f7
|
Merge branch 'master' of https://github.com/redmatrix/redmatrix
Conflicts:
install/schema_mysql.sql
mod/home.php
mod/page.php
view/nl/messages.po
view/nl/strings.php
|
2015-06-09 16:52:00 -07:00 |
|
redmatrix
|
3c5a5a9ebf
|
more frontpage tweaks
|
2015-06-07 18:59:14 -07:00 |
|
redmatrix
|
60cfea5d1f
|
reverse logic of homepage login setting
|
2015-06-07 18:27:05 -07:00 |
|
redmatrix
|
0537ff1e4a
|
frontpage tweaks
|
2015-06-07 18:15:26 -07:00 |
|
redmatrix
|
ec1dcb8f2e
|
Merge branch 'master' of https://github.com/redmatrix/redmatrix
Conflicts:
util/messages.po
|
2015-06-06 17:31:22 -07:00 |
|
jeroenpraat
|
93237f8d0a
|
Added translatable strings to the Display Settings page and refreshed util/messages.po.
|
2015-06-06 19:49:30 +02:00 |
|
redmatrix
|
f3b95f591a
|
Merge branch 'master' of https://github.com/redmatrix/redmatrix
|
2015-05-31 19:26:00 -07:00 |
|
Mario Vavti
|
d11d130021
|
add some yes/no labels and minor template fixes
|
2015-05-29 15:23:51 +02:00 |
|
Mario Vavti
|
b8d3280763
|
some fixes to make menu sharing work and expose it in the ui.
|
2015-05-29 13:08:01 +02:00 |
|
Mario Vavti
|
5f1ae2930b
|
show created/edited dates for menus
|
2015-05-29 11:07:57 +02:00 |
|
redmatrix
|
675aa96f22
|
Merge branch 'master' of https://github.com/redmatrix/redmatrix
|
2015-05-25 17:01:02 -07:00 |
|
redmatrix
|
23abfb0a5b
|
add toggle for ALLOWCODE to admin/channel and also fix the ability to toggle the censor flag from that page.
|
2015-05-25 16:56:28 -07:00 |
|
redmatrix
|
3763f74a10
|
Merge branch 'master' of https://github.com/redmatrix/redmatrix
Conflicts:
include/items.php
include/text.php
mod/item.php
view/nl/messages.po
|
2015-05-20 20:49:06 -07:00 |
|
redmatrix
|
6466774b6e
|
PRIVACY: possible privacy leakage under a defined set of circumstances
|
2015-05-20 18:46:23 -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 |
|
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 |
|
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 |
|
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 |
|
Mario Vavti
|
2376d2140a
|
fix block view
|
2015-04-29 21:43:41 +02:00 |
|
friendica
|
8711c223f3
|
version update
|
2015-04-28 13:14:15 -07:00 |
|
Mario Vavti
|
31b5b06e42
|
Provide webpage layout description
|
2015-04-25 22:35:24 +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 |
|
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
|
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 |
|
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
|
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
|
9addc4581e
|
provide a separate input field for rpost attachments
|
2015-04-16 23:26:11 +02:00 |
|
Mario Vavti
|
86ac9c0d6b
|
move share webpage element from editwebpage to webpages and make it shareable with rpost
|
2015-04-16 10:43:14 +02:00 |
|
Mario Vavti
|
834044b15b
|
title=>name
|
2015-04-15 09:20:27 +02:00 |
|
Mario Vavti
|
953819e7da
|
css fixes and remove expert mode for block page content type
|
2015-04-14 12:52:31 +02:00 |
|
Mario Vavti
|
865b602cf8
|
webpages appearence
|
2015-04-13 23:38:36 +02:00 |
|
Mario Vavti
|
05f018e509
|
add bs classes to design tools menu
|
2015-04-13 17:24:37 +02:00 |
|
Mario Vavti
|
aeb162e963
|
remove superfluous view/preview buttons
|
2015-04-13 16:49:08 +02:00 |
|
Mario Vavti
|
22c3202f22
|
remove widget class from webpage blocks and make titles h2 to match the rest of the matrix
|
2015-04-13 16:17:10 +02:00 |
|
Michael Johnston
|
6e633924bd
|
only add the h3 tag to the page if there is a title
|
2015-04-12 17:24:32 -04:00 |
|
Mario Vavti
|
c6873529f4
|
bring ajax delete to files
|
2015-04-12 15:01:06 +02:00 |
|