Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| | * | | | 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 ↵ | zotlabs | 2018-08-26 | 11 | -19/+19 | |
| | | | | | | | | | | | | | | | | | | | | | | | | necessary to implement search in the twitter api addon, because twitter requires use of the variable 'q'." Reverting because this will only work with Apache and break nginx/other installations. This reverts commit 9367e9fe5a0125bf4c2f77909f2789c9dcd41e1e. | |||||
| | * | | Change main router request variable from 'q' to 'req'. This is necessary to ↵ | zotlabs | 2018-08-26 | 11 | -19/+19 | |
| | | | | | | | | | | | | | | | | implement search in the twitter api addon, because twitter requires use of the variable 'q'. | |||||
| * | | | 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 ↵ | zotlabs | 2018-08-23 | 1 | -14/+15 | |
| | | | | | | | | | | | | | | | | of the active module rather than rely on passed parameters | |||||
| | * | | 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 See merge request hubzilla/core!1263 | |||||
| | * | | | 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 Russian translation See merge request hubzilla/core!1262 | |||||
| | * | | 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 ↵ | zotlabs | 2018-08-21 | 1 | -1/+1 | |
| | | | | | | | | | | | | looking dropdown, may have been overlooked when other related things were changed to menu-img-1 class | |||||
| | * | 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 See merge request hubzilla/core!1261 | |||||
| | * | | 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 ↵ | zotlabs | 2018-08-20 | 1 | -0/+10 | |
| | | | | | | | | | | | | | | | | | | | | annoying. If there is pushback on this, then it should perhaps be optional. | |||||
| | * | | | channel page performance improvement: don't use "checkjs" with an associated ↵ | zotlabs | 2018-08-20 | 1 | -42/+44 | |
| | | | | | | | | | | | | | | | | | | | | page reload. Wrap a static copy of the content in noscript tags instead. | |||||
| | * | | | hubzilla core issue #1262 | zotlabs | 2018-08-17 | 1 | -0/+1 | |
| | | | | | ||||||
| | * | | | Suppress duplicate info() messages. This was done long for notice(), but ↵ | zotlabs | 2018-08-16 | 1 | -0/+4 | |
| | | | | | | | | | | | | | | | | | | | | info() was overlooked at that time. | |||||
| * | | | | 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. See merge request hubzilla/core!1259 | |||||
| | * | | | 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 See merge request hubzilla/core!1260 | |||||
| | * | | | 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 | |
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | Add missed app 'Order Apps' See merge request hubzilla/core!1258 (cherry picked from commit 85aa4957414c98fb6f44c0c2b79ef9d198e963a7) 6086a70e Add missed app 'Order Apps' | |||||
| * | | 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 | |
| |\| | ||||||
| | * | more backporting for zot6 | zotlabs | 2018-08-14 | 2 | -0/+41 | |
| | | | ||||||
| | * | issue with mdpost addon and archive.org links which contain a full url as a ↵ | zotlabs | 2018-08-13 | 4 | -5/+7 | |
| | | | | | | | | | | | | path/query component | |||||
| * | | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2018-08-14 | 12 | -67/+149 | |
| |\| | ||||||
| | * | hubloc DB changes needed for z6 | zotlabs | 2018-08-13 | 5 | -2/+44 | |
| | | | ||||||
| | * | oidc cleanup and discovery | zotlabs | 2018-08-13 | 4 | -29/+39 | |
| | | | ||||||
| | * | minor oauth2 updates - renamed zot webbie to 'webfinger' and zothash to ↵ | zotlabs | 2018-08-13 | 4 | -38/+68 | |
| | | | | | | | | | | | | 'portable_id', fixed/simplified cgi auth mode | |||||
| * | | Merge branch 'override-helpfiles' into 'dev' | Mario | 2018-08-14 | 2 | -38/+63 | |
| |\ \ | | | | | | | | | | | | | | | | | Override helpfiles See merge request hubzilla/core!1257 | |||||
| | * | | Override helpfiles | M. Dent | 2018-08-14 | 2 | -38/+63 | |
| |/ / | ||||||
| * | | Merge branch 'add-template-overrides' into 'dev' | Mario | 2018-08-13 | 3 | -21/+56 | |
| |\ \ | | |/ | |/| | | | | | | | Add template overrides See merge request hubzilla/core!1256 | |||||
| | * | Add support for overriding the default template location and individual ↵ | M.Dent | 2018-08-12 | 2 | -13/+45 | |
| | | | | | | | | | | | | templates via .htconfig.php |