aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'upstream/dev' into wikiAndrew Manning2016-06-043-6/+68
|\
| * need to set item_origin on locally created reactions so they propagate properlyredmatrix2016-06-031-0/+1
| * missed table rename in event query in mod_manageredmatrix2016-06-031-5/+5
| * allow any (current) emoji to be displayed on any site, and provide a default ...redmatrix2016-06-031-1/+11
| * turn emoji ability into a feature so that either a member or the site admin c...redmatrix2016-06-031-0/+1
| * experimental emoji supportredmatrix2016-06-021-0/+50
* | Merge remote-tracking branch 'upstream/dev' into wikiAndrew Manning2016-06-0248-392/+479
|\|
| * preserve app categories when updating a system appredmatrix2016-06-021-7/+25
| * adjust algorithm to ensure new system apps are installed.redmatrix2016-06-021-3/+12
| * install system apps if a) they have never been installed, or b) if the app ve...redmatrix2016-06-021-10/+29
| * the rest of the schema updates - WARNING: some third party plugins may fail; ...redmatrix2016-06-0125-196/+189
| * more db column renamesredmatrix2016-05-3117-57/+56
| * more removal of reserved words from DB schemasredmatrix2016-05-314-10/+10
| * remove unused tablesredmatrix2016-05-301-117/+0
| * start removing reserved words from database column names (this run: addon and...redmatrix2016-05-302-5/+5
| * begin moving config to zotlabs. Leave procedural stubs for backward comaptibi...redmatrix2016-05-301-0/+166
* | Major corrections to access control and page construction.Andrew Manning2016-06-022-102/+110
* | Created page history widget to dynamically fetch and display the git commit h...Andrew Manning2016-05-301-3/+33
* | 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-301-6/+12
* | 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