aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| | * | fix banner for full flavourMario Vavti2015-09-131-4/+3
| | | |
| | * | hopefully fix banner for choklet flavourMario Vavti2015-09-135-22/+17
| | | |
| * | | profile photo change activitiesredmatrix2015-09-131-5/+67
| |/ /
| * | Merge https://github.com/redmatrix/hubzilla into pending_mergeredmatrix2015-09-123-27/+18
| |\ \
| | * | an attempt to fix the banner messMario Vavti2015-09-123-27/+18
| | | |
| * | | check for empty word after trimredmatrix2015-09-121-0/+4
| |/ /
| * | Merge pull request #38 from MicMee/masterredmatrix2015-09-121-3/+3
| |\ \ | | | | | | | | ensure that living sites are marked as alive
| | * | ensure that living sites are marked as aliveMichael Meer2015-09-111-3/+3
| | | |
| * | | Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-09-111-1/+4
| |\ \ \ | | | |/ | | |/|
| | * | log the remote message if there was oneredmatrix2015-09-111-1/+4
| | | |
| * | | Merge https://github.com/redmatrix/hubzilla into pending_mergeredmatrix2015-09-117-25/+22
| |\ \ \ | | | |/ | | |/|
| | * | center page content by default - css fileMario Vavti2015-09-111-0/+8
| | | |
| | * | center page content by defaultMario Vavti2015-09-116-23/+13
| | | |
| | * | css fixMario Vavti2015-09-111-2/+1
| | | |
| * | | Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-09-113-21/+37
| |\ \ \ | | | |/ | | |/| | | | | | | | | Conflicts: util/messages.po
| | * | another tactic to deal with orphan hublocs from re-installs, or at least ↵redmatrix2015-09-114-205/+221
| | | | | | | | | | | | | | | | allow the descendant channel to survive
| * | | minor change on inviteredmatrix2015-09-111-1/+1
| | |/ | |/|
* | | Merge remote-tracking branch 'upstream/master'zottel2015-09-1120-580/+593
|\| |
| * | 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
| | |
* | | Merge remote-tracking branch 'upstream/master'zottel2015-09-1014-25/+69
|\| |
| * | 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
| | |
* | | Merge remote-tracking branch 'upstream/master'zottel2015-09-0917-61/+361
|\| |
| * | 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
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-03 13:38:58 +0000