| Commit message (Expand) | Author | Age | Files | Lines |
... | |
* | | Merge branch 'iconfig' | redmatrix | 2016-02-17 | 2 | -3/+231 |
|\ \ |
|
| * | | provide del_iconfig for completeness | redmatrix | 2016-02-17 | 1 | -0/+34 |
| * | | iconfig debugging - federation now working | redmatrix | 2016-02-17 | 1 | -1/+2 |
| * | | iconfig debugging | redmatrix | 2016-02-17 | 2 | -4/+10 |
| * | | slight changes to set_iconfig - if passed an item structure only update the s... | redmatrix | 2016-02-16 | 1 | -33/+13 |
| * | | more work on iconfig | redmatrix | 2016-02-16 | 1 | -5/+75 |
| * | | some iconfig basics | redmatrix | 2016-02-16 | 1 | -0/+137 |
* | | | format atom event renderings so they are reasonably compatible with GNU-social | redmatrix | 2016-02-17 | 1 | -2/+15 |
* | | | Merge https://github.com/redmatrix/hubzilla into pending_merge | redmatrix | 2016-02-17 | 9 | -13/+30 |
|\ \ \ |
|
| * | | | More clarification about privacy of private content. Changed Channel Name to ... | jeroenpraat | 2016-02-17 | 4 | -5/+6 |
| * | | | Change description | Mario Vavti | 2016-02-17 | 1 | -1/+1 |
| * | | | make always preload images before rendering the page a display setting | Mario Vavti | 2016-02-17 | 5 | -7/+19 |
| * | | | more refinement on collapsing | Mario Vavti | 2016-02-17 | 1 | -2/+6 |
* | | | | add ca help files (per Paco) | redmatrix | 2016-02-17 | 15 | -0/+608 |
* | | | | revup | redmatrix | 2016-02-17 | 1 | -1/+1 |
|/ / / |
|
* | | | allow admin to set and lock features when UNO is enabled | redmatrix | 2016-02-16 | 1 | -1/+1 |
* | | | allow redirection to site workflow page even if auto channel create is applied | redmatrix | 2016-02-16 | 1 | -3/+4 |
* | | | Merge https://github.com/redmatrix/hubzilla into pending_merge | redmatrix | 2016-02-16 | 5 | -5/+10 |
|\ \ \ |
|
| * | | | @hubdomain also for auto-create-channel + adding css wrapper (ongoing work) | jeroenpraat | 2016-02-16 | 4 | -2/+7 |
| * | | | Thats probably better but there are still edge cases... | Mario Vavti | 2016-02-16 | 1 | -2/+2 |
| * | | | typo | Mario Vavti | 2016-02-16 | 1 | -1/+1 |
| |/ / |
|
* / / | revup | redmatrix | 2016-02-16 | 1 | -1/+1 |
|/ / |
|
* | | content -> viewport | Mario Vavti | 2016-02-16 | 1 | -1/+1 |
* | | only prefetch images on update_mode update | Mario Vavti | 2016-02-16 | 1 | -29/+54 |
* | | since we preload images now we also can collapse and calculate posts above th... | Mario Vavti | 2016-02-16 | 1 | -25/+43 |
* | | Merge https://github.com/redmatrix/hubzilla into pending_merge | redmatrix | 2016-02-15 | 2 | -57/+36 |
|\ \ |
|
| * \ | Merge pull request #283 from phellmes/connedit | redmatrix | 2016-02-16 | 1 | -32/+34 |
| |\ \ |
|
| | * | | Add string translation to auto approval option | phellmes | 2016-02-15 | 1 | -32/+34 |
| * | | | clean up some unused stuff and start loading content a bit earlier | Mario Vavti | 2016-02-15 | 1 | -25/+2 |
| |/ / |
|
* / / | update fr strings from transifex | redmatrix | 2016-02-15 | 4 | -7055/+8913 |
|/ / |
|
* | | Merge https://github.com/redmatrix/hubzilla into pending_merge | redmatrix | 2016-02-14 | 5 | -1791/+1826 |
|\ \ |
|
| * | | Spanish and Dutch string update | jeroenpraat | 2016-02-14 | 4 | -1790/+1824 |
| * | | Merge pull request #282 from royalterra/master | redmatrix | 2016-02-14 | 1 | -1/+2 |
| |\ \ |
|
| | * | | add https://blablanet.es faillback server | royalterra | 2016-02-13 | 1 | -1/+2 |
| |/ / |
|
* / / | form cleanup (profile_photo and cover_photo), admin 'user_approve' not found,... | redmatrix | 2016-02-14 | 7 | -115/+139 |
|/ / |
|
* | | Merge https://github.com/redmatrix/hubzilla into pending_merge | redmatrix | 2016-02-12 | 6 | -7/+516 |
|\ \ |
|
| * | | don't confuse people with matrix | Jeroen van Riet Paap | 2016-02-12 | 1 | -3/+3 |
| * | | https://blablanet.es/siteinfo/json reports itself as directory_mode DIRECTORY... | Mario Vavti | 2016-02-12 | 1 | -1/+0 |
| * | | tryout: introduce loading of images before rendering content and provide some... | Mario Vavti | 2016-02-12 | 4 | -3/+513 |
* | | | directory modes reversed | redmatrix | 2016-02-12 | 3 | -817/+831 |
|/ / |
|
* | | Merge https://github.com/redmatrix/hubzilla into pending_merge | redmatrix | 2016-02-11 | 1 | -0/+1 |
|\ \ |
|
| * \ | Merge pull request #278 from royalterra/master | redmatrix | 2016-02-12 | 1 | -0/+1 |
| |\ \ |
|
| | * \ | Merge pull request #1 from royalterra/royalterra-patch-1 | royalterra | 2016-02-11 | 1 | -0/+1 |
| | |\ \ |
|
| | | * | | Update boot.php Failback Server blablanet.es | royalterra | 2016-02-11 | 1 | -0/+1 |
| | |/ / |
|
* | / / | whitespace | redmatrix | 2016-02-11 | 2 | -1/+2 |
|/ / / |
|
* | | | Merge https://github.com/redmatrix/hubzilla into pending_merge | redmatrix | 2016-02-11 | 1 | -74/+94 |
|\| | |
|
| * | | update readmore.js to a more recent version | Mario Vavti | 2016-02-11 | 1 | -74/+94 |
* | | | guest photo upload failing when js_upload is in use due to non-existent acl p... | redmatrix | 2016-02-11 | 3 | -2/+10 |
|/ / |
|
* | | feed dates are always UTC. This means we will need another mechanism to pass ... | redmatrix | 2016-02-10 | 1 | -2/+2 |
* | | feed dates weren't being honoured. When that was fixed they turned out to be ... | redmatrix | 2016-02-10 | 2 | -3/+5 |