Commit graph

4582 commits

Author SHA1 Message Date
redmatrix
b5875c3af9 Merge https://github.com/redmatrix/hubzilla into pending_merge
Conflicts:
	version.inc
2015-11-19 11:47:41 -08:00
redmatrix
ed87dbc141 issue #173 2015-11-19 11:46:29 -08:00
Mario Vavti
ba52af786e move today button from aside to section title 2015-11-19 11:38:34 +01:00
Mario Vavti
0c163c4d03 Merge branch 'master' of https://github.com/redmatrix/hubzilla 2015-11-18 23:51:00 +01:00
Mario Vavti
e4145deeb7 some events refacturing 2015-11-18 23:50:42 +01:00
ken restivo
312cc415ce Pass in account_id. Required for bulk identity importer. 2015-11-18 00:26:18 -08:00
ken restivo
1f2a408be0 Use provided account_id instead of user's logged in account_id. Necessary for bulk importer. 2015-11-18 00:03:59 -08:00
redmatrix
68da4d90dc fix admin plugin hooks 2015-11-17 20:44:57 -08:00
redmatrix
6df98f080b fix api/direct_messages/new at least for the json case. We seem to have a missing template for XML 2015-11-16 19:17:39 -08:00
redmatrix
fff30b1c3d permission issues editing wall-to-wall posts 2015-11-15 19:36:17 -08:00
redmatrix
3d80073a0e revert html in markdown for posts, but trim the input before processing the markdown 2015-11-15 18:03:37 -08:00
redmatrix
dba38821bc superblock enhancements 2015-11-13 15:28:34 -08:00
redmatrix
888bf76e4b allow pdl content 2015-11-12 17:47:38 -08:00
redmatrix
391807b46c small fixes, removed old unused database row, and log more prominently a missing directory server URL 2015-11-12 16:45:38 -08:00
jeroenpraat
5afe8e5aa1 Small update to Bluegrid and generic-content-wrapper-styled to dreport 2015-11-12 22:10:20 +01:00
redmatrix
bd3d323849 run markdown through html purifier for those who insist on mixing html with markdown. 2015-11-11 15:09:22 -08:00
ken restivo
10ccdbacba Bust out import_account() into a separate function to allow importing accounts by proxy, i.e. for admins to import a channel on behalf of a user. 2015-11-10 23:07:28 -08:00
redmatrix
e7bedf4433 do a better job of preserving linebreaks in posts for channels that use markdown 2015-11-10 19:02:28 -08:00
redmatrix
11c8cabf28 suppress duplicate locations in connedit, issue #111 2015-11-08 20:41:11 -08:00
redmatrix
5c2692a8ea no comment permission bug, also implement delete() in RedDirectory per Waitman 2015-11-08 16:36:36 -08:00
redmatrix
cf0bff8582 relative attachment not fetched due to os filename issue 2015-11-08 13:54:31 -08:00
jeroenpraat
16040063dc A few quotes too many. Also translations for tooltip. 2015-11-08 00:08:02 +01:00
jeroenpraat
2b0b03eebc Fix ffsapi for non-English languages (or better when 's was used in the strings) - Update nl+es 2015-11-08 00:04:02 +01:00
redmatrix
017ea0d624 more work on hook doco 2015-11-05 20:19:38 -08:00
redmatrix
a29b8b369e update hooklist 2015-11-05 20:10:49 -08:00
jeroenpraat
94437a8fcd Firefox Share app. Paper plane icon is public domain. Shorted the name in ffsapi > compare it with other providers. Changed bookmark (checkmark) item to selfmade Hubzilla bookmark icon for Firefox (bookmark icon = bootstrap icon). 2015-11-05 22:58:46 +01:00
jeroenpraat
0db5a8673d Firefox share (that seems now the official name) button added to misc. settings. 2015-11-05 16:20:56 +01:00
jeroenpraat
91f2e05d5d Style the button 2015-11-05 09:06:45 +01:00
redmatrix
5f1ccc25b6 menu_list() takes a channel_id, not the whole channel array 2015-11-04 18:34:42 -08:00
redmatrix
42c0f83ec5 typo 2015-11-04 18:21:36 -08:00
redmatrix
5dfaeaf526 add bookmarking to FF social api provider 2015-11-04 18:15:03 -08:00
redmatrix
f4a9529968 Firefox Share API provider interface (first cut, only has share ability) 2015-11-04 17:47:24 -08:00
redmatrix
77a03e376c Merge https://github.com/redmatrix/redmatrix into pending_merge
Conflicts:
	include/photo/photo_driver.php
	include/text.php
	mod/post.php
2015-11-03 20:46:47 -08:00
redmatrix
5dade2b608 backport small bits of the re-install fix; at least the damaging bits 2015-11-03 20:40:43 -08:00
redmatrix
877b3361c8 better re-install detection/protection. This necessitated a slight protocol change but should not introduce any compatibility issues with older software. Things just work better if you use an up-to-date server. 2015-11-03 20:28:56 -08:00
redmatrix
2fbfc2a8f1 need better peer verification due to re-install issue, this is temporary 2015-11-03 19:50:40 -08:00
redmatrix
e09b49288f provide admin setting to change directory server 2015-11-03 18:34:16 -08:00
redmatrix
c1cfcc78fe Merge https://github.com/redmatrix/hubzilla into pending_merge 2015-11-03 14:59:43 -08:00
redmatrix
2c299a9f37 implement unfollow thread 2015-11-03 14:59:14 -08:00
Mario Vavti
43d8090182 timeago() works best with iso format. fix #118 2015-11-03 11:19:22 +01:00
Mario Vavti
6ec021aafa revert filtering by metwork 2015-11-02 08:36:43 +01:00
redmatrix
14e92f53f1 hubloc filtering to eliminate dead and deleted entries 2015-11-01 16:19:28 -08:00
redmatrix
d3183467e0 Merge https://github.com/redmatrix/hubzilla into pending_merge 2015-11-01 15:52:35 -08:00
redmatrix
b62614bbd4 improve /locs page with some field notes and the ability to do a forced sync 2015-11-01 15:51:45 -08:00
jeroenpraat
618155e6ab More Bluegrid fine tuning and generic-content-wrapper-styled added to some tpl-files and 2 php files, cause they dont have a tpl file. 2015-11-01 22:59:32 +01:00
Mario Vavti
5acfef8edb since other networks do not support cloning we only need hublocs for zot contacts - fix #111 2015-11-01 21:32:28 +01:00
redmatrix
04820ba09e make hubloc repair script a bit more selective 2015-10-31 13:58:26 -07:00
redmatrix
5f80121637 add hubloc repair script (needed for deadsuperhero, probably temporary) 2015-10-30 22:43:38 -07:00
Mario Vavti
c5aedb14a9 fix #83 2015-10-29 19:46:21 +01:00
redmatrix
bb469deb85 add entry for 'none' 2015-10-29 01:35:49 -07:00