aboutsummaryrefslogtreecommitdiffstats
path: root/view
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'mike/master' into devMario Vavti2018-06-251-1/+0
|\
| * remove the white-space pre-wrap property on code blocks. This should probably...zotlabs2018-06-241-1/+0
* | Merge branch 'dev' of https://framagit.org/hubzilla/core into devMario Vavti2018-06-2527-513/+4
|\ \
| * \ Merge branch 'patch-1' into 'dev'Mike Macgirvin2018-06-202-2/+2
| |\ \ | | |/ | |/|
| | * fix simple errorjeroenpraat2018-06-181-1/+1
| | * fix simple errorjeroenpraat2018-06-181-1/+1
| * | channel sources: add 'resend' option to discard original author - similar to ...zotlabs2018-06-182-0/+2
| * | remove several unused/unreferenced templateszotlabs2018-06-1723-511/+0
| |/
* / updates justified gallery lib to version 3.7 and minor fixes for full templateMario Vavti2018-06-251-4/+5
|/
* Merge branch 'dev' of https://framagit.org/hubzilla/core into devMario2018-06-174-3/+7
|\
| * hubzilla core issue #1227 - affinity slider unable to reach 0,99 when slider ...zotlabs2018-06-151-2/+2
| * wiki: word-wrap code on any characterzotlabs2018-06-141-0/+2
| * optionally report total available space when uploadingzotlabs2018-06-131-0/+1
| * SECURITY: provide option to disable the cloud 'root' directory and make the c...zotlabs2018-06-131-0/+1
| * Merge branch 'master' of ../hz into devzotlabs2018-06-101-1/+1
| |\
| | * hubzilla core issue #1218zotlabs2018-06-101-1/+1
* | | some work on mod groupMario2018-06-176-124/+91
|/ /
* | fix issue #1219Mario Vavti2018-06-091-1/+1
* | move cid filter js to the widgetMario Vavti2018-06-092-4/+5
* | new feature filter network by nameMario Vavti2018-06-083-0/+14
|/
* fixes for search_item.tplMario Vavti2018-06-072-49/+41
* Merge remote-tracking branch 'mike/master' into devMario Vavti2018-06-065-8/+8
|\
| * some work to make menus editable by visitors with webpage write permissions; ...zotlabs2018-06-055-8/+8
* | rely on the pf argument to determine if we deal with a forum or not. xchan_pu...Mario Vavti2018-06-051-0/+2
|/
* finalize filters and forum notificationsMario Vavti2018-06-025-4/+9
* some more work on forum notificationsMario Vavti2018-06-023-4/+38
* unread forum notifications - wip/unfinishedMario Vavti2018-06-011-1/+1
* add manage privacy groups entry to the panel channel menu dropdown for nowMario Vavti2018-06-011-0/+3
* fixes for css fixMario Vavti2018-06-013-4/+4
* css fixMario Vavti2018-06-011-3/+2
* add hover effect to dropdown caretMario Vavti2018-06-012-2/+10
* move file and groups filter to submenuMario Vavti2018-06-013-8/+40
* merge groups and filed posts into activity filtersMario Vavti2018-05-312-2/+5
* make navbar search use the module search function in /network and /channelMario Vavti2018-05-301-1/+1
* remove redundant css from default.cssMario Vavti2018-05-301-8/+0
* add widget files and templatesMario Vavti2018-05-301-0/+8
* first cut on restructuring the previously called network tabsMario Vavti2018-05-301-0/+2
* Merge pull request #1197 from galettesaucisse/patch-52git-marijus2018-05-291-2/+2
|\
| * Update hstrings.phpGalette Saucisse2018-05-261-2/+2
* | Merge pull request #1196 from galettesaucisse/patch-51git-marijus2018-05-291-3/+3
|\ \
| * | Update hmessages.poGalette Saucisse2018-05-261-3/+3
| |/
* / fix js error with catalan language (unescaped strings)Mario Vavti2018-05-271-2/+2
|/
* Merge branch 'dev' of https://github.com/redmatrix/hubzilla into devMario Vavti2018-05-254-14880/+16748
|\
| * Finaly an update of Dutch language stringsJeroen2018-05-242-11655/+12317
| * Update catalan translation (both po and php) for sources changes up to Apr 23...fadelkon2018-05-242-3225/+4431
* | Update remote_friends_common.tplantil0pa2018-05-241-1/+1
|/
* paint the locks on private activitypub items red. their privacy model is "sli...Mario Vavti2018-05-231-1/+1
* new_channel - make text strings translatable and use the name as a base for t...zotlabs2018-05-212-6/+19
* css fixMario Vavti2018-05-201-1/+1
* remove preview on jot resetMario Vavti2018-05-201-0/+1