aboutsummaryrefslogtreecommitdiffstats
path: root/mod/impel.php
Commit message (Collapse)AuthorAgeFilesLines
* static Appredmatrix2016-03-311-1/+1
|
* more work on itemsredmatrix2015-06-111-1/+1
|\ | | | | | | | | | | | | | | | | | | | | and Merge branch 'master' of https://github.com/redmatrix/redmatrix Conflicts: include/items.php view/it/messages.po view/it/strings.php
* | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-06-061-0/+1
|\| | | | | | | | | Conflicts: util/messages.po
| * use the right webpage layout for an installed webpage if it existsMario Vavti2015-06-041-0/+1
| |
* | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-05-311-7/+50
|\|
| * whitespaceMario Vavti2015-05-291-1/+1
| |
| * some fixes to make menu sharing work and expose it in the ui.Mario Vavti2015-05-291-5/+9
| |
| * untested menu element import, be aware that the menu api does not over-write ↵redmatrix2015-05-281-7/+46
| | | | | | | | 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.
* | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-05-281-0/+1
|\| | | | | | | | | | | | | | | Conflicts: install/schema_mysql.sql mod/impel.php view/pt-br/messages.po view/pt-br/strings.php
| * missing row in sql query which is used further downredmatrix2015-05-271-1/+1
| |
* | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-05-271-57/+83
|\| | | | | | | | | Conflicts: mod/impel.php
| * some high-level stuff we may need for shareable menus. Also make the client ↵redmatrix2015-05-271-57/+83
| | | | | | | | 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.
* | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-05-201-8/+9
|\| | | | | | | | | | | | | | | Conflicts: include/items.php include/text.php mod/item.php view/nl/messages.po
| * check for success before updating remote idredmatrix2015-05-201-8/+9
| |
* | merge redmatrix fixredmatrix2015-05-191-2/+2
| |
* | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-05-191-1/+9
|\|
| * issue with deleting imported design elements and re-installing themredmatrix2015-05-191-1/+9
| |
* | Merge branch 'master' into tresfriendica2015-04-291-1/+1
|\| | | | | | | | | Conflicts: include/notifier.php
| * add title to element arrayMario Vavti2015-04-241-1/+1
| |
* | Merge branch 'master' into tresfriendica2015-01-291-5/+5
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * local_user => local_channelfriendica2015-01-281-5/+5
| |
* | more message restrict conversionsfriendica2015-01-291-3/+3
|/
* provide a setting to control ALLOWCODE permissions at the channel level - it ↵friendica2015-01-131-2/+2
| | | | isn't always appropriate to apply this to all channels in an account.
* shareable design elementsfriendica2014-10-061-11/+19
|
* more infrastructure for sharing page design elementsfriendica2014-10-031-1/+43
|
* doc updatesfriendica2014-10-031-0/+71