aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'dev' into 'dev'Mario2018-08-275-11/+19
|\ | | | | | | | | Add translation to missed strings in Wiki See merge request hubzilla/core!1264
| * Update wiki.tplMax Kostikov2018-08-251-2/+2
| |
| * Merge branch 'revert-c16fda1c' into 'dev'Max Kostikov2018-08-251-428/+428
| |\ | | | | | | | | | | | | Revert "Update wiki.tpl" See merge request Kostikov/core!2
| | * Revert "Update wiki.tpl"Max Kostikov2018-08-251-428/+428
| |/ | | | | This reverts commit c16fda1cb6fef84788d3045b0edff367d2978c98
| * Merge branch 'revert-ff1a0d21' into 'dev'Max Kostikov2018-08-251-1/+1
| |\ | | | | | | | | | | | | Revert "Update wiki.tpl" See merge request Kostikov/core!1
| | * Revert "Update wiki.tpl"Max Kostikov2018-08-251-1/+1
| |/ | | | | This reverts commit ff1a0d217ff769a2e6e622915cb7e9d9eff327b5
| * Update wiki.tplMax Kostikov2018-08-251-1/+1
| |
| * Update Wiki_page_history.phpMax Kostikov2018-08-251-3/+3
| |
| * Update Wiki.phpMax Kostikov2018-08-251-2/+2
| |
| * Update NativeWikiPage.phpMax Kostikov2018-08-251-4/+4
| |
| * Update Wiki_page_history.phpMax Kostikov2018-08-251-1/+4
| |
| * Update Wiki.phpMax Kostikov2018-08-251-0/+2
| |
| * Update NativeWikiPage.phpMax Kostikov2018-08-251-2/+5
| |
| * Update nwiki_page_history.tplMax Kostikov2018-08-251-7/+7
| |
| * Update wiki.tplMax Kostikov2018-08-251-428/+428
| |
* | Merge remote-tracking branch 'mike/master' into devMario Vavti2018-08-270-0/+0
|\ \ | |/ |/|
| * Revert "Change main router request variable from 'q' to 'req'. This is ↵zotlabs2018-08-2611-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 ↵zotlabs2018-08-2611-19/+19
| | | | | | | | implement search in the twitter api addon, because twitter requires use of the variable 'q'.
* | Merge remote-tracking branch 'mike/master' into devMario Vavti2018-08-245-46/+88
|\|
| * code cleanupzotlabs2018-08-232-37/+52
| |
| * first_post_date() (used by archive widget) - trigger the query options off ↵zotlabs2018-08-231-14/+15
| | | | | | | | of the active module rather than rely on passed parameters
| * tweak archive widget for articleszotlabs2018-08-224-7/+33
| |
* | Merge branch 'dm42fixes' into 'dev'Mario2018-08-241-1/+1
|\ \ | | | | | | | | | | | | fix exclusion of redmatrix theme See merge request hubzilla/core!1263
| * | fix exclusion of redmatrix themeM.Dent2018-08-231-1/+1
| | |
* | | Merge branch 'patch-19' into 'dev'Mario2018-08-242-259/+227
|\ \ \ | |/ / |/| | | | | | | | Update Russian translation See merge request hubzilla/core!1262
| * | Update hstrings.phpMax Kostikov2018-08-221-31/+31
| | |
| * | Update hmessages.poMax Kostikov2018-08-221-228/+196
|/ /
* | Merge remote-tracking branch 'mike/master' into devMario Vavti2018-08-226-20/+27
|\|
| * profile likes - liker image was a bit large and didn't make a very pleasant ↵zotlabs2018-08-211-1/+1
| | | | | | | | looking dropdown, may have been overlooked when other related things were changed to menu-img-1 class
| * add api_not_found hookzotlabs2018-08-211-1/+4
| |
| * Zot/Finger: ignore deleted hublocszotlabs2018-08-212-2/+2
| |
| * more code optimisationzotlabs2018-08-202-16/+20
| |
* | Merge branch 'redbasic-addroomforfooter' into 'dev'Mario2018-08-221-0/+3
|\ \ | | | | | | | | | | | | Fix jumpy sidebars See merge request hubzilla/core!1261
| * | Fix jumpy sidebarsM.Dent2018-08-211-0/+3
| | |
* | | Merge remote-tracking branch 'mike/master' into devMario Vavti2018-08-215-90/+101
|\ \ \ | | |/ | |/|
| * | Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_mergezotlabs2018-08-204-59/+119
| |\ \
| * | | remove checkjs reloader from mod_display alsozotlabs2018-08-201-48/+42
| | | |
| * | | Only show cover photos once per login session. After that they can get ↵zotlabs2018-08-201-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 ↵zotlabs2018-08-201-42/+44
| | | | | | | | | | | | | | | | page reload. Wrap a static copy of the content in noscript tags instead.
| * | | hubzilla core issue #1262zotlabs2018-08-171-0/+1
| | | |
| * | | Suppress duplicate info() messages. This was done long for notice(), but ↵zotlabs2018-08-161-0/+4
| | | | | | | | | | | | | | | | info() was overlooked at that time.
* | | | Merge branch 'redbasic-addroomforfooter' into 'dev'Mario2018-08-212-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.Dent2018-08-202-2/+12
| | |/ | |/|
* | | Merge branch 'dev' into 'dev'Mario2018-08-216-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 2018fadelkon2018-08-206-1851/+2442
| |/ /
* / / Merge branch 'patch-17' into 'master'Mario2018-08-211-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 devMario Vavti2018-08-166-15/+587
|\|
| * missing fileszotlabs2018-08-152-0/+554
| |
| * possible fixes for can_comment_on_post(), provide wiki_list on wiki sidebarzotlabs2018-08-154-15/+33
| |
* | Merge remote-tracking branch 'mike/master' into devMario Vavti2018-08-155-5/+48
|\|
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-26 13:25:52 +0000