Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | Merge branch 'master' of ../hz into dev | zotlabs | 2018-06-10 | 1 | -1/+1 | |
| |\ | ||||||
| | * | hubzilla core issue #1218 | zotlabs | 2018-06-10 | 1 | -1/+1 | |
| | | | ||||||
* | | | some work on mod group | Mario | 2018-06-17 | 6 | -124/+91 | |
|/ / | ||||||
* | | fix issue #1219 | Mario Vavti | 2018-06-09 | 1 | -1/+1 | |
| | | ||||||
* | | move cid filter js to the widget | Mario Vavti | 2018-06-09 | 2 | -4/+5 | |
| | | ||||||
* | | new feature filter network by name | Mario Vavti | 2018-06-08 | 3 | -0/+14 | |
|/ | ||||||
* | fixes for search_item.tpl | Mario Vavti | 2018-06-07 | 2 | -49/+41 | |
| | ||||||
* | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2018-06-06 | 5 | -8/+8 | |
|\ | ||||||
| * | some work to make menus editable by visitors with webpage write permissions; ↵ | zotlabs | 2018-06-05 | 5 | -8/+8 | |
| | | | | | | | | this needed to revise the link structure so that the page specified an owner channel in the url. Otherwise we could only operate on menus owned by local_channel(). Have done some basic regression testing but have not yet fully tested guest editing functionality. | |||||
* | | rely on the pf argument to determine if we deal with a forum or not. ↵ | Mario Vavti | 2018-06-05 | 1 | -0/+2 | |
|/ | | | | xchan_pubforum is not set for all public forums in the forum filters for some reason. | |||||
* | finalize filters and forum notifications | Mario Vavti | 2018-06-02 | 5 | -4/+9 | |
| | ||||||
* | some more work on forum notifications | Mario Vavti | 2018-06-02 | 3 | -4/+38 | |
| | ||||||
* | unread forum notifications - wip/unfinished | Mario Vavti | 2018-06-01 | 1 | -1/+1 | |
| | ||||||
* | add manage privacy groups entry to the panel channel menu dropdown for now | Mario Vavti | 2018-06-01 | 1 | -0/+3 | |
| | ||||||
* | fixes for css fix | Mario Vavti | 2018-06-01 | 3 | -4/+4 | |
| | ||||||
* | css fix | Mario Vavti | 2018-06-01 | 1 | -3/+2 | |
| | ||||||
* | add hover effect to dropdown caret | Mario Vavti | 2018-06-01 | 2 | -2/+10 | |
| | ||||||
* | move file and groups filter to submenu | Mario Vavti | 2018-06-01 | 3 | -8/+40 | |
| | ||||||
* | merge groups and filed posts into activity filters | Mario Vavti | 2018-05-31 | 2 | -2/+5 | |
| | ||||||
* | make navbar search use the module search function in /network and /channel | Mario Vavti | 2018-05-30 | 1 | -1/+1 | |
| | ||||||
* | remove redundant css from default.css | Mario Vavti | 2018-05-30 | 1 | -8/+0 | |
| | ||||||
* | add widget files and templates | Mario Vavti | 2018-05-30 | 1 | -0/+8 | |
| | ||||||
* | first cut on restructuring the previously called network tabs | Mario Vavti | 2018-05-30 | 1 | -0/+2 | |
| | ||||||
* | Merge pull request #1197 from galettesaucisse/patch-52 | git-marijus | 2018-05-29 | 1 | -2/+2 | |
|\ | | | | | Update hstrings.php | |||||
| * | Update hstrings.php | Galette Saucisse | 2018-05-26 | 1 | -2/+2 | |
| | | ||||||
* | | Merge pull request #1196 from galettesaucisse/patch-51 | git-marijus | 2018-05-29 | 1 | -3/+3 | |
|\ \ | | | | | | | Update hmessages.po | |||||
| * | | Update hmessages.po | Galette Saucisse | 2018-05-26 | 1 | -3/+3 | |
| |/ | ||||||
* / | fix js error with catalan language (unescaped strings) | Mario Vavti | 2018-05-27 | 1 | -2/+2 | |
|/ | ||||||
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev | Mario Vavti | 2018-05-25 | 4 | -14880/+16748 | |
|\ | ||||||
| * | Finaly an update of Dutch language strings | Jeroen | 2018-05-24 | 2 | -11655/+12317 | |
| | | ||||||
| * | Update catalan translation (both po and php) for sources changes up to Apr ↵ | fadelkon | 2018-05-24 | 2 | -3225/+4431 | |
| | | | | | | | | 23rd 2018, 07:35. | |||||
* | | Update remote_friends_common.tpl | antil0pa | 2018-05-24 | 1 | -1/+1 | |
|/ | | | Found an improperly closed <div> tag. It breaks the way widget are displayed on the page. | |||||
* | paint the locks on private activitypub items red. their privacy model is ↵ | Mario Vavti | 2018-05-23 | 1 | -1/+1 | |
| | | | | "slightly" different from ours | |||||
* | new_channel - make text strings translatable and use the name as a base for ↵ | zotlabs | 2018-05-21 | 2 | -6/+19 | |
| | | | | the nick if you try to create without entering a nick | |||||
* | css fix | Mario Vavti | 2018-05-20 | 1 | -1/+1 | |
| | ||||||
* | remove preview on jot reset | Mario Vavti | 2018-05-20 | 1 | -0/+1 | |
| | ||||||
* | Merge pull request #1176 from galettesaucisse/patch-48 | git-marijus | 2018-05-20 | 1 | -13/+22 | |
|\ | | | | | Update hstrings.php | |||||
| * | Update hstrings.php | Galette Saucisse | 2018-05-18 | 1 | -2/+2 | |
| | | ||||||
| * | Update hstrings.php | Galette Saucisse | 2018-05-17 | 1 | -15/+24 | |
| | | ||||||
* | | Merge pull request #1175 from galettesaucisse/patch-47 | git-marijus | 2018-05-20 | 1 | -144/+188 | |
|\ \ | | | | | | | Update hmessages.po | |||||
| * | | Update hmessages.po | Galette Saucisse | 2018-05-17 | 1 | -144/+188 | |
| |/ | ||||||
* | | Merge pull request #1171 from mjfriaza/dev | git-marijus | 2018-05-20 | 2 | -24/+30 | |
|\ \ | | | | | | | Added one space & Grammatical consistency error on Spanish translation | |||||
| * | | Added spaces at PHP replacements & Grammatical consistency error on Spanish ↵ | Manuel Jiménez Friaza | 2018-05-15 | 2 | -17/+17 | |
| | | | | | | | | | | | | translation | |||||
| * | | Added one space & Grammatical consistency error on Spanish translation | Manuel Jiménez Friaza | 2018-05-13 | 1 | -5/+11 | |
| | | | ||||||
| * | | Added one space & Grammatical consistency error on Spanish translation | Manuel Jiménez Friaza | 2018-05-13 | 1 | -3/+3 | |
| | | | ||||||
* | | | do not update #acl-list-content on every click in jot. we just need this ↵ | Mario Vavti | 2018-05-20 | 1 | -49/+51 | |
| | | | | | | | | | | | | updated when in cutom mode (which is rarely the case). jot interaction was getting sluggish due to this when having lots of contacts. | |||||
* | | | remove some cruft from initEditor(); | Mario Vavti | 2018-05-20 | 1 | -70/+10 | |
| | | | ||||||
* | | | implement jot reset button | Mario Vavti | 2018-05-20 | 3 | -3/+29 | |
| | | | ||||||
* | | | update to fork-awesome 1.1 and fix an old font-awesome reference | Mario Vavti | 2018-05-19 | 1 | -1/+1 | |
| | | | ||||||
* | | | fix issue where images were not visible in acl selector after using search | Mario Vavti | 2018-05-19 | 1 | -0/+4 | |
| | | |