aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | Merge remote-tracking branch 'upstream/dev' into wikiAndrew Manning2016-05-301-1/+1
|\|
| * undefined functionredmatrix2016-05-291-1/+1
* | Replaced wiki item record object field with ActivityStreams information. Wiki...Andrew Manning2016-05-304-72/+53
* | Merge remote-tracking branch 'upstream/dev' into wikiAndrew Manning2016-05-294-4/+6
|\|
| * fix remote_channel(), update php minversion requirementredmatrix2016-05-294-4/+6
* | Fixed bug in access control. Hide new wiki/page buttons if not channel owner.Andrew Manning2016-05-293-7/+3
* | Remove Parsedown library files and remove references.Andrew Manning2016-05-29113-2702/+0
* | Only show wiki delete control if channel ownerAndrew Manning2016-05-294-7/+16
* | Hide page controls when not owner. Fixed some serious access control issues.Andrew Manning2016-05-291-22/+27
* | Hacked Parsedown and Markdown to add class inline-code to <code> blocks for p...Andrew Manning2016-05-295-6/+28
* | Fixed bug where page file was not loaded because of urlencoding/urldecodingAndrew Manning2016-05-291-1/+1
* | Home page create with new wiki. URL redirects here when no page given. Fixed ...Andrew Manning2016-05-292-4/+18
* | Git commit made for the page edits when the page is saved.Andrew Manning2016-05-293-5/+62
* | Wiki pages can be saved.Andrew Manning2016-05-283-6/+83
* | Merge remote-tracking branch 'upstream/dev' into wikiAndrew Manning2016-05-285-2123/+2151
|\|
| * allow objs to represent inventoryredmatrix2016-05-274-4/+25
| * strings updateredmatrix2016-05-271-2109/+2099
| * check for session before querying session varsredmatrix2016-05-271-10/+27
* | Show page content by default. Hide page controls where appropriate. Fix sandb...Andrew Manning2016-05-282-8/+18
* | Page content is loaded from the file on diskAndrew Manning2016-05-283-4/+35
* | Wiki page list links work. File content is not yet loaded into the editor. Re...Andrew Manning2016-05-284-12/+25
* | Wiki page list is fetched and the page widget is updatedAndrew Manning2016-05-285-15/+81
* | Add new page to wiki and redirect to editor page.Andrew Manning2016-05-273-13/+120
* | Check if wiki exists and redirect if it does notAndrew Manning2016-05-272-1/+19
* | Wiki deletion worksAndrew Manning2016-05-272-6/+12
* | Merge remote-tracking branch 'upstream/dev' into wikiAndrew Manning2016-05-27152-5312/+4411
|\|
| * link to hubchart site for site detail on pubsites pageredmatrix2016-05-261-2/+3
| * track down some issues from the application logsredmatrix2016-05-263-4/+13
| * don't need quite so many backslashesredmatrix2016-05-261-11/+11
| * consolidate all the sys_boot functionality that is common between the web ser...redmatrix2016-05-2616-100/+82
| * Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergeredmatrix2016-05-263-7/+9
| |\
| | * another typoMario Vavti2016-05-261-1/+1
| | * check if $addonDir is a dir to silence warning if it does not existMario Vavti2016-05-261-5/+7
| | * typoMario Vavti2016-05-261-1/+1
| * | kill off mcryptredmatrix2016-05-262-10/+11
| |/
| * Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergeredmatrix2016-05-252-0/+4
| |\
| | * Merge pull request #402 from git-marijus/devhubzilla2016-05-262-0/+4
| | |\
| | | * another try on #385 - replace sabres restrictive CSP with what we do in boot.phpMario Vavti2016-05-252-0/+4
| * | | update to the bug docoredmatrix2016-05-251-15/+1
| |/ /
| * | run background/daemon tasks at approximately 4 hour intervals from web access...redmatrix2016-05-251-5/+10
| * | some event fixes, also change jquery-textcomplete to un-minified since the mi...redmatrix2016-05-254-23/+41
| * | app rendering issues, typo in class name and could not find icon 'fa-arrow-ci...redmatrix2016-05-252-2/+2
| * | duplicate daemon run of cronhooksredmatrix2016-05-251-5/+0
| * | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergeredmatrix2016-05-253-9/+0
| |\ \
| | * \ Merge branch 'dev' of https://github.com/redmatrix/hubzilla into devMario Vavti2016-05-251-1/+1
| | |\ \
| | * | | remove the add others button for now - after some research it turned out not ...Mario Vavti2016-05-253-9/+0
| | | |/ | | |/|
| * | | Just set it and forget it.redmatrix2016-05-251-3/+1
| | |/ | |/|
| * | hubzilla is not a legal entity. the hubzilla community encompasses a group of...redmatrix2016-05-251-1/+1
| |/
| * require token signatures in zot_refresh, also move channel specific stuff int...redmatrix2016-05-245-23/+50
| * code cleanupredmatrix2016-05-2430-584/+28