| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge branch 'dev' into 'dev' | Mario | 2018-08-27 | 5 | -11/+19 |
|\ |
|
| * | Update wiki.tpl | Max Kostikov | 2018-08-25 | 1 | -2/+2 |
| * | Merge branch 'revert-c16fda1c' into 'dev' | Max Kostikov | 2018-08-25 | 1 | -428/+428 |
| |\ |
|
| | * | Revert "Update wiki.tpl" | Max Kostikov | 2018-08-25 | 1 | -428/+428 |
| |/ |
|
| * | Merge branch 'revert-ff1a0d21' into 'dev' | Max Kostikov | 2018-08-25 | 1 | -1/+1 |
| |\ |
|
| | * | Revert "Update wiki.tpl" | Max Kostikov | 2018-08-25 | 1 | -1/+1 |
| |/ |
|
| * | Update wiki.tpl | Max Kostikov | 2018-08-25 | 1 | -1/+1 |
| * | Update Wiki_page_history.php | Max Kostikov | 2018-08-25 | 1 | -3/+3 |
| * | Update Wiki.php | Max Kostikov | 2018-08-25 | 1 | -2/+2 |
| * | Update NativeWikiPage.php | Max Kostikov | 2018-08-25 | 1 | -4/+4 |
| * | Update Wiki_page_history.php | Max Kostikov | 2018-08-25 | 1 | -1/+4 |
| * | Update Wiki.php | Max Kostikov | 2018-08-25 | 1 | -0/+2 |
| * | Update NativeWikiPage.php | Max Kostikov | 2018-08-25 | 1 | -2/+5 |
| * | Update nwiki_page_history.tpl | Max Kostikov | 2018-08-25 | 1 | -7/+7 |
| * | Update wiki.tpl | Max Kostikov | 2018-08-25 | 1 | -428/+428 |
* | | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2018-08-27 | 0 | -0/+0 |
|\ \
| |/
|/| |
|
| * | Revert "Change main router request variable from 'q' to 'req'. This is necess... | zotlabs | 2018-08-26 | 11 | -19/+19 |
| * | Change main router request variable from 'q' to 'req'. This is necessary to i... | zotlabs | 2018-08-26 | 11 | -19/+19 |
* | | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2018-08-24 | 5 | -46/+88 |
|\| |
|
| * | code cleanup | zotlabs | 2018-08-23 | 2 | -37/+52 |
| * | first_post_date() (used by archive widget) - trigger the query options off of... | zotlabs | 2018-08-23 | 1 | -14/+15 |
| * | tweak archive widget for articles | zotlabs | 2018-08-22 | 4 | -7/+33 |
* | | Merge branch 'dm42fixes' into 'dev' | Mario | 2018-08-24 | 1 | -1/+1 |
|\ \ |
|
| * | | fix exclusion of redmatrix theme | M.Dent | 2018-08-23 | 1 | -1/+1 |
* | | | Merge branch 'patch-19' into 'dev' | Mario | 2018-08-24 | 2 | -259/+227 |
|\ \ \
| |/ /
|/| | |
|
| * | | Update hstrings.php | Max Kostikov | 2018-08-22 | 1 | -31/+31 |
| * | | Update hmessages.po | Max Kostikov | 2018-08-22 | 1 | -228/+196 |
|/ / |
|
* | | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2018-08-22 | 6 | -20/+27 |
|\| |
|
| * | profile likes - liker image was a bit large and didn't make a very pleasant l... | zotlabs | 2018-08-21 | 1 | -1/+1 |
| * | add api_not_found hook | zotlabs | 2018-08-21 | 1 | -1/+4 |
| * | Zot/Finger: ignore deleted hublocs | zotlabs | 2018-08-21 | 2 | -2/+2 |
| * | more code optimisation | zotlabs | 2018-08-20 | 2 | -16/+20 |
* | | Merge branch 'redbasic-addroomforfooter' into 'dev' | Mario | 2018-08-22 | 1 | -0/+3 |
|\ \ |
|
| * | | Fix jumpy sidebars | M.Dent | 2018-08-21 | 1 | -0/+3 |
* | | | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2018-08-21 | 5 | -90/+101 |
|\ \ \
| | |/
| |/| |
|
| * | | Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_merge | zotlabs | 2018-08-20 | 4 | -59/+119 |
| |\ \ |
|
| * | | | remove checkjs reloader from mod_display also | zotlabs | 2018-08-20 | 1 | -48/+42 |
| * | | | Only show cover photos once per login session. After that they can get annoyi... | zotlabs | 2018-08-20 | 1 | -0/+10 |
| * | | | channel page performance improvement: don't use "checkjs" with an associated ... | zotlabs | 2018-08-20 | 1 | -42/+44 |
| * | | | hubzilla core issue #1262 | zotlabs | 2018-08-17 | 1 | -0/+1 |
| * | | | Suppress duplicate info() messages. This was done long for notice(), but info... | zotlabs | 2018-08-16 | 1 | -0/+4 |
* | | | | Merge branch 'redbasic-addroomforfooter' into 'dev' | Mario | 2018-08-21 | 2 | -2/+12 |
|\ \ \ \
| | |_|/
| |/| | |
|
| * | | | Add bottom margin on aside elements and main to allow for viewport footer. | M.Dent | 2018-08-20 | 2 | -2/+12 |
| | |/
| |/| |
|
* | | | Merge branch 'dev' into 'dev' | Mario | 2018-08-21 | 6 | -1851/+2442 |
|\ \ \ |
|
| * | | | Update catalan translations for sstrings up to 18th July 2018 | fadelkon | 2018-08-20 | 6 | -1851/+2442 |
| |/ / |
|
* / / | Merge branch 'patch-17' into 'master' | Mario | 2018-08-21 | 1 | -1/+2 |
|/ / |
|
* | | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2018-08-16 | 6 | -15/+587 |
|\| |
|
| * | missing files | zotlabs | 2018-08-15 | 2 | -0/+554 |
| * | possible fixes for can_comment_on_post(), provide wiki_list on wiki sidebar | zotlabs | 2018-08-15 | 4 | -15/+33 |
* | | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2018-08-15 | 5 | -5/+48 |
|\| |
|