aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'upstream/dev' into wikiAndrew Manning2016-06-092-5/+9
|\
| * namespace issue with openid reverse authredmatrix2016-06-091-4/+4
| * allow an exclusion for transmitting hidden file activities. There may be a be...redmatrix2016-06-091-1/+5
* | Revised permissions checks across API and enabled collaborative editing using...Andrew Manning2016-06-081-79/+60
* | Merge remote-tracking branch 'upstream/dev' into wikiAndrew Manning2016-06-085-1/+424
|\|
| * Finish the config familyredmatrix2016-06-075-1/+424
* | Merge remote-tracking branch 'upstream/dev' into wikiAndrew Manning2016-06-074-53/+258
|\|
| * 'recent photos' query was buggered, also fix issue #163 by adding configurabl...redmatrix2016-06-071-9/+5
| * rename admin/users to admin/accounts, provide sortable columns in account and...redmatrix2016-06-061-43/+63
| * move pconfig to static classredmatrix2016-06-051-0/+189
| * We need a laugh icon more than we need a cry icon.redmatrix2016-06-051-1/+1
* | Hide page history viewer when viewing sandboxAndrew Manning2016-06-051-1/+4
* | Custom commit message available. Improved history viewer and feedback from re...Andrew Manning2016-06-051-1/+10
* | Merge remote-tracking branch 'upstream/dev' into wikiAndrew Manning2016-06-051-1/+1
|\|
| * short-term solution to emoji size issue - make them 32px from the senderredmatrix2016-06-041-1/+1
* | Basic page reversion implemented. The revert button on the history view repla...Andrew Manning2016-06-051-0/+35
* | Page deletion implemented. Hide the delete button and disallow for Home page.Andrew Manning2016-06-041-4/+51
* | Merge remote-tracking branch 'upstream/dev' into wikiAndrew Manning2016-06-041-3/+3
|\|
| * class functions called incorrectlyredmatrix2016-06-041-3/+3
* | Wiki and page filenames are abstracted from their displayed names. Special ch...Andrew Manning2016-06-041-20/+22
* | Created three distinct names for wiki and page that are suitable for URL, HTM...Andrew Manning2016-06-041-6/+10
* | 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