aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'upstream/dev' into wikiAndrew Manning2016-05-291-2/+2
|\
| * fix remote_channel(), update php minversion requirementredmatrix2016-05-291-2/+2
* | Fixed bug in access control. Hide new wiki/page buttons if not channel owner.Andrew Manning2016-05-291-2/+0
* | Remove Parsedown library files and remove references.Andrew Manning2016-05-291-2/+0
* | Only show wiki delete control if channel ownerAndrew Manning2016-05-291-0/+1
* | 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-291-5/+9
* | Home page create with new wiki. URL redirects here when no page given. Fixed ...Andrew Manning2016-05-291-3/+17
* | Git commit made for the page edits when the page is saved.Andrew Manning2016-05-292-2/+22
* | Wiki pages can be saved.Andrew Manning2016-05-281-4/+40
* | Show page content by default. Hide page controls where appropriate. Fix sandb...Andrew Manning2016-05-281-2/+10
* | Page content is loaded from the file on diskAndrew Manning2016-05-281-3/+11
* | Wiki page list links work. File content is not yet loaded into the editor. Re...Andrew Manning2016-05-281-6/+4
* | Wiki page list is fetched and the page widget is updatedAndrew Manning2016-05-281-4/+16
* | Add new page to wiki and redirect to editor page.Andrew Manning2016-05-271-7/+52
* | Check if wiki exists and redirect if it does notAndrew Manning2016-05-271-1/+6
* | Merge remote-tracking branch 'upstream/dev' into wikiAndrew Manning2016-05-2773-517/+2333
|\|
| * link to hubchart site for site detail on pubsites pageredmatrix2016-05-261-2/+3
| * track down some issues from the application logsredmatrix2016-05-261-2/+2
| * consolidate all the sys_boot functionality that is common between the web ser...redmatrix2016-05-261-59/+1
| * 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
| * 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
| * | some event fixes, also change jquery-textcomplete to un-minified since the mi...redmatrix2016-05-251-1/+1
| * | duplicate daemon run of cronhooksredmatrix2016-05-251-5/+0
| |/
| * require token signatures in zot_refresh, also move channel specific stuff int...redmatrix2016-05-241-0/+1
| * more work associated with DBA and index.php shuffleredmatrix2016-05-242-42/+14
| * relocate index and dbredmatrix2016-05-242-12/+205
| * moved enotifyredmatrix2016-05-243-5/+691
| * typoredmatrix2016-05-231-1/+1
| * change the signed token format. We don't folks to be able to submit random te...redmatrix2016-05-221-1/+1
| * Can't use "use x as y" aliases in callback function declarationsredmatrix2016-05-221-1/+1
| * move chatroom stuff to zlibredmatrix2016-05-223-15/+286
| * add missing fileredmatrix2016-05-221-0/+659
| * move apps to zlibredmatrix2016-05-222-16/+18
| * turn the oft-repeated block_public ... check into a function observer_prohibi...redmatrix2016-05-2212-301/+296
| * renamed include files identity.php (channel.php) and Contact.php (connections...redmatrix2016-05-2246-76/+45
| * Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergeredmatrix2016-05-212-9/+15
| |\
| | * Temp repo folder error message correctionAndrew Manning2016-05-211-2/+2
| | * Moved git repository storage to store/[data]/git to avoid collision with a ch...Andrew Manning2016-05-211-8/+14
| * | include new finger backendredmatrix2016-05-211-0/+130
| * | finish updating zot_finger instancesredmatrix2016-05-216-31/+19
| * | first cut at zot-finger request signaturesredmatrix2016-05-211-8/+8
* | | Delete wiki (in progress)Andrew Manning2016-05-241-7/+45
* | | List of wikis populates with links according to observer permissions.Andrew Manning2016-05-211-0/+15
* | | Successful new wiki git repo and item table recordAndrew Manning2016-05-212-11/+23
* | | Trying to fix wiki branch starting fresh from devAndrew Manning2016-05-211-0/+113
| |/ |/|
* | revert fix for #385Mario Vavti2016-05-211-4/+0