Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'upstream/dev' into wiki | Andrew Manning | 2016-05-29 | 4 | -4/+6 |
|\ | |||||
| * | fix remote_channel(), update php minversion requirement | redmatrix | 2016-05-29 | 4 | -4/+6 |
| | | |||||
* | | Fixed bug in access control. Hide new wiki/page buttons if not channel owner. | Andrew Manning | 2016-05-29 | 3 | -7/+3 |
| | | |||||
* | | Remove Parsedown library files and remove references. | Andrew Manning | 2016-05-29 | 113 | -2702/+0 |
| | | |||||
* | | Only show wiki delete control if channel owner | Andrew Manning | 2016-05-29 | 4 | -7/+16 |
| | | |||||
* | | Hide page controls when not owner. Fixed some serious access control issues. | Andrew Manning | 2016-05-29 | 1 | -22/+27 |
| | | |||||
* | | Hacked Parsedown and Markdown to add class inline-code to <code> blocks for ↵ | Andrew Manning | 2016-05-29 | 5 | -6/+28 |
| | | | | | | | | proper inline code rendering. Stopped using Parsedown even though Markdown is slower, hence extra delay when previewing pages. | ||||
* | | Fixed bug where page file was not loaded because of urlencoding/urldecoding | Andrew Manning | 2016-05-29 | 1 | -1/+1 |
| | | |||||
* | | Home page create with new wiki. URL redirects here when no page given. Fixed ↵ | Andrew Manning | 2016-05-29 | 2 | -4/+18 |
| | | | | | | | | bug with author in wiki item table record. | ||||
* | | Git commit made for the page edits when the page is saved. | Andrew Manning | 2016-05-29 | 3 | -5/+62 |
| | | |||||
* | | Wiki pages can be saved. | Andrew Manning | 2016-05-28 | 3 | -6/+83 |
| | | |||||
* | | Merge remote-tracking branch 'upstream/dev' into wiki | Andrew Manning | 2016-05-28 | 5 | -2123/+2151 |
|\| | |||||
| * | allow objs to represent inventory | redmatrix | 2016-05-27 | 4 | -4/+25 |
| | | |||||
| * | strings update | redmatrix | 2016-05-27 | 1 | -2109/+2099 |
| | | |||||
| * | check for session before querying session vars | redmatrix | 2016-05-27 | 1 | -10/+27 |
| | | |||||
* | | Show page content by default. Hide page controls where appropriate. Fix ↵ | Andrew Manning | 2016-05-28 | 2 | -8/+18 |
| | | | | | | | | sandbox text format. | ||||
* | | Page content is loaded from the file on disk | Andrew Manning | 2016-05-28 | 3 | -4/+35 |
| | | |||||
* | | Wiki page list links work. File content is not yet loaded into the editor. ↵ | Andrew Manning | 2016-05-28 | 4 | -12/+25 |
| | | | | | | | | Removed some logger calls. | ||||
* | | Wiki page list is fetched and the page widget is updated | Andrew Manning | 2016-05-28 | 5 | -15/+81 |
| | | |||||
* | | Add new page to wiki and redirect to editor page. | Andrew Manning | 2016-05-27 | 3 | -13/+120 |
| | | |||||
* | | Check if wiki exists and redirect if it does not | Andrew Manning | 2016-05-27 | 2 | -1/+19 |
| | | |||||
* | | Wiki deletion works | Andrew Manning | 2016-05-27 | 2 | -6/+12 |
| | | |||||
* | | Merge remote-tracking branch 'upstream/dev' into wiki | Andrew Manning | 2016-05-27 | 152 | -5312/+4411 |
|\| | |||||
| * | link to hubchart site for site detail on pubsites page | redmatrix | 2016-05-26 | 1 | -2/+3 |
| | | |||||
| * | track down some issues from the application logs | redmatrix | 2016-05-26 | 3 | -4/+13 |
| | | |||||
| * | don't need quite so many backslashes | redmatrix | 2016-05-26 | 1 | -11/+11 |
| | | |||||
| * | consolidate all the sys_boot functionality that is common between the web ↵ | redmatrix | 2016-05-26 | 16 | -100/+82 |
| | | | | | | | | server and the cli daemon manager. Get rid of yet another global variable ($default_timezone) whilst doing so. | ||||
| * | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | redmatrix | 2016-05-26 | 3 | -7/+9 |
| |\ | |||||
| | * | another typo | Mario Vavti | 2016-05-26 | 1 | -1/+1 |
| | | | |||||
| | * | check if $addonDir is a dir to silence warning if it does not exist | Mario Vavti | 2016-05-26 | 1 | -5/+7 |
| | | | |||||
| | * | typo | Mario Vavti | 2016-05-26 | 1 | -1/+1 |
| | | | |||||
| * | | kill off mcrypt | redmatrix | 2016-05-26 | 2 | -10/+11 |
| |/ | |||||
| * | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | redmatrix | 2016-05-25 | 2 | -0/+4 |
| |\ | |||||
| | * | Merge pull request #402 from git-marijus/dev | hubzilla | 2016-05-26 | 2 | -0/+4 |
| | |\ | | | | | | | | | another try on #385 - replace sabres restrictive CSP with what we do in boot.php | ||||
| | | * | another try on #385 - replace sabres restrictive CSP with what we do in boot.php | Mario Vavti | 2016-05-25 | 2 | -0/+4 |
| | | | | |||||
| * | | | update to the bug doco | redmatrix | 2016-05-25 | 1 | -15/+1 |
| |/ / | |||||
| * | | run background/daemon tasks at approximately 4 hour intervals from web ↵ | redmatrix | 2016-05-25 | 1 | -5/+10 |
| | | | | | | | | | | | | accesses if they aren't being run otherwise. This ensures they run, although perhaps a bit infrequently; even if unconfigured. This is not suitable for a production site, but may be acceptable for small single person hubs and test sites. The 'cron warning email' now means that background processes are totally borked; probably due to a fascist hosting provider that has blocked process execution. | ||||
| * | | some event fixes, also change jquery-textcomplete to un-minified since the ↵ | redmatrix | 2016-05-25 | 4 | -23/+41 |
| | | | | | | | | | | | | minified version appears to require a mapping file and causes a lot of server fetch errors trying to load it. | ||||
| * | | app rendering issues, typo in class name and could not find icon ↵ | redmatrix | 2016-05-25 | 2 | -2/+2 |
| | | | | | | | | | | | | 'fa-arrow-circle-o-down-alt'; using 'fa-arrow-circle-o-down' instead | ||||
| * | | duplicate daemon run of cronhooks | redmatrix | 2016-05-25 | 1 | -5/+0 |
| | | | |||||
| * | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | redmatrix | 2016-05-25 | 3 | -9/+0 |
| |\ \ | |||||
| | * \ | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev | Mario Vavti | 2016-05-25 | 1 | -1/+1 |
| | |\ \ | |||||
| | * | | | remove the add others button for now - after some research it turned out not ↵ | Mario Vavti | 2016-05-25 | 3 | -9/+0 |
| | | |/ | | |/| | | | | | | | | | beeing so useful | ||||
| * | | | Just set it and forget it. | redmatrix | 2016-05-25 | 1 | -3/+1 |
| | |/ | |/| | |||||
| * | | hubzilla is not a legal entity. the hubzilla community encompasses a group ↵ | redmatrix | 2016-05-25 | 1 | -1/+1 |
| |/ | | | | | | | of people who are in fact legal entities. | ||||
| * | require token signatures in zot_refresh, also move channel specific stuff ↵ | redmatrix | 2016-05-24 | 5 | -23/+50 |
| | | | | | | | | into include/channel.php from include/connections.php | ||||
| * | code cleanup | redmatrix | 2016-05-24 | 30 | -584/+28 |
| | | |||||
| * | Add space between project name and server type | redmatrix | 2016-05-24 | 2 | -2/+2 |
| | | |||||
| * | more work associated with DBA and index.php shuffle | redmatrix | 2016-05-24 | 6 | -139/+105 |
| | | |||||
| * | relocate index and db | redmatrix | 2016-05-24 | 7 | -221/+253 |
| | |