| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | issue #138 ; make ajaxchat optional and configurable. For reasons we've ↵ | redmatrix | 2016-04-03 | 5 | -3/+18 |
| | | | | | discussed repeatedly the ajax chat will not be removed from core as XMPP chat does not provide decentralised access control compatible with nomadic identity. | ||||
| * | 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 |
| | | | | |||||
| * | | | unreferenced app member | redmatrix | 2016-04-01 | 1 | -1/+1 |
| | |/ |/| | |||||
| * | | ditto for typohelper | redmatrix | 2016-04-01 | 1 | -0/+1 |
| | | | |||||
| * | | change call to App::init() to bring back include path (only in typocheck) | redmatrix | 2016-04-01 | 1 | -1/+3 |
| |/ | |||||
| * | suddenly we have includepath issues - provide the explicit paths | redmatrix | 2016-04-01 | 6 | -6/+6 |
| | | |||||
| * | primary hub change | redmatrix | 2016-04-01 | 3 | -1859/+1874 |
| | | |||||
| * | Chat Rooms -> Chatrooms | Mario Vavti | 2016-04-01 | 1 | -1/+1 |
| | | |||||
| * | Merge branch 'master' of https://github.com/redmatrix/hubzilla | Mario Vavti | 2016-04-01 | 1 | -0/+2 |
| |\ | |||||
| | * | Merge https://github.com/redmatrix/hubzilla into pending_merge | redmatrix | 2016-03-31 | 1 | -0/+5 |
| | |\ | |||||
| | * | | undeclared static vars | redmatrix | 2016-03-31 | 1 | -0/+2 |
| | | | | |||||
| * | | | move fullscreen js code to redbasic.js where it belongs to | Mario Vavti | 2016-04-01 | 2 | -15/+15 |
| | |/ |/| | |||||
| * | | missing template | Mario Vavti | 2016-04-01 | 1 | -0/+5 |
| |/ | |||||
| * | change the App constructor | redmatrix | 2016-03-31 | 3 | -6/+3 |
| | | |||||
| * | create miniApp to convert existing settings files to the static App class | redmatrix | 2016-03-31 | 7 | -52/+52 |
| | | |||||
| * | increment std_version | redmatrix | 2016-03-31 | 1 | -1/+1 |
| | | |||||
| * | issue #336 | redmatrix | 2016-03-31 | 3 | -3/+8 |
| | | |||||
| * | Merge branch 'static' | redmatrix | 2016-03-31 | 231 | -52884/+52890 |
| |\ | |||||
| | * | static App | redmatrix | 2016-03-31 | 231 | -52684/+52688 |
| | | | |||||
| | * | initial conversion to static app class | redmatrix | 2016-03-31 | 1 | -200/+202 |
| | | | |||||
 |
index : volse-hubzilla.git | |
| Volse Hubzilla -- soft fork of main Hubzilla core for Volse | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |