aboutsummaryrefslogtreecommitdiffstats
path: root/include
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'upstream/dev' into wikiAndrew Manning2016-06-0227-659/+420
|\
| * some initial emoji reaction workredmatrix2016-06-021-1/+5
| * the rest of the schema updates - WARNING: some third party plugins may fail; ...redmatrix2016-06-0113-372/+236
| * more db column renamesredmatrix2016-05-3112-79/+96
| * more removal of reserved words from DB schemasredmatrix2016-05-313-10/+10
| * provide a sort of mutex lock around db logging so it can't possibly recurse. ...redmatrix2016-05-312-10/+18
| * don't remove missing hooks while update_r1169 is happpening - temp fixredmatrix2016-05-311-5/+8
| * don't update hubloc_connected any more often than 15 minutes. We don't requir...redmatrix2016-05-301-5/+11
| * Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergeredmatrix2016-05-301-7/+7
| |\
| | * Merge pull request #405 from git-marijus/devhubzilla2016-05-311-7/+7
| | |\
| | | * render code bbcode inline if there are no linebreaks in the text.Mario Vavti2016-05-301-7/+7
| * | | start removing reserved words from database column names (this run: addon and...redmatrix2016-05-304-15/+15
| * | | begin moving config to zotlabs. Leave procedural stubs for backward comaptibi...redmatrix2016-05-301-144/+17
| |/ /
| * / redundant dev line from an earlier modification causes issue #404redmatrix2016-05-302-20/+6
| |/
* | Major corrections to access control and page construction.Andrew Manning2016-06-022-18/+19
* | Created page history widget to dynamically fetch and display the git commit h...Andrew Manning2016-05-302-6/+35
* | Replaced wiki item record object field with ActivityStreams information. Wiki...Andrew Manning2016-05-301-49/+40
* | Merge remote-tracking branch 'upstream/dev' into wikiAndrew Manning2016-05-291-0/+2
|\|
| * fix remote_channel(), update php minversion requirementredmatrix2016-05-291-0/+2
* | Fixed bug in access control. Hide new wiki/page buttons if not channel owner.Andrew Manning2016-05-291-5/+1
* | Only show wiki delete control if channel ownerAndrew Manning2016-05-292-7/+13
* | Fixed bug where page file was not loaded because of urlencoding/urldecodingAndrew Manning2016-05-291-1/+1
* | Git commit made for the page edits when the page is saved.Andrew Manning2016-05-291-3/+40
* | Wiki pages can be saved.Andrew Manning2016-05-281-0/+22
* | Page content is loaded from the file on diskAndrew Manning2016-05-281-0/+23
* | Wiki page list links work. File content is not yet loaded into the editor. Re...Andrew Manning2016-05-281-1/+15
* | Wiki page list is fetched and the page widget is updatedAndrew Manning2016-05-282-10/+47
* | Add new page to wiki and redirect to editor page.Andrew Manning2016-05-271-6/+49
* | Check if wiki exists and redirect if it does notAndrew Manning2016-05-271-0/+13
* | Wiki deletion worksAndrew Manning2016-05-271-6/+10
* | Merge remote-tracking branch 'upstream/dev' into wikiAndrew Manning2016-05-2736-1953/+285
|\|
| * track down some issues from the application logsredmatrix2016-05-262-2/+11
| * consolidate all the sys_boot functionality that is common between the web ser...redmatrix2016-05-261-27/+1
| * kill off mcryptredmatrix2016-05-261-6/+8
| * some event fixes, also change jquery-textcomplete to un-minified since the mi...redmatrix2016-05-252-21/+39
| * app rendering issues, typo in class name and could not find icon 'fa-arrow-ci...redmatrix2016-05-251-1/+1
| * Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergeredmatrix2016-05-251-1/+0
| |\
| | * remove the add others button for now - after some research it turned out not ...Mario Vavti2016-05-251-1/+0
| * | Just set it and forget it.redmatrix2016-05-251-3/+1
| |/
| * require token signatures in zot_refresh, also move channel specific stuff int...redmatrix2016-05-243-23/+47
| * code cleanupredmatrix2016-05-2422-92/+24
| * Add space between project name and server typeredmatrix2016-05-242-2/+2
| * more work associated with DBA and index.php shuffleredmatrix2016-05-243-97/+89
| * relocate index and dbredmatrix2016-05-244-35/+44
| * moved enotifyredmatrix2016-05-246-702/+12
| * change the signed token format. We don't folks to be able to submit random te...redmatrix2016-05-221-1/+1
| * move chatroom stuff to zlibredmatrix2016-05-223-266/+2
| * move apps to zlibredmatrix2016-05-222-661/+2
| * turn the oft-repeated block_public ... check into a function observer_prohibi...redmatrix2016-05-223-6/+6
| * renamed include files identity.php (channel.php) and Contact.php (connections...redmatrix2016-05-2212-30/+15