Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | Merge branch 'master' into dev | redmatrix | 2016-04-05 | 1 | -1/+1 | |
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | | | ||||||
| * | | | | | revup issue #337 | redmatrix | 2016-04-05 | 1 | -1/+1 | |
* | | | | | | explain the two aspects of federation which need to be handled in core to pas... | redmatrix | 2016-04-04 | 1 | -2/+5 | |
| |/ / / / |/| | | | | ||||||
* | | | | | SECURITY: Do not link unknown and unverified code repositories to the project... | redmatrix | 2016-04-04 | 3 | -5/+36 | |
* | | | | | Merge branch 'master' into dev | redmatrix | 2016-04-04 | 1 | -1/+1 | |
|\| | | | | ||||||
| * | | | | Merge branch 'master' of https://github.com/redmatrix/hubzilla into master_merge | redmatrix | 2016-04-04 | 3 | -6/+10 | |
| |\ \ \ \ | ||||||
| * | | | | | revup - issue #337 | redmatrix | 2016-04-04 | 1 | -1/+1 | |
| | |_|_|/ | |/| | | | ||||||
* | | | | | Merge branch 'master' into dev | Mario Vavti | 2016-04-04 | 3 | -0/+43 | |
|\ \ \ \ \ | ||||||
| * | | | | | a simple autocomplete for bbcode or comanche - partly implemented | Mario Vavti | 2016-04-04 | 3 | -0/+43 | |
| | |/ / / | |/| | | | ||||||
* | | | | | Merge branch 'master' into dev | Mario Vavti | 2016-04-04 | 1 | -1/+1 | |
|\| | | | | ||||||
| * | | | | do not use dropdown class if there is nothing to dropdown | Mario Vavti | 2016-04-04 | 1 | -1/+1 | |
* | | | | | Merge branch 'master' into dev | Mario Vavti | 2016-04-04 | 2 | -5/+9 | |
|\| | | | | ||||||
| * | | | | whitespace | Mario Vavti | 2016-04-04 | 1 | -2/+0 | |
| * | | | | whitespace | Mario Vavti | 2016-04-04 | 1 | -1/+0 | |
| * | | | | fullscreen mode for photo albums view | Mario Vavti | 2016-04-04 | 2 | -3/+10 | |
| |/ / / | ||||||
* | | | | For GNU-social discovery, use the URI in the feed (author.uri) rather than tr... | redmatrix | 2016-04-03 | 2 | -11/+21 | |
* | | | | provide a backup copy of prior notes widget content if the contents were just... | redmatrix | 2016-04-03 | 1 | -1/+11 | |
* | | | | Bug: "remember me" doesn't | redmatrix | 2016-04-03 | 5 | -5/+11 | |
* | | | | issue #138 ; make ajaxchat optional and configurable. For reasons we've discu... | redmatrix | 2016-04-03 | 5 | -3/+18 | |
* | | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | redmatrix | 2016-04-03 | 0 | -0/+0 | |
|\ \ \ \ | ||||||
| * \ \ \ | Merge branch 'master' into dev | Mario Vavti | 2016-04-03 | 3 | -17/+16 | |
| |\ \ \ \ | ||||||
| * \ \ \ \ | Merge branch 'master' into dev | Mario Vavti | 2016-04-03 | 1 | -2/+2 | |
| |\ \ \ \ \ | ||||||
| * \ \ \ \ \ | Merge branch 'master' into dev | Mario Vavti | 2016-04-03 | 13 | -1034/+2093 | |
| |\ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ | Merge branch 'master' into dev | Mario Vavti | 2016-04-03 | 5 | -5/+65 | |
| |\ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev | Mario Vavti | 2016-04-03 | 3 | -10/+10 | |
| |\ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ | Merge branch 'master' into dev | Mario Vavti | 2016-04-03 | 5 | -11/+20 | |
| |\ \ \ \ \ \ \ \ \ | ||||||
* | \ \ \ \ \ \ \ \ \ | Merge branch 'master' into dev | redmatrix | 2016-04-03 | 25 | -1070/+2197 | |
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / |/| | | | | | | / / / | | |_|_|_|_|_|/ / / | |/| | | | | | | | | ||||||
| * | | | | | | | | | Merge branch 'master' of https://github.com/redmatrix/hubzilla into master_merge | redmatrix | 2016-04-03 | 24 | -1069/+2196 | |
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / | | |/| | | | | | | | ||||||
| | * | | | | | | | | various fixes | Mario Vavti | 2016-04-03 | 3 | -17/+16 | |
| | | |_|_|_|/ / / | | |/| | | | | | | ||||||
| | * | | | | | | | reduce chat-item-title fontsize to match wall-item-ago | Mario Vavti | 2016-04-03 | 1 | -2/+2 | |
| | | |_|_|/ / / | | |/| | | | | | ||||||
| | * | | | | | | update upstream libs fullcalendar and moment to a recent version | Mario Vavti | 2016-04-03 | 13 | -1034/+2093 | |
| | | |_|/ / / | | |/| | | | | ||||||
| | * | | | | | fullscreen mode for events | Mario Vavti | 2016-04-03 | 5 | -5/+65 | |
| | | |/ / / | | |/| | | | ||||||
| | * | | | | show chat expiration time in overview and minor fixes | Mario Vavti | 2016-04-03 | 5 | -11/+20 | |
| * | | | | | issue #337 | redmatrix | 2016-04-03 | 1 | -1/+1 | |
| |/ / / / | ||||||
* | | | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | redmatrix | 2016-04-02 | 0 | -0/+0 | |
|\ \ \ \ \ | | |/ / / | |/| | | | ||||||
| * | | | | ge branch 'master' into dev | Mario Vavti | 2016-04-03 | 3 | -11/+10 | |
| |\| | | | ||||||
* | | | | | Merge branch 'master' into dev | redmatrix | 2016-04-02 | 3 | -11/+10 | |
|\ \ \ \ \ | | |/ / / | |/| | | | ||||||
| * | | | | Merge branch 'master' of https://github.com/redmatrix/hubzilla | Mario Vavti | 2016-04-03 | 2 | -2/+2 | |
| |\ \ \ \ | ||||||
| * | | | | | ease transition between fullscreen and inline view for small screens | Mario Vavti | 2016-04-03 | 3 | -11/+10 | |
* | | | | | | use constant | redmatrix | 2016-04-02 | 3 | -10/+10 | |
| |_|/ / / |/| | | | | ||||||
* | | | | | Merge branch 'master' into dev | redmatrix | 2016-04-02 | 2 | -2/+2 | |
|\ \ \ \ \ | | |/ / / | |/| | | | ||||||
| * | | | | typo in router | redmatrix | 2016-04-02 | 1 | -1/+1 | |
| * | | | | revup | redmatrix | 2016-04-02 | 1 | -1/+1 | |
| |/ / / | ||||||
* / / / | small changes in README.md | redmatrix | 2016-04-02 | 1 | -2/+2 | |
|/ / / | ||||||
* | | | Update nl and es-es strings | jeroenpraat | 2016-04-01 | 4 | -5194/+5232 | |
* | | | Merge https://github.com/redmatrix/hubzilla into pending_merge | redmatrix | 2016-04-01 | 1 | -5/+6 | |
|\ \ \ | ||||||
| * | | | on update only jump to bottom if we actually got a new message | Mario Vavti | 2016-04-01 | 1 | -4/+3 | |
| * | | | scroll chat to bottom on fullscreen toggle | Mario Vavti | 2016-04-01 | 1 | -0/+2 | |
| * | | | Merge branch 'master' of https://github.com/redmatrix/hubzilla | Mario Vavti | 2016-04-01 | 2 | -1/+4 | |
| |\ \ \ | ||||||
| * | | | | improve scroll to bottom in chat | Mario Vavti | 2016-04-01 | 1 | -1/+1 |