aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | Merge branch 'master' into devredmatrix2016-04-051-1/+1
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | |
| * | | | | revup issue #337redmatrix2016-04-051-1/+1
* | | | | | explain the two aspects of federation which need to be handled in core to pas...redmatrix2016-04-041-2/+5
| |/ / / / |/| | | |
* | | | | SECURITY: Do not link unknown and unverified code repositories to the project...redmatrix2016-04-043-5/+36
* | | | | Merge branch 'master' into devredmatrix2016-04-041-1/+1
|\| | | |
| * | | | Merge branch 'master' of https://github.com/redmatrix/hubzilla into master_mergeredmatrix2016-04-043-6/+10
| |\ \ \ \
| * | | | | revup - issue #337redmatrix2016-04-041-1/+1
| | |_|_|/ | |/| | |
* | | | | Merge branch 'master' into devMario Vavti2016-04-043-0/+43
|\ \ \ \ \
| * | | | | a simple autocomplete for bbcode or comanche - partly implementedMario Vavti2016-04-043-0/+43
| | |/ / / | |/| | |
* | | | | Merge branch 'master' into devMario Vavti2016-04-041-1/+1
|\| | | |
| * | | | do not use dropdown class if there is nothing to dropdownMario Vavti2016-04-041-1/+1
* | | | | Merge branch 'master' into devMario Vavti2016-04-042-5/+9
|\| | | |
| * | | | whitespaceMario Vavti2016-04-041-2/+0
| * | | | whitespaceMario Vavti2016-04-041-1/+0
| * | | | fullscreen mode for photo albums viewMario Vavti2016-04-042-3/+10
| |/ / /
* | | | For GNU-social discovery, use the URI in the feed (author.uri) rather than tr...redmatrix2016-04-032-11/+21
* | | | provide a backup copy of prior notes widget content if the contents were just...redmatrix2016-04-031-1/+11
* | | | Bug: "remember me" doesn'tredmatrix2016-04-035-5/+11
* | | | issue #138 ; make ajaxchat optional and configurable. For reasons we've discu...redmatrix2016-04-035-3/+18
* | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergeredmatrix2016-04-030-0/+0
|\ \ \ \
| * \ \ \ Merge branch 'master' into devMario Vavti2016-04-033-17/+16
| |\ \ \ \
| * \ \ \ \ Merge branch 'master' into devMario Vavti2016-04-031-2/+2
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' into devMario Vavti2016-04-0313-1034/+2093
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'master' into devMario Vavti2016-04-035-5/+65
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'dev' of https://github.com/redmatrix/hubzilla into devMario Vavti2016-04-033-10/+10
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'master' into devMario Vavti2016-04-035-11/+20
| |\ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ Merge branch 'master' into devredmatrix2016-04-0325-1070/+2197
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / |/| | | | | | | / / / | | |_|_|_|_|_|/ / / | |/| | | | | | | |
| * | | | | | | | | Merge branch 'master' of https://github.com/redmatrix/hubzilla into master_mergeredmatrix2016-04-0324-1069/+2196
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / | | |/| | | | | | |
| | * | | | | | | | various fixesMario Vavti2016-04-033-17/+16
| | | |_|_|_|/ / / | | |/| | | | | |
| | * | | | | | | reduce chat-item-title fontsize to match wall-item-agoMario Vavti2016-04-031-2/+2
| | | |_|_|/ / / | | |/| | | | |
| | * | | | | | update upstream libs fullcalendar and moment to a recent versionMario Vavti2016-04-0313-1034/+2093
| | | |_|/ / / | | |/| | | |
| | * | | | | fullscreen mode for eventsMario Vavti2016-04-035-5/+65
| | | |/ / / | | |/| | |
| | * | | | show chat expiration time in overview and minor fixesMario Vavti2016-04-035-11/+20
| * | | | | issue #337redmatrix2016-04-031-1/+1
| |/ / / /
* | | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergeredmatrix2016-04-020-0/+0
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | ge branch 'master' into devMario Vavti2016-04-033-11/+10
| |\| | |
* | | | | Merge branch 'master' into devredmatrix2016-04-023-11/+10
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Merge branch 'master' of https://github.com/redmatrix/hubzillaMario Vavti2016-04-032-2/+2
| |\ \ \ \
| * | | | | ease transition between fullscreen and inline view for small screensMario Vavti2016-04-033-11/+10
* | | | | | use constantredmatrix2016-04-023-10/+10
| |_|/ / / |/| | | |
* | | | | Merge branch 'master' into devredmatrix2016-04-022-2/+2
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | typo in routerredmatrix2016-04-021-1/+1
| * | | | revupredmatrix2016-04-021-1/+1
| |/ / /
* / / / small changes in README.mdredmatrix2016-04-021-2/+2
|/ / /
* | | Update nl and es-es stringsjeroenpraat2016-04-014-5194/+5232
* | | Merge https://github.com/redmatrix/hubzilla into pending_mergeredmatrix2016-04-011-5/+6
|\ \ \
| * | | on update only jump to bottom if we actually got a new messageMario Vavti2016-04-011-4/+3
| * | | scroll chat to bottom on fullscreen toggleMario Vavti2016-04-011-0/+2
| * | | Merge branch 'master' of https://github.com/redmatrix/hubzillaMario Vavti2016-04-012-1/+4
| |\ \ \
| * | | | improve scroll to bottom in chatMario Vavti2016-04-011-1/+1