aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'upstream/dev' into devAndrew Manning2017-01-010-0/+0
|\
| * Merge pull request #634 from anaqreon/devAndrew Manning2017-01-0132-1650/+647
| |\ | | | | | | I'm going to go ahead and merge this. It should be easy to revert undesired changes.
* | | Add guest access token section to member guide with screenshot of settingsAndrew Manning2017-01-013-4/+17
| |/ |/|
* | Deleted old versions that have been integrated. Integrated and slightly ↵Andrew Manning2017-01-0122-1171/+279
| | | | | | | | revised Comanche doco.
* | Merge remote-tracking branch 'upstream/dev' into devAndrew Manning2017-01-015-6/+15
|\|
| * better fix for #629 #635 based on ownership/authorship rather than message ↵zotlabs2016-12-311-11/+6
| | | | | | | | flags which could be forged
| * Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergezotlabs2016-12-311-1/+1
| |\
| | * fix expand-aside button hiding if aside is emptyMario Vavti2016-12-311-1/+1
| | |
| * | issues #629, #635 - edited post arriving from downstream source was not ↵zotlabs2016-12-311-0/+14
| |/ | | | | | | being rejected
| * Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergezotlabs2016-12-304-13/+5
| |\
| | * prevent eventual double scrollbarMario Vavti2016-12-301-2/+2
| | |
| * | peoplefind widget should honour directory option settings (such as this site ↵zotlabs2016-12-302-1/+1
| | | | | | | | | | | | only).
* | | Reorganized and revised Zot Protocol content. Deleted some of the old pages ↵Andrew Manning2016-12-3010-479/+368
| |/ |/| | | | | that have been refactored.
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into devMario Vavti2016-12-302-2/+20
|\|
| * move api version call back to corezotlabs2016-12-301-0/+18
| |
| * Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergezotlabs2016-12-3016-805/+1801
| |\
| * | logger typoszotlabs2016-12-301-2/+2
| | |
* | | css fixes and get rid of a javascript workaroundMario Vavti2016-12-303-11/+3
| |/ |/|
* | update fullcalendar to version 3.1Mario Vavti2016-12-3010-724/+1461
| |
* | Merge pull request #633 from anaqreon/devzotlabs2016-12-293-109/+102
|\ \ | | | | | | Doco
| * \ Merge remote-tracking branch 'upstream/dev' into devAndrew Manning2016-12-280-0/+0
| |\ \ | |/ / |/| |
* | | Merge pull request #632 from anaqreon/devzotlabs2016-12-292-48/+113
|\ \ \ | | | | | | | | Zot structures doco integrated into the Zot page.
| | * | Split Zot protocol and API into two pages. Revise text to add detail and ↵Andrew Manning2016-12-283-109/+102
| |/ / | | | | | | | | | improve presentation.
| * / Zot structures doco integrated into the Zot page. Added nowrap option to ↵Andrew Manning2016-12-282-48/+113
|/ / | | | | | | [code] BBcode tag.
* | Merge pull request #631 from anaqreon/devzotlabs2016-12-283-3/+204
|\ \ | |/ |/| Add webpage doco to Member guide. Add nav menu highlighting when scro…
| * Add webpage doco to Member guide. Add nav menu highlighting when scrolling ↵Andrew Manning2016-12-273-3/+204
|/ | | | past content
* Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergezotlabs2016-12-272-112/+190
|\
| * Merge pull request #630 from anaqreon/devAndrew Manning2016-12-272-112/+190
| |\ | | | | | | BBcode reference page is essentially complete.
| | * Revert parseIdentityAwareHTML()Andrew Manning2016-12-271-1/+1
| | |
| | * Revert parseIdentityAwareHTML()Andrew Manning2016-12-271-0/+1
| | |
| | * BBcode reference page is essentially complete. There is still room for ↵Andrew Manning2016-12-273-113/+190
| |/ | | | | | | improvement.
* | issue with HTML in code blocks in markdown in wikizotlabs2016-12-271-1/+27
| |
* | minor cleanupzotlabs2016-12-261-6/+3
|/
* Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergezotlabs2016-12-266-124/+276
|\
| * Merge pull request #628 from anaqreon/devzotlabs2016-12-276-124/+276
| |\ | | | | | | Doco revisions
| | * Almost completed reconstruction of bbcode reference pageAndrew Manning2016-12-263-60/+194
| | |
| | * Updated markup language support doco. Modified parseIdentityAwareHTML BBcode ↵Andrew Manning2016-12-264-30/+48
| | | | | | | | | | | | parsing to support the BBcode reference which is now in /help/member/bbcode.html. Add Bootstrap classes to tables for BBcode tables that have the border=0 or border=1 options set.
| | * Merge branch 'dev' of https://github.com/redmatrix/hubzilla into devAndrew Manning2016-12-262-5/+24
| | |\ | | |/ | |/|
| | * Fix broken linkAndrew Manning2016-12-251-1/+1
| | |
* | | perform input validation on xchan_store and re-enable the post method of the ↵zotlabs2016-12-262-2/+10
|/ / | | | | | | xchan api endpoint.
* | create first webpage as 'home' if none exist.zotlabs2016-12-251-1/+5
| |
* | show webpages link to visitors if a 'home' page exists. This means the nav ↵zotlabs2016-12-251-4/+19
|/ | | | menu must be used to edit pages.
* Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergezotlabs2016-12-241-2/+2
|\
| * update changelogMario Vavti2016-12-231-2/+2
| |
* | issue with post signatures if posted from api and logged in locally with a ↵zotlabs2016-12-242-3364/+3405
|/ | | | different identity.
* Merge pull request #627 from anaqreon/devzotlabs2016-12-234-285/+258
|\ | | | | Merging proposed changes to 2.0RC for doco revisions
| * Merging proposed changes to 2.0RC for doco revisionsAndrew Manning2016-12-224-285/+258
|/
* move style info into css fileMario Vavti2016-12-224-43/+39
|
* another checkMario Vavti2016-12-221-3/+5
|
* a cleaner way to work around browser bugsMario Vavti2016-12-221-7/+4
|
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-12 00:43:25 +0000