Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 'master' of https://github.com/redmatrix/hubzilla | Mario Vavti | 2016-04-03 | 2 | -2/+2 |
|\ | |||||
| * | typo in router | redmatrix | 2016-04-02 | 1 | -1/+1 |
| | | |||||
| * | revup | redmatrix | 2016-04-02 | 1 | -1/+1 |
| | | |||||
* | | ease transition between fullscreen and inline view for small screens | Mario Vavti | 2016-04-03 | 3 | -11/+10 |
|/ | |||||
* | 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 |
| | | |||||
* | | slightly change the way fullscreen works and bring it to mod mail | Mario Vavti | 2016-04-01 | 5 | -14/+26 |
| | | |||||
* | | make fullscreen mode available for other modules and some cleanup | Mario Vavti | 2016-03-31 | 4 | -53/+61 |
| | | |||||
* | | various fixes regarding mod chat | Mario Vavti | 2016-03-31 | 4 | -13/+19 |
| | | |||||
* | | mod chat rework continued | Mario Vavti | 2016-03-31 | 10 | -26/+103 |
|/ | |||||
* | deprecate $a->get_baseurl() | redmatrix | 2016-03-30 | 80 | -397/+397 |
| | |||||
* | change primary directory | redmatrix | 2016-03-30 | 1 | -2/+1 |
| | |||||
* | Merge https://github.com/redmatrix/hubzilla into pending_merge | redmatrix | 2016-03-30 | 6 | -106/+184 |
|\ | |||||
| * | more work on mod chat | Mario Vavti | 2016-03-31 | 6 | -106/+184 |
| | | |||||
* | | issue #319 - NOTE: this does not fix the issue, it only reports it and ↵ | redmatrix | 2016-03-30 | 4 | -11/+32 |
|/ | | | | continues. We need to examine any logger statements that contain 'stack:' as a result of reporting this issue and find and fix the original problem - which is that set_pconfig is being called without a valid $uid. I'm worried that since we will now continue on without throwing a PHP error that nobody will ever notice or find the problem that is causing this. | ||||
* | more on mod chat | Mario Vavti | 2016-03-30 | 4 | -11/+17 |
| | |||||
* | some work on mod chat | Mario Vavti | 2016-03-30 | 13 | -75/+142 |
| | |||||
* | add page title to the html title | redmatrix | 2016-03-29 | 2 | -1/+4 |
| | |||||
* | Merge https://github.com/redmatrix/hubzilla into pending_merge | redmatrix | 2016-03-28 | 7 | -303/+323 |
|\ | |||||
| * | highlight table row on hover | Mario Vavti | 2016-03-27 | 2 | -1/+2 |
| | | |||||
| * | Update es_es+n. Switch the feeds as requested by Mike. | jeroenpraat | 2016-03-27 | 5 | -302/+321 |
| | |