Commit Graph

7911 Commits

Author SHA1 Message Date
Andrew Manning d554681174 Merge remote-tracking branch 'upstream/dev' into wiki 2016-05-27 06:35:15 -04:00
redmatrix 61304d80d2 track down some issues from the application logs 2016-05-26 18:45:47 -07:00
redmatrix 096fdfc61b consolidate all the sys_boot functionality that is common between the web server and the cli daemon manager. Get rid of yet another global variable ($default_timezone) whilst doing so. 2016-05-26 16:33:01 -07:00
redmatrix 7b91e551c4 kill off mcrypt 2016-05-26 13:21:43 -07:00
redmatrix 2f64684299 some event fixes, also change jquery-textcomplete to un-minified since the minified version appears to require a mapping file and causes a lot of server fetch errors trying to load it. 2016-05-25 20:06:21 -07:00
redmatrix 66b6f8c0ff app rendering issues, typo in class name and could not find icon 'fa-arrow-circle-o-down-alt'; using 'fa-arrow-circle-o-down' instead 2016-05-25 17:30:15 -07:00
redmatrix 0d8dcdbbc9 Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge 2016-05-25 13:46:55 -07:00
redmatrix da19ac98dd Just set it and forget it. 2016-05-25 13:46:19 -07:00
Mario Vavti 9908a7193a remove the add others button for now - after some research it turned out not beeing so useful 2016-05-25 14:31:58 +02:00
redmatrix c37eaff263 require token signatures in zot_refresh, also move channel specific stuff into include/channel.php from include/connections.php 2016-05-24 23:05:00 -07:00
redmatrix 80f2ba640e code cleanup 2016-05-24 20:49:23 -07:00
redmatrix f9a295a236 Add space between project name and server type 2016-05-24 19:25:10 -07:00
redmatrix 516c43ba15 more work associated with DBA and index.php shuffle 2016-05-24 17:54:45 -07:00
redmatrix 84ba6393ad relocate index and db 2016-05-24 16:36:55 -07:00
Andrew Manning e00b8a7082 Delete wiki (in progress) 2016-05-24 06:15:42 -04:00
redmatrix 29ba891809 moved enotify 2016-05-24 01:25:13 -07:00
redmatrix bbc71343bd change the signed token format. We don't folks to be able to submit random text for signing by us, as they could then use these to generate known signatures. 2016-05-22 22:44:13 -07:00
redmatrix 1aa3051e97 move chatroom stuff to zlib 2016-05-22 20:54:52 -07:00
redmatrix 2d06663490 move apps to zlib 2016-05-22 19:25:27 -07:00
redmatrix 5e0698ba87 turn the oft-repeated block_public ... check into a function observer_prohibited() 2016-05-22 17:52:30 -07:00
redmatrix de006771c7 renamed include files identity.php (channel.php) and Contact.php (connections.php) 2016-05-22 16:54:30 -07:00
Andrew Manning a36bef7979 List of wikis populates with links according to observer permissions. 2016-05-21 21:55:09 -04:00
redmatrix 1cb311cef9 finish updating zot_finger instances 2016-05-21 18:18:33 -07:00
redmatrix ed56b6e67b first cut at zot-finger request signatures 2016-05-21 18:02:14 -07:00
Andrew Manning 049147a9d7 Successful new wiki git repo and item table record 2016-05-21 19:02:23 -04:00
Andrew Manning c6aa42773a Trying to fix wiki branch starting fresh from dev 2016-05-21 14:56:42 -04:00
redmatrix bf05012150 relocate the (unused currently) protocol driver 2016-05-20 23:12:06 -07:00
redmatrix d8ace38041 rework the conversation object stuff at a high level - still needs a bit of refactoring 2016-05-20 22:52:47 -07:00
redmatrix 019250eff8 consolidate include/*_selectors.php (not touching acl_selectors for the moment, as it will likely end up with a different disposition) 2016-05-20 22:13:20 -07:00
redmatrix f4da365abd move template stuff to zotlabs/render 2016-05-20 19:11:14 -07:00
redmatrix b2f0d2d085 cleanup proc_run after messing it up with debugging yesterday 2016-05-20 17:44:26 -07:00
redmatrix cae380f068 case issue 2016-05-20 01:21:19 -07:00
redmatrix a97e7b2758 Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge 2016-05-19 22:48:58 -07:00
redmatrix f228bf4555 typo uncovered during tests 2016-05-19 22:33:01 -07:00
redmatrix a2cec8899a daemon conversion continued... 2016-05-19 22:26:37 -07:00
redmatrix 39bc0664a7 Separate cron into periodic components and use that as the main interface for scheduled tasks instead of the quaint 'poller'. 2016-05-19 21:22:04 -07:00
redmatrix 853322e7d2 don't try to deliver empty hashes 2016-05-19 20:48:40 -07:00
redmatrix 9cb1ac3de5 daemon master: create some compatibility code 2016-05-19 20:36:32 -07:00
redmatrix 6e7d7c5017 minor 2016-05-19 16:48:10 -07:00
Mario Vavti 1f2bd00d93 whitespace 2016-05-19 23:39:05 +02:00
Mario Vavti c7cad6ab60 Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev 2016-05-19 23:35:48 +02:00
Mario Vavti 0f5eb65210 provide an acl select option for only me 2016-05-19 23:35:19 +02:00
Treer 6b69184554 fix permission string 2016-05-19 22:37:21 +10:00
redmatrix 3355210878 explain what we're doing and where we're going with this. 2016-05-18 22:03:43 -07:00
redmatrix d38851023e provide server role on pubsites page 2016-05-18 16:28:51 -07:00
Mario Vavti c77732b8ed only show $showall_origin if permission_role is custom. it does not make much sense otherwise since the member is merely using a preset of permissions. 2016-05-18 21:23:24 +02:00
redmatrix 16f79b70e4 experimental PDO DBA driver 2016-05-17 22:32:49 -07:00
redmatrix 43c2b22fca cli utilities - argc and argv reversed. Not functionally incorrect since it was consistent but aesthetically incorrect. 2016-05-17 19:49:21 -07:00
hubzilla 9a64c6b9f7 Merge pull request #389 from sasiflo/dev_sasiflo_sync
Synchronization: Directory creation on sync import corrected.
2016-05-18 12:16:20 +10:00
redmatrix 20cb4130d4 support work for a long-term fix for issue #390, essentially one can specify a theme:schema string anywhere a theme is input. It will be honoured unless an existing schema setting over-rides this behaviour. This should also be backward compatible but the theme selection code has been cleaned up slightly and there may be subtle differences in behaviour after this commit. On my site this required a page refresh as the first page load after this change was a bit confused. 2016-05-17 17:46:30 -07:00