Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | | | | | | | | | | | | | | Merge pull request #45 from anaqreon/master | redmatrix | 2015-09-17 | 4 | -35/+35 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | | | | | | Started correcting vestiges of the RedMatrix and matrix, replacing with Hubzi... | Andrew Manning | 2015-09-16 | 4 | -35/+35 | |
| |/ / / / / / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | | | | | Merge pull request #44 from mrjive/move_submit_button | redmatrix | 2015-09-17 | 1 | -7/+5 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | | | | | | moved submit button to the bottom in settings.tpl | mrjive | 2015-09-16 | 1 | -7/+5 | |
| * | | | | | | | | | | | | | | | | | | | Merge pull request #43 from mrjive/toggleselect | redmatrix | 2015-09-17 | 1 | -5/+5 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | | | | added toggle_select | mrjive | 2015-09-16 | 1 | -5/+5 | |
| |/ / / / / / / / / / / / / / / / / / | ||||||
* / / / / / / / / / / / / / / / / / / | change matrix to grid, begin webfinger optimisation | redmatrix | 2015-09-16 | 4 | -18/+15 | |
|/ / / / / / / / / / / / / / / / / / | ||||||
| | | * | | | | | | | | | | | | | | | Merge remote-tracking branch 'upstream/master' | zottel | 2015-09-16 | 33 | -247/+314 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | serve as application/xrd+xml | redmatrix | 2015-09-15 | 2 | -2/+2 | |
* | | | | | | | | | | | | | | | | | | italian string correction | redmatrix | 2015-09-15 | 1 | -1/+1 | |
* | | | | | | | | | | | | | | | | | | Less margin | jeroenpraat | 2015-09-15 | 3 | -0/+0 | |
* | | | | | | | | | | | | | | | | | | Made the favicons a bit sharper (direct from SVG) and cleaned some wrong meta... | jeroenpraat | 2015-09-15 | 15 | -0/+0 | |
* | | | | | | | | | | | | | | | | | | make sure we've got a doc type | redmatrix | 2015-09-15 | 1 | -1/+1 | |
* | | | | | | | | | | | | | | | | | | I'm not going to tell you what's wrong because I'll be accused of bashing ano... | redmatrix | 2015-09-15 | 3 | -1/+3 | |
* | | | | | | | | | | | | | | | | | | persona | redmatrix | 2015-09-14 | 1 | -0/+1 | |
* | | | | | | | | | | | | | | | | | | nit | redmatrix | 2015-09-14 | 1 | -1/+1 | |
* | | | | | | | | | | | | | | | | | | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-09-14 | 2 | -194/+194 | |
|\| | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | Small update Spanish strings | jeroenpraat | 2015-09-14 | 2 | -194/+194 | |
| * | | | | | | | | | | | | | | | | | quick fix for choklet bannertwo | Mario Vavti | 2015-09-14 | 1 | -3/+5 | |
| |/ / / / / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | | | | we need an owner for permissions_sql | redmatrix | 2015-09-14 | 1 | -1/+9 | |
* | | | | | | | | | | | | | | | | | 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 | |
| |/ / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | |