Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | 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 | |
| | | ||||||
* | | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-09-07 | 1 | -9/+13 | |
|\| | ||||||
| * | minor fix to event sync | redmatrix | 2015-09-07 | 1 | -9/+13 | |
| | | ||||||
* | | work on event sync | redmatrix | 2015-09-07 | 3 | -1/+89 | |
| | | ||||||
* | | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-09-07 | 2 | -1/+34 | |
|\| | ||||||
| * | create event sync packets | redmatrix | 2015-09-07 | 2 | -0/+33 | |
| | | ||||||
* | | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-09-07 | 2 | -4/+19 | |
|\| | | | | | | | | | | | | | Conflicts: include/items.php view/it/messages.po view/it/strings.php | |||||
| * | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-09-07 | 3 | -380/+393 | |
| |\ | ||||||
| | * | fix postgres zotfeed | Habeas Codice | 2015-09-07 | 1 | -4/+6 | |
| | | | ||||||
| | * | Merge pull request #391 from tuscanhobbit/master | Wave | 2015-09-07 | 2 | -376/+387 | |
| | |\ | | | | | | | | | Updated Italian strings | |||||
| | | * | Updated Italian strings | Paolo Tacconi | 2015-09-07 | 2 | -376/+387 | |
| | | | | ||||||
| * | | | sync posted top level items rather than deliver them (actually we do both, ↵ | redmatrix | 2015-09-07 | 1 | -3/+30 | |
| |/ / | | | | | | | | | | but sync comes first). This way we get the ACL transferred. | |||||
* | | | consolidate import_items/sync_items | redmatrix | 2015-09-07 | 6 | -102/+112 | |
| | | | ||||||
* | | | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-09-07 | 3 | -9/+12 | |
|\| | | | | | | | | | | | | | | Conflicts: util/messages.po | |||||
| * | | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-09-07 | 1 | -6/+9 | |
| |\ \ | ||||||
| | * | | uexport template fixes | Mario Vavti | 2015-09-04 | 1 | -6/+9 | |
| | | | | ||||||
| * | | | PRIVACY: item_private seems to have been removed from permissions_sql ↵ | redmatrix | 2015-09-07 | 3 | -182/+182 | |
| |/ / | | | | | | | | | | checking with an observer. | |||||
* | | | Always open rpost editor on document ready | redmatrix | 2015-09-06 | 2 | -9/+7 | |
| | | |