aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* sql error in fetch conversationzotlabs2016-12-011-1/+1
|
* trim both key and iv on other cipherszotlabs2016-12-011-0/+2
|
* trim iv in STD_encapsulatezotlabs2016-12-012-0/+3
|
* versioning for permission additions to ensure we're using the same set of fileszotlabs2016-12-013-0/+14
|
* extensible perms: the really, really hard part - figuring out what to do ↵zotlabs2016-12-013-10/+69
| | | | about people with custom permissions so as to set sane defaults.
* compatible_project: we are only concerned with the default realmzotlabs2016-12-011-0/+4
|
* Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergezotlabs2016-12-012-267/+262
|\
| * use highlight in ac-list for hl bbcodeMario Vavti2016-12-011-1/+2
| |
| * Merge branch 'dev' of https://github.com/redmatrix/hubzilla into devMario Vavti2016-12-013-4/+4
| |\
| * | whitespace fixesMario Vavti2016-12-011-266/+260
| | |
* | | allow plugins to cancel item_store() and item_store_update()zotlabs2016-12-011-0/+11
| |/ |/|
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergezotlabs2016-12-012-50/+48
|\|
| * more wiki cleanupMario Vavti2016-12-012-7/+6
| |
| * wiki cleanup - wip. please watch out for eventual regressionsMario Vavti2016-12-012-45/+44
| |
* | issue #607 parens not recognised inside urlszotlabs2016-12-013-4/+4
|/
* issue #606, postgres binary data handling under PDO and HHVM when passed nullzotlabs2016-11-301-1/+1
|
* Merge pull request #605 from anaqreon/docozotlabs2016-12-019-114/+558
|\ | | | | Another iteration of documentation
| * Add resources and links. Fix bug where table of contents was not generated ↵Andrew Manning2016-11-302-1/+8
| | | | | | | | if URL had a sectionspecified like /help/blah#anchor
| * Reverted governance to previous version accidentally clobbered. Removed ↵Andrew Manning2016-11-301-241/+92
| | | | | | | | history page. Added credits.
| * Added some vertical offset to headings so that the table of contents links ↵Andrew Manning2016-11-303-1/+19
| | | | | | | | do not hide the heading under the navbar. Added the About this Hub content
| * Merge remote-tracking branch 'upstream/dev' into docoAndrew Manning2016-11-3018-211/+410
| |\ | |/ |/|
* | advanced crypto restricted by server rolezotlabs2016-11-302-0/+6
| |
* | zot 1.2zotlabs2016-11-3011-169/+307
| |
* | do not call purify_html() at this placeMario Vavti2016-11-301-2/+4
| |
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into devMario Vavti2016-11-301-2/+2
|\ \
| * \ Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergezotlabs2016-11-301-13/+13
| |\ \
| * | | pubsites: don't list dead siteszotlabs2016-11-301-2/+2
| | | |
* | | | go live with wiki mimetypes - you can now choose if a wiki will contain ↵Mario Vavti2016-11-305-26/+79
| |/ / |/| | | | | | | | markdown or bb-code markup
* | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into devMario Vavti2016-11-309-84/+96
|\| |
| * | provide role on siteinfo pagezotlabs2016-11-291-1/+1
| | |
* | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into devMario Vavti2016-11-291-1/+1
|\ \ \
* | | | rename functionMario Vavti2016-11-291-13/+13
| | | |
| | | * Merge remote-tracking branch 'upstream/dev' into docoAndrew Manning2016-11-2916-806/+840
| | | |\ | | | |/ | | |/|
| | * | This isn't the most elegant solution as it requires a bit of arcane ↵zotlabs2016-11-293-6/+9
| | | | | | | | | | | | | | | | knowledge, but provide a way to step through connections with a specific tab/panel open in the connection editor. It does not close the default panel, but merely opens the one specified by a &section= URL parameter (closing the default panel would require a major refactoring of the default panel logic). Valid choices for section currently are affinity, filter, and perms. This tab/panel selection should persist across form posting and 'prev/next'.
| | * | wrong linkzotlabs2016-11-291-1/+1
| | | |
| | * | provide a fresh new look and cleaner layout and more relevant information to ↵zotlabs2016-11-295-78/+81
| | | | | | | | | | | | | | | | siteinfo
| | * | highlightzotlabs2016-11-292-1/+7
| |/ /
| * | 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
| |\ \ | |/ / |/| |
| * | connedit prev/next: sort in the db.zotlabs2016-11-262-677/+688
| | |
| | * Major changes to accordion nav menu. Table of contents auto-generated below ↵Andrew Manning2016-11-298-126/+674
| | | | | | | | | | | | the loaded page. Removed manual TOCs from individual pages. TOC uses jQuery plugin Sticky to remain visible when it would scroll out of view.
| | * Toggle section folder icon between open and closed when selected. A bug ↵Andrew Manning2016-11-291-5/+19
| | | | | | | | | | | | prevents it from working properly the first time a section is opened.
| | * Merge remote-tracking branch 'upstream/dev' into docoAndrew Manning2016-11-287-58/+110
| | |\ | |_|/ |/| |
* | | Merge pull request #602 from anaqreon/docogit-marijus2016-11-2844-23/+1866
|\ \ \ | | | | | | | | Update context help content and context page element focus feature.