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 |
|
redmatrix
|
ec1dcb8f2e
|
Merge branch 'master' of https://github.com/redmatrix/redmatrix
Conflicts:
util/messages.po
|
2015-06-06 17:31:22 -07:00 |
|
Mario Vavti
|
d84f77bbc6
|
use the right webpage layout for an installed webpage if it exists
|
2015-06-04 23:04:58 +02:00 |
|
redmatrix
|
f3b95f591a
|
Merge branch 'master' of https://github.com/redmatrix/redmatrix
|
2015-05-31 19:26:00 -07:00 |
|
Mario Vavti
|
8516b3259f
|
whitespace
|
2015-05-29 16:14:54 +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 |
|
redmatrix
|
3c82156d63
|
untested menu element import, be aware that the menu api does not over-write on duplicate name - it just fails. We'll need to sort this out eventually. Also it was planned to offer a choice of whether to preserve links from the source site or change the baseurl to the local one. Currently we convert them all to local links.
|
2015-05-28 20:50:29 -07:00 |
|
redmatrix
|
8fe3daab21
|
Merge branch 'master' of https://github.com/redmatrix/redmatrix
Conflicts:
install/schema_mysql.sql
mod/impel.php
view/pt-br/messages.po
view/pt-br/strings.php
|
2015-05-28 19:06:31 -07:00 |
|
redmatrix
|
b381ec5734
|
Merge branch 'master' of https://github.com/redmatrix/redmatrix
Conflicts:
mod/impel.php
|
2015-05-27 19:27:38 -07:00 |
|
redmatrix
|
2dd02cc166
|
missing row in sql query which is used further down
|
2015-05-27 19:26:42 -07:00 |
|
redmatrix
|
11301d51a5
|
some high-level stuff we may need for shareable menus. Also make the client register function do the right thing even though I refuse to make it work. If **you** want service federation with things like pumpio and openid connect, it's time for **you** to put your own skin in the game and quit treating project volunteers like excrement just because you can't get up off your lazy buttocks.
|
2015-05-27 17:30:36 -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
|
0689816772
|
check for success before updating remote id
|
2015-05-20 19:27:05 -07:00 |
|
redmatrix
|
acc8e10a45
|
merge redmatrix fix
|
2015-05-19 18:28:52 -07:00 |
|
redmatrix
|
d63bcde6e2
|
Merge branch 'master' of https://github.com/redmatrix/redmatrix
|
2015-05-19 18:26:46 -07:00 |
|
redmatrix
|
fe00d29047
|
issue with deleting imported design elements and re-installing them
|
2015-05-19 18:25:27 -07:00 |
|
friendica
|
c4221f3273
|
Merge branch 'master' into tres
Conflicts:
include/notifier.php
|
2015-04-29 21:49:43 -07:00 |
|
Mario Vavti
|
2583cab469
|
add title to element array
|
2015-04-24 14:14:33 +02:00 |
|
friendica
|
912be23e16
|
Merge branch 'master' into tres
Conflicts:
include/group.php
include/text.php
mod/acl.php
mod/channel.php
mod/connections.php
mod/display.php
mod/group.php
mod/item.php
mod/locs.php
mod/network.php
mod/photos.php
mod/ping.php
mod/starred.php
mod/viewsrc.php
|
2015-01-29 15:09:35 -08:00 |
|
friendica
|
ff68ea6087
|
more message restrict conversions
|
2015-01-29 14:51:41 -08:00 |
|
friendica
|
a496036066
|
local_user => local_channel
|
2015-01-28 20:56:04 -08:00 |
|
friendica
|
dfdef0af0d
|
provide a setting to control ALLOWCODE permissions at the channel level - it isn't always appropriate to apply this to all channels in an account.
|
2015-01-13 18:30:30 -08:00 |
|
friendica
|
03bbbdaf10
|
shareable design elements
|
2014-10-06 17:47:17 -07:00 |
|
friendica
|
ec604a4158
|
more infrastructure for sharing page design elements
|
2014-10-03 16:51:22 -07:00 |
|
friendica
|
f5623ae11d
|
doc updates
|
2014-10-03 03:34:50 -07:00 |
|