aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'upstream/master'Haakon Meland Eriksen2015-09-1164-833/+1535
|\
| * separate the linksredmatrix2015-09-101-1/+1
| |
| * forum mode - use linked avatar and name for title instead of "Channel: ↵redmatrix2015-09-101-1/+1
| | | | | | | | xxxxx" or "Forum: xxxx"
| * duplicated coderedmatrix2015-09-101-8/+0
| |
| * Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-09-101-0/+8
| |\ | | | | | | | | | | | | Conflicts: mod/like.php
| | * export likes to clonesredmatrix2015-09-101-1/+15
| | |
| * | sync likesredmatrix2015-09-105-2/+59
| | |
| * | provide remote delivery report at logger_debug levelredmatrix2015-09-101-2/+2
| | |
| * | Merge https://github.com/redmatrix/hubzilla into pending_mergeredmatrix2015-09-1010-108/+52
| |\ \
| | * | fix radius settingMario Vavti2015-09-101-1/+1
| | | |
| | * | make redmatrix focus scheme default for hubzillaMario Vavti2015-09-1010-108/+52
| | | |
| * | | Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-09-104-467/+477
| |\ \ \ | | |/ / | |/| / | | |/ | | | Conflicts: include/zot.php
| | * Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-09-102-463/+463
| | |\
| | | * update Spanish stringsjeroenpraat2015-09-102-463/+463
| | | |
| | * | zot_refresh: always try the hubloc pointed to by xchan_addr firstredmatrix2015-09-102-4/+13
| | |/
| * | ensure connections have a nameredmatrix2015-09-101-0/+2
| | |
| * | decentralise likes of things so they can be clonedredmatrix2015-09-091-4/+11
| | |
| * | don't auto-open the editor in forum mode. Save the forum selection text ↵redmatrix2015-09-097-1/+9
| | | | | | | | | | | | until we open it.
| * | fix the lock state when using forum moderedmatrix2015-09-091-3/+5
| | |
| * | major changes to "forum mode" on the network/matrix pageredmatrix2015-09-093-4/+11
| | |
| * | slight hack to improve public forum detection in the forum widgetredmatrix2015-09-092-1/+4
| | |
| * | Merge https://github.com/redmatrix/hubzilla into pending_mergeredmatrix2015-09-091-1/+1
| |\ \
| | * \ Merge pull request #37 from MicMee/masterredmatrix2015-09-101-1/+1
| | |\ \ | | | | | | | | | | typo
| | | * | typoMichael Meer2015-09-091-1/+1
| | |/ /
| * / / update bug reporting docoredmatrix2015-09-091-11/+25
| |/ /
| * | profile photo issues #36redmatrix2015-09-091-1/+4
| | |
| * | preserve code blocks on item import if channel has code rights. When ↵redmatrix2015-09-083-3/+81
| | | | | | | | | | | | | | | | | | importing the channel itself, turn code access off unless this is the admin.
| * | move mod_admin to Comanche finallyredmatrix2015-09-084-43/+63
| | |
| * | differentiate Community Server from Enterprise Serverredmatrix2015-09-081-2/+2
| | |
| * | issues with "use this photo for profile photo" #36redmatrix2015-09-081-5/+27
| | |
| * | Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-09-080-0/+0
| |\| | | | | | | | | | | | | | | | Conflicts: include/items.php mod/menu.php
| | * export TERM_FILE when mirroringredmatrix2015-09-082-1/+7
| | |
| | * merge conflictsredmatrix2015-09-082-2/+2
| | |
| * | export TERM_FILE when mirroringredmatrix2015-09-081-2/+7
| | |
| * | Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-09-081-0/+1
| |\| | | | | | | | | | | | | | | | | | | Conflicts: include/menu.php mod/menu.php mod/mitem.php
| | * add sync packets for menusredmatrix2015-09-083-1/+19
| | |
| * | debugging menu syncredmatrix2015-09-082-2/+3
| | |
| * | Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-09-082-2/+11
| |\| | | | | | | | | | | | | Conflicts: include/identity.php
| | * menu exportredmatrix2015-09-082-2/+12
| | |
| * | menu import and syncredmatrix2015-09-088-3/+167
| | |
| * | Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-09-071-0/+19
| |\|
| | * export eventsredmatrix2015-09-071-0/+19
| | |
| * | Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-09-071-9/+13
| |\|
| | * minor fix to event syncredmatrix2015-09-071-9/+13
| | |
| * | work on event syncredmatrix2015-09-073-1/+89
| | |
| * | Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-09-072-1/+34
| |\|
| | * create event sync packetsredmatrix2015-09-072-0/+33
| | |
| * | Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-09-072-4/+19
| |\| | | | | | | | | | | | | | | | | | | Conflicts: include/items.php view/it/messages.po view/it/strings.php
| | * Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-09-073-380/+393
| | |\
| | | * fix postgres zotfeedHabeas Codice2015-09-071-4/+6
| | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-03 06:06:31 +0000