Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-09-11 | 1 | -1/+4 |
|\ | |||||
| * | log the remote message if there was one | redmatrix | 2015-09-11 | 1 | -1/+4 |
| | | |||||
* | | Merge https://github.com/redmatrix/hubzilla into pending_merge | redmatrix | 2015-09-11 | 7 | -25/+22 |
|\ \ | |||||
| * | | center page content by default - css file | Mario Vavti | 2015-09-11 | 1 | -0/+8 |
| | | | |||||
| * | | center page content by default | Mario Vavti | 2015-09-11 | 6 | -23/+13 |
| | | | |||||
| * | | css fix | Mario Vavti | 2015-09-11 | 1 | -2/+1 |
| | | | |||||
* | | | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-09-11 | 3 | -21/+37 |
|\ \ \ | | |/ | |/| | | | | | | | Conflicts: util/messages.po | ||||
| * | | another tactic to deal with orphan hublocs from re-installs, or at least ↵ | redmatrix | 2015-09-11 | 4 | -205/+221 |
| | | | | | | | | | | | | allow the descendant channel to survive | ||||
* | | | minor change on invite | redmatrix | 2015-09-11 | 1 | -1/+1 |
| |/ |/| | |||||
* | | separate the links | redmatrix | 2015-09-10 | 1 | -1/+1 |
| | | |||||
* | | forum mode - use linked avatar and name for title instead of "Channel: ↵ | redmatrix | 2015-09-10 | 1 | -1/+1 |
| | | | | | | | | xxxxx" or "Forum: xxxx" | ||||
* | | duplicated code | redmatrix | 2015-09-10 | 1 | -8/+0 |
| | | |||||
* | | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-09-10 | 1 | -0/+8 |
|\| | | | | | | | | | Conflicts: mod/like.php | ||||
| * | export likes to clones | redmatrix | 2015-09-10 | 1 | -1/+15 |
| | | |||||
* | | sync likes | redmatrix | 2015-09-10 | 5 | -2/+59 |
| | | |||||
* | | provide remote delivery report at logger_debug level | redmatrix | 2015-09-10 | 1 | -2/+2 |
| | | |||||
* | | Merge https://github.com/redmatrix/hubzilla into pending_merge | redmatrix | 2015-09-10 | 10 | -108/+52 |
|\ \ | |||||
| * | | fix radius setting | Mario Vavti | 2015-09-10 | 1 | -1/+1 |
| | | | |||||
| * | | make redmatrix focus scheme default for hubzilla | Mario Vavti | 2015-09-10 | 10 | -108/+52 |
| | | | |||||
* | | | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-09-10 | 4 | -467/+477 |
|\ \ \ | |/ / |/| / | |/ | | | Conflicts: include/zot.php | ||||
| * | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-09-10 | 2 | -463/+463 |
| |\ | |||||
| | * | update Spanish strings | jeroenpraat | 2015-09-10 | 2 | -463/+463 |
| | | | |||||
| * | | zot_refresh: always try the hubloc pointed to by xchan_addr first | redmatrix | 2015-09-10 | 2 | -4/+13 |
| |/ | |||||
* | | ensure connections have a name | redmatrix | 2015-09-10 | 1 | -0/+2 |
| | | |||||
* | | decentralise likes of things so they can be cloned | redmatrix | 2015-09-09 | 1 | -4/+11 |
| | | |||||
* | | don't auto-open the editor in forum mode. Save the forum selection text ↵ | redmatrix | 2015-09-09 | 7 | -1/+9 |
| | | | | | | | | until we open it. | ||||
* | | fix the lock state when using forum mode | redmatrix | 2015-09-09 | 1 | -3/+5 |
| | | |||||
* | | major changes to "forum mode" on the network/matrix page | redmatrix | 2015-09-09 | 3 | -4/+11 |
| | | |||||
* | | slight hack to improve public forum detection in the forum widget | redmatrix | 2015-09-09 | 2 | -1/+4 |
| | | |||||
* | | Merge https://github.com/redmatrix/hubzilla into pending_merge | redmatrix | 2015-09-09 | 1 | -1/+1 |
|\ \ | |||||
| * \ | Merge pull request #37 from MicMee/master | redmatrix | 2015-09-10 | 1 | -1/+1 |
| |\ \ | | | | | | | | | typo | ||||
| | * | | typo | Michael Meer | 2015-09-09 | 1 | -1/+1 |
| |/ / | |||||
* / / | update bug reporting doco | redmatrix | 2015-09-09 | 1 | -11/+25 |
|/ / | |||||
* | | profile photo issues #36 | redmatrix | 2015-09-09 | 1 | -1/+4 |
| | | |||||
* | | preserve code blocks on item import if channel has code rights. When ↵ | redmatrix | 2015-09-08 | 3 | -3/+81 |
| | | | | | | | | | | | | importing the channel itself, turn code access off unless this is the admin. | ||||
* | | move mod_admin to Comanche finally | redmatrix | 2015-09-08 | 4 | -43/+63 |
| | | |||||
* | | differentiate Community Server from Enterprise Server | redmatrix | 2015-09-08 | 1 | -2/+2 |
| | | |||||
* | | issues with "use this photo for profile photo" #36 | redmatrix | 2015-09-08 | 1 | -5/+27 |
| | | |||||
* | | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-09-08 | 0 | -0/+0 |
|\| | | | | | | | | | | | Conflicts: include/items.php mod/menu.php | ||||
| * | export TERM_FILE when mirroring | redmatrix | 2015-09-08 | 2 | -1/+7 |
| | | |||||
| * | merge conflicts | redmatrix | 2015-09-08 | 2 | -2/+2 |
| | | |||||
* | | export TERM_FILE when mirroring | redmatrix | 2015-09-08 | 1 | -2/+7 |
| | | |||||
* | | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-09-08 | 1 | -0/+1 |
|\| | | | | | | | | | | | | | Conflicts: include/menu.php mod/menu.php mod/mitem.php | ||||
| * | add sync packets for menus | redmatrix | 2015-09-08 | 3 | -1/+19 |
| | | |||||
* | | debugging menu sync | redmatrix | 2015-09-08 | 2 | -2/+3 |
| | | |||||
* | | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-09-08 | 2 | -2/+11 |
|\| | | | | | | | | | Conflicts: include/identity.php | ||||
| * | menu export | redmatrix | 2015-09-08 | 2 | -2/+12 |
| | | |||||
* | | menu import and sync | redmatrix | 2015-09-08 | 8 | -3/+167 |
| | | |||||
* | | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-09-07 | 1 | -0/+19 |
|\| | |||||
| * | export events | redmatrix | 2015-09-07 | 1 | -0/+19 |
| | |