Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | redmatrix | 2016-05-30 | 1 | -7/+7 |
|\ | |||||
| * | Merge pull request #405 from git-marijus/dev | hubzilla | 2016-05-31 | 1 | -7/+7 |
| |\ | | | | | | | render code bbcode inline if there are no linebreaks in the text. | ||||
| | * | render code bbcode inline if there are no linebreaks in the text. | Mario Vavti | 2016-05-30 | 1 | -7/+7 |
| | | | |||||
* | | | start removing reserved words from database column names (this run: addon ↵ | redmatrix | 2016-05-30 | 4 | -15/+15 |
| | | | | | | | | | | | | and hook) | ||||
* | | | begin moving config to zotlabs. Leave procedural stubs for backward ↵ | redmatrix | 2016-05-30 | 1 | -144/+17 |
|/ / | | | | | | | comaptibility | ||||
* / | redundant dev line from an earlier modification causes issue #404 | redmatrix | 2016-05-30 | 2 | -20/+6 |
|/ | |||||
* | fix remote_channel(), update php minversion requirement | redmatrix | 2016-05-29 | 1 | -0/+2 |
| | |||||
* | track down some issues from the application logs | redmatrix | 2016-05-26 | 2 | -2/+11 |
| | |||||
* | consolidate all the sys_boot functionality that is common between the web ↵ | redmatrix | 2016-05-26 | 1 | -27/+1 |
| | | | | server and the cli daemon manager. Get rid of yet another global variable ($default_timezone) whilst doing so. | ||||
* | kill off mcrypt | redmatrix | 2016-05-26 | 1 | -6/+8 |
| | |||||
* | some event fixes, also change jquery-textcomplete to un-minified since the ↵ | redmatrix | 2016-05-25 | 2 | -21/+39 |
| | | | | 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 | 1 | -1/+1 |
| | | | | 'fa-arrow-circle-o-down-alt'; using 'fa-arrow-circle-o-down' instead | ||||
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | redmatrix | 2016-05-25 | 1 | -1/+0 |
|\ | |||||
| * | remove the add others button for now - after some research it turned out not ↵ | Mario Vavti | 2016-05-25 | 1 | -1/+0 |
| | | | | | | | | beeing so useful | ||||
* | | Just set it and forget it. | redmatrix | 2016-05-25 | 1 | -3/+1 |
|/ | |||||
* | require token signatures in zot_refresh, also move channel specific stuff ↵ | redmatrix | 2016-05-24 | 3 | -23/+47 |
| | | | | into include/channel.php from include/connections.php | ||||
* | code cleanup | redmatrix | 2016-05-24 | 22 | -92/+24 |
| | |||||
* | 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 | 3 | -97/+89 |
| | |||||
* | relocate index and db | redmatrix | 2016-05-24 | 4 | -35/+44 |
| | |||||
* | moved enotify | redmatrix | 2016-05-24 | 6 | -702/+12 |
| | |||||
* | change the signed token format. We don't folks to be able to submit random ↵ | redmatrix | 2016-05-22 | 1 | -1/+1 |
| | | | | text for signing by us, as they could then use these to generate known signatures. | ||||
* | move chatroom stuff to zlib | redmatrix | 2016-05-22 | 3 | -266/+2 |
| | |||||
* | move apps to zlib | redmatrix | 2016-05-22 | 2 | -661/+2 |
| | |||||
* | turn the oft-repeated block_public ... check into a function ↵ | redmatrix | 2016-05-22 | 3 | -6/+6 |
| | | | | observer_prohibited() | ||||
* | renamed include files identity.php (channel.php) and Contact.php ↵ | redmatrix | 2016-05-22 | 12 | -30/+15 |
| | | | | (connections.php) | ||||
* | finish updating zot_finger instances | redmatrix | 2016-05-21 | 3 | -11/+8 |
| | |||||
* | first cut at zot-finger request signatures | redmatrix | 2016-05-21 | 1 | -0/+6 |
| | |||||
* | relocate the (unused currently) protocol driver | redmatrix | 2016-05-20 | 1 | -43/+0 |
| | |||||
* | rework the conversation object stuff at a high level - still needs a bit of ↵ | redmatrix | 2016-05-20 | 12 | -1059/+20 |
| | | | | refactoring | ||||
* | consolidate include/*_selectors.php (not touching acl_selectors for the ↵ | redmatrix | 2016-05-20 | 3 | -97/+70 |
| | | | | moment, as it will likely end up with a different disposition) | ||||
* | move template stuff to zotlabs/render | redmatrix | 2016-05-20 | 5 | -439/+2 |
| | |||||
* | cleanup proc_run after messing it up with debugging yesterday | redmatrix | 2016-05-20 | 2 | -2/+32 |
| | |||||
* | case issue | redmatrix | 2016-05-20 | 1 | -2/+2 |
| | |||||
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | redmatrix | 2016-05-19 | 1 | -0/+2 |
|\ | |||||
| * | whitespace | Mario Vavti | 2016-05-19 | 1 | -1/+1 |
| | | |||||
| * | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev | Mario Vavti | 2016-05-19 | 1 | -10/+2 |
| |\ | |||||
| * | | provide an acl select option for only me | Mario Vavti | 2016-05-19 | 1 | -0/+2 |
| | | | |||||
* | | | typo uncovered during tests | redmatrix | 2016-05-19 | 1 | -1/+1 |
| | | | |||||
* | | | daemon conversion continued... | redmatrix | 2016-05-19 | 28 | -1767/+31 |
| | | | |||||
* | | | Separate cron into periodic components and use that as the main interface ↵ | redmatrix | 2016-05-19 | 1 | -2/+1 |
| | | | | | | | | | | | | for scheduled tasks instead of the quaint 'poller'. | ||||
* | | | don't try to deliver empty hashes | redmatrix | 2016-05-19 | 1 | -0/+3 |
| | | | |||||
* | | | daemon master: create some compatibility code | redmatrix | 2016-05-19 | 1 | -430/+1 |
| | | | |||||
* | | | minor | redmatrix | 2016-05-19 | 2 | -0/+5 |
| |/ |/| | |||||
* | | fix permission string | Treer | 2016-05-19 | 1 | -10/+2 |
|/ | |||||
* | explain what we're doing and where we're going with this. | redmatrix | 2016-05-18 | 1 | -6/+7 |
| | |||||
* | provide server role on pubsites page | redmatrix | 2016-05-18 | 1 | -1/+1 |
| | |||||
* | only show $showall_origin if permission_role is custom. it does not make ↵ | Mario Vavti | 2016-05-18 | 1 | -3/+3 |
| | | | | much sense otherwise since the member is merely using a preset of permissions. | ||||
* | experimental PDO DBA driver | redmatrix | 2016-05-17 | 2 | -4/+106 |
| | |||||
* | cli utilities - argc and argv reversed. Not functionally incorrect since it ↵ | redmatrix | 2016-05-17 | 16 | -35/+32 |
| | | | | was consistent but aesthetically incorrect. |