aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'dev' into 'dev'Mario2018-08-275-11/+19
|\
| * Update wiki.tplMax Kostikov2018-08-251-2/+2
| * Merge branch 'revert-c16fda1c' into 'dev'Max Kostikov2018-08-251-428/+428
| |\
| | * Revert "Update wiki.tpl"Max Kostikov2018-08-251-428/+428
| |/
| * Merge branch 'revert-ff1a0d21' into 'dev'Max Kostikov2018-08-251-1/+1
| |\
| | * Revert "Update wiki.tpl"Max Kostikov2018-08-251-1/+1
| |/
| * 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 necess...zotlabs2018-08-2611-19/+19
| * Change main router request variable from 'q' to 'req'. This is necessary to i...zotlabs2018-08-2611-19/+19
* | 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 of...zotlabs2018-08-231-14/+15
| * tweak archive widget for articleszotlabs2018-08-224-7/+33
* | Merge branch 'dm42fixes' into 'dev'Mario2018-08-241-1/+1
|\ \
| * | fix exclusion of redmatrix themeM.Dent2018-08-231-1/+1
* | | Merge branch 'patch-19' into 'dev'Mario2018-08-242-259/+227
|\ \ \ | |/ / |/| |
| * | 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 l...zotlabs2018-08-211-1/+1
| * 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 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 annoyi...zotlabs2018-08-201-0/+10
| * | | channel page performance improvement: don't use "checkjs" with an associated ...zotlabs2018-08-201-42/+44
| * | | hubzilla core issue #1262zotlabs2018-08-171-0/+1
| * | | Suppress duplicate info() messages. This was done long for notice(), but info...zotlabs2018-08-161-0/+4
* | | | Merge branch 'redbasic-addroomforfooter' into 'dev'Mario2018-08-212-2/+12
|\ \ \ \ | | |_|/ | |/| |
| * | | 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 2018fadelkon2018-08-206-1851/+2442
| |/ /
* / / Merge branch 'patch-17' into 'master'Mario2018-08-211-1/+2
|/ /
* | 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-22 19:04:40 +0000