aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | | | | 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
* | | | | unreferenced app memberredmatrix2016-04-011-1/+1
| |/ / / |/| | |
* | | | ditto for typohelperredmatrix2016-04-011-0/+1
* | | | change call to App::init() to bring back include path (only in typocheck)redmatrix2016-04-011-1/+3
|/ / /
* | | suddenly we have includepath issues - provide the explicit pathsredmatrix2016-04-016-6/+6
* | | primary hub changeredmatrix2016-04-013-1859/+1874
* | | Chat Rooms -> ChatroomsMario Vavti2016-04-011-1/+1
* | | Merge branch 'master' of https://github.com/redmatrix/hubzillaMario Vavti2016-04-011-0/+2
|\ \ \
| * \ \ Merge https://github.com/redmatrix/hubzilla into pending_mergeredmatrix2016-03-311-0/+5
| |\ \ \
| * | | | undeclared static varsredmatrix2016-03-311-0/+2
* | | | | move fullscreen js code to redbasic.js where it belongs toMario Vavti2016-04-012-15/+15
| |/ / / |/| | |
* | | | missing templateMario Vavti2016-04-011-0/+5
|/ / /
* | | change the App constructorredmatrix2016-03-313-6/+3
* | | create miniApp to convert existing settings files to the static App classredmatrix2016-03-317-52/+52
* | | increment std_versionredmatrix2016-03-311-1/+1
* | | issue #336redmatrix2016-03-313-3/+8
* | | Merge branch 'static'redmatrix2016-03-31231-52884/+52890
|\ \ \
| * | | static Appredmatrix2016-03-31231-52684/+52688
| * | | initial conversion to static app classredmatrix2016-03-311-200/+202
* | | | slightly change the way fullscreen works and bring it to mod mailMario Vavti2016-04-015-14/+26
* | | | make fullscreen mode available for other modules and some cleanupMario Vavti2016-03-314-53/+61
* | | | various fixes regarding mod chatMario Vavti2016-03-314-13/+19
* | | | mod chat rework continuedMario Vavti2016-03-3110-26/+103
|/ / /
* | | deprecate $a->get_baseurl()redmatrix2016-03-3080-397/+397
* | | change primary directoryredmatrix2016-03-301-2/+1
* | | Merge https://github.com/redmatrix/hubzilla into pending_mergeredmatrix2016-03-306-106/+184
|\ \ \
| * | | more work on mod chatMario Vavti2016-03-316-106/+184