Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | | | | | | | | | | | | don't deliver to dead hubs | redmatrix | 2015-09-14 | 2 | -27/+18 | |
* | | | | | | | | | | | | | | | | | Merge https://github.com/redmatrix/hubzilla into pending_merge | redmatrix | 2015-09-14 | 2 | -0/+6 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge pull request #41 from redmatrix/display_load_average | redmatrix | 2015-09-15 | 2 | -0/+6 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | | | | | Update siteinfo.tpl | jeroenpraat | 2015-09-14 | 1 | -0/+1 | |
| | * | | | | | | | | | | | | | | | | | Update siteinfo.php | jeroenpraat | 2015-09-14 | 1 | -0/+5 | |
* | | | | | | | | | | | | | | | | | | | site checking stuff | redmatrix | 2015-09-14 | 3 | -3/+74 | |
|/ / / / / / / / / / / / / / / / / / | ||||||
* / / / / / / / / / / / / / / / / / | remove xchan_instance_url - it needs to be an abook field, not an xchan field | redmatrix | 2015-09-14 | 1 | -14/+0 | |
|/ / / / / / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | | | | quick fix for choklet bannertwo | Mario Vavti | 2015-09-14 | 2 | -4/+6 | |
| | * | | | | | | | | | | | | | | | Merge remote-tracking branch 'upstream/master' | zottel | 2015-09-14 | 22 | -110/+203 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | ping site function (taken from admin/hubloc) | redmatrix | 2015-09-13 | 1 | -1/+26 | |
* | | | | | | | | | | | | | | | | | mod_locs - put the primary into a (non-functioning) button for visual consist... | redmatrix | 2015-09-13 | 1 | -1/+1 | |
* | | | | | | | | | | | | | | | | | update | redmatrix | 2015-09-13 | 1 | -0/+1 | |
* | | | | | | | | | | | | | | | | | Merge https://github.com/redmatrix/hubzilla into pending_merge | redmatrix | 2015-09-13 | 6 | -26/+20 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | fix banner for full flavour | Mario Vavti | 2015-09-13 | 1 | -4/+3 | |
| * | | | | | | | | | | | | | | | | | hopefully fix banner for choklet flavour | Mario Vavti | 2015-09-13 | 5 | -22/+17 | |
* | | | | | | | | | | | | | | | | | | profile photo change activities | redmatrix | 2015-09-13 | 1 | -5/+67 | |
|/ / / / / / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | | | | Merge https://github.com/redmatrix/hubzilla into pending_merge | redmatrix | 2015-09-12 | 3 | -27/+18 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | an attempt to fix the banner mess | Mario Vavti | 2015-09-12 | 3 | -27/+18 | |
* | | | | | | | | | | | | | | | | | | check for empty word after trim | redmatrix | 2015-09-12 | 1 | -0/+4 | |
|/ / / / / / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | | | | Merge pull request #38 from MicMee/master | redmatrix | 2015-09-12 | 1 | -3/+3 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | ensure that living sites are marked as alive | Michael Meer | 2015-09-11 | 1 | -3/+3 | |
* | | | | | | | | | | | | | | | | | | 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 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | another tactic to deal with orphan hublocs from re-installs, or at least allo... | redmatrix | 2015-09-11 | 4 | -205/+221 | |
* | | | | | | | | | | | | | | | | | minor change on invite | redmatrix | 2015-09-11 | 1 | -1/+1 | |
| |/ / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | Merge remote-tracking branch 'upstream/master' | zottel | 2015-09-11 | 20 | -580/+593 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | separate the links | redmatrix | 2015-09-10 | 1 | -1/+1 | |
* | | | | | | | | | | | | | | | | forum mode - use linked avatar and name for title instead of "Channel: xxxxx"... | redmatrix | 2015-09-10 | 1 | -1/+1 | |
* | | | | | | | | | | | | | | | | 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 | |
|\| | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | 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 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / |/| / / / / / / / / / / / / / / / | |/ / / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | | 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 | |
| | * | | | | | | | | | | | | | | Merge remote-tracking branch 'upstream/master' | zottel | 2015-09-10 | 14 | -25/+69 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | 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 until... | redmatrix | 2015-09-09 | 7 | -1/+9 | |
* | | | | | | | | | | | | | | | | fix the lock state when using forum mode | redmatrix | 2015-09-09 | 1 | -3/+5 |