aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergezotlabs2016-11-293-39/+50
|\
| * more work on wiki mimetypesMario Vavti2016-11-292-31/+35
| |
| * Merge branch 'dev' of https://github.com/redmatrix/hubzilla into devMario Vavti2016-11-294-682/+693
| |\
| * | some basic work for implementing mimetypes for wikisMario Vavti2016-11-283-9/+16
| | |
* | | missed this from the earlier checkinzotlabs2016-11-291-1/+1
| |/ |/|
* | roll standard version to ensure that dba_pdo is the default and make this a ↵zotlabs2016-11-281-1/+1
| | | | | | | | dependency for the cdav plugin
* | minor re-arrangezotlabs2016-11-281-4/+4
| |
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergezotlabs2016-11-2852-97/+2005
|\|
| * Merge pull request #602 from anaqreon/docogit-marijus2016-11-2844-23/+1866
| |\ | | | | | | Update context help content and context page element focus feature.
| | * Use the jquery.toc.js library to auto-generate a table of contents for the ↵Andrew Manning2016-11-273-26/+35
| | | | | | | | | | | | loaded page under the side nav menu
| | * Integrating lots of member guide contentAndrew Manning2016-11-274-17/+480
| | |
| | * Add some identity-aware parsing to HTML content using parseIdentityAwareHTML()Andrew Manning2016-11-2725-1036/+63
| | |
| | * Add ability to include page assets in documentation pages such as images. ↵Andrew Manning2016-11-2729-26/+57
| | | | | | | | | | | | Updated Personal Channel tutorial to use local images using this new capability.
| | * Added Tutorials section with a Personal Channel tutorialAndrew Manning2016-11-273-1/+198
| | |
| | * Restructured main table of contents to link to fewer pages with more ↵Andrew Manning2016-11-276-31/+965
| | | | | | | | | | | | content. The admin, dev, and member guides are single pages each having a table of contents at the top that is represented in condensed form in the main navigation sidebar. Section links are used to navigate between content sections for simplicity and fewer page loads.
| | * Update webpages and wiki context helpAndrew Manning2016-11-262-2/+4
| | |
| | * Update wiki context help. Modify context page element focus feature to do ↵Andrew Manning2016-11-2629-12/+1192
| | | | | | | | | | | | nothing if the target DOM element is not found.
| * | minor cleanup and remove more double encodingMario Vavti2016-11-283-18/+11
| | |
| * | wiki: move delete page functionality to the widgetMario Vavti2016-11-286-40/+99
| |/
| * rearrange buttonsMario Vavti2016-11-251-16/+18
| |
| * Merge pull request #601 from anaqreon/wikigit-marijus2016-11-251-1/+12
| |\ | | | | | | Wiki: Make a git commit when a new page is created
| | * Make a git commit when a new page is created, recording who created the page.Andrew Manning2016-11-241-1/+12
| | |
* | | connedit prev/next: sort in the db.zotlabs2016-11-262-677/+688
|/ /
* / prev-next navigation for mod_conneditzotlabs2016-11-242-3/+46
|/
* missing semicolonMario Vavti2016-11-231-1/+1
|
* whitespace and minor fixesMario Vavti2016-11-232-18/+13
|
* whitespace and minor fixesMario Vavti2016-11-232-82/+56
|
* Merge pull request #599 from anaqreon/wikigit-marijus2016-11-231-30/+41
|\ | | | | Wiki save button
| * Toggle save button depending on editor changes and return to editor instead ↵Andrew Manning2016-11-231-30/+41
|/ | | | of history pane after saving
* silence headers already sent warning. issue #596Mario Vavti2016-11-231-6/+9
|
* whitespace and coding styleMario Vavti2016-11-231-8/+17
|
* whitespace cleanupMario Vavti2016-11-231-25/+25
|
* finish removing selfzotlabs2016-11-227-99/+3
|
* missing plugins in zot-infozotlabs2016-11-221-1/+1
|
* notification issuezotlabs2016-11-221-1/+1
|
* Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergezotlabs2016-11-2214-162/+241
|\
| * do not use nested section-content-wrapper classMario Vavti2016-11-221-3/+3
| |
| * use plural since we can have more than one wikiMario Vavti2016-11-222-2/+2
| |
| * display wiki list on wiki landing page.Mario Vavti2016-11-228-91/+171
| |
| * Merge pull request #595 from git-marijus/devzotlabs2016-11-212-12/+11
| |\ | | | | | | move the remote user homebutton to the user menu. this way everything…
| | * move the remote user homebutton to the user menu. this way everything remote ↵Mario Vavti2016-11-202-12/+11
| | | | | | | | | | | | user related is in one place.
| * | Merge pull request #593 from mjfriaza/devgit-marijus2016-11-202-53/+53
| |\ \ | | |/ | |/| Updated ES-ES: better revision of some plugins
| | * Updated ES-ES: better revision of some pluginsManuel Jiménez Friaza2016-11-202-53/+53
| | |
| * | fix #594Mario Vavti2016-11-201-1/+1
| | |
* | | db update required for Zot2zotlabs2016-11-227-11/+28
| | |
* | | wrong functionzotlabs2016-11-211-3/+3
| | |
* | | zot: specify crypto methodzotlabs2016-11-204-7/+12
|/ /
* | Do not render maps for Diaspora destinations.zotlabs2016-11-191-0/+6
| |
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergezotlabs2016-11-193-6176/+10026
|\ \
| * | Merge pull request #592 from mjfriaza/devzotlabs2016-11-193-6176/+10026
| |\| | | | | | | Updated the Spanish translation and fixed a grammatical concordance error at file connedit in Spanish contextual help