Commit graph

5771 commits

Author SHA1 Message Date
Andrew Manning
8f0c3f0e9b Merge remote-tracking branch 'upstream/dev' into wiki 2016-05-29 21:45:54 -04:00
redmatrix
3b2679db29 fix remote_channel(), update php minversion requirement 2016-05-29 18:38:24 -07:00
Andrew Manning
4b350b9090 Fixed bug in access control. Hide new wiki/page buttons if not channel owner. 2016-05-29 21:23:56 -04:00
Andrew Manning
00d32f6b94 Only show wiki delete control if channel owner 2016-05-29 20:39:19 -04:00
Andrew Manning
75b169f391 Fixed bug where page file was not loaded because of urlencoding/urldecoding 2016-05-29 13:50:32 -04:00
Andrew Manning
63a97ff6fc Git commit made for the page edits when the page is saved. 2016-05-29 10:18:26 -04:00
Andrew Manning
ab54bf5149 Wiki pages can be saved. 2016-05-28 15:11:19 -04:00
Andrew Manning
7393dccde8 Page content is loaded from the file on disk 2016-05-28 12:33:07 -04:00
Andrew Manning
ae94e8a855 Wiki page list links work. File content is not yet loaded into the editor. Removed some logger calls. 2016-05-28 07:42:18 -04:00
Andrew Manning
f884fa6678 Wiki page list is fetched and the page widget is updated 2016-05-28 07:17:42 -04:00
Andrew Manning
4691c3ec01 Add new page to wiki and redirect to editor page. 2016-05-27 22:19:05 -04:00
Andrew Manning
ca78ebce6d Check if wiki exists and redirect if it does not 2016-05-27 20:37:37 -04:00
Andrew Manning
97e6b7c4ba Wiki deletion works 2016-05-27 20:20:33 -04:00
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