harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
14,087 Commits 6 Branches 36 Tags
d5a40cac25e1bcc936a4010ec0038f8e5143c0a0
Commit Graph

4361 Commits

Author SHA1 Message Date
redmatrix
d5a40cac25 Merge branch 'master' of https://github.com/redmatrix/redmatrix 
several dav fixes
Conflicts:
	include/items.php
 2015-07-30 17:11:16 -07:00
redmatrix
3269d4632f Merge branch 'master' of https://github.com/redmatrix/redmatrix 
Conflicts:
	util/messages.po
 2015-07-27 18:01:20 -07:00
redmatrix
85f546e691 crude but more or less functional event import from thunderbird ics files 2015-07-26 22:44:49 -07:00
redmatrix
70a5a7b717 Merge branch 'master' of https://github.com/redmatrix/hubzilla 2015-07-26 16:51:01 -07:00
redmatrix
3880b485cb Merge branch 'master' of https://github.com/redmatrix/redmatrix 
Conflicts:
	mod/connedit.php
	view/pt-br/messages.po
	view/pt-br/strings.php
 2015-07-26 16:50:33 -07:00
Mario Vavti
54336ba43b comment out some popover infos - we provide enough visual feedback now 2015-07-26 21:24:33 +02:00
Mario Vavti
f6142d18c4 Provide connection status if status is "a-normal" 2015-07-26 20:54:09 +02:00
Mario Vavti
6e557aa153 fix abook_pending reset to 1 loop if $new_friend is false and remove unused var 2015-07-25 17:41:19 +02:00
redmatrix
cc5b0cde1d Merge branch 'master' of https://github.com/redmatrix/redmatrix 
Conflicts:
	include/diaspora.php
 2015-07-23 21:07:35 -07:00
redmatrix
908da4589d event privacy issue 2015-07-23 21:02:41 -07:00
redmatrix
c90f14c066 Merge branch 'master' of https://github.com/redmatrix/redmatrix 
Conflicts:
	doc/to_do_code.bb
 2015-07-21 17:13:48 -07:00
redmatrix
db9a0282c4 provide content-disposition for exported ics file 2015-07-20 21:28:33 -07:00
redmatrix
ec00c5b18a the view_photos and post_photos permissions are redundant and are now mapped to view_storage and write_storage 2015-07-19 17:53:52 -07:00
redmatrix
22c1737fc9 Merge branch 'master' of https://github.com/redmatrix/hubzilla 2015-07-18 16:11:54 -07:00
Mario Vavti
09f6337930 make likes/dislikes work again 2015-07-17 22:45:35 +02:00
redmatrix
3c60a0c22c provide any single year of exported items 2015-07-16 20:20:42 -07:00
redmatrix
ec249d465b provide a way to export a single year of items (to potentially keep from exhausting resources either on export or import) 2015-07-16 20:19:20 -07:00
redmatrix
b9fd8b4614 Merge branch 'master' of https://github.com/redmatrix/redmatrix 
Conflicts:
	include/zot.php
 2015-07-15 18:41:50 -07:00
redmatrix
6046fe9c9e Merge branch 'master' of https://github.com/redmatrix/redmatrix 2015-07-15 17:50:24 -07:00
Mario Vavti
ca1f6f8c5b provide info text for automatic permissions 2015-07-15 14:14:10 +02:00
Mario Vavti
5fcf1256bd whitespace 2015-07-15 14:07:35 +02:00
Mario Vavti
0c77a127f2 show inherited state in Connection Default Permissions 2015-07-15 14:03:34 +02:00
redmatrix
0d1a541e88 Merge branch 'master' of https://github.com/redmatrix/redmatrix 
Conflicts:
	mod/import.php
 2015-07-14 22:40:22 -07:00
redmatrix
9b15dbde1c group fixes to import 2015-07-14 22:38:04 -07:00
redmatrix
5487b22dd7 fix import of group members 2015-07-14 22:19:21 -07:00
redmatrix
89fbfd2bf8 more stuff to resume failed imports 2015-07-14 22:04:07 -07:00
redmatrix
a87e318403 log the import progress 2015-07-14 21:30:13 -07:00
redmatrix
caaf7192ff provide resumable imports if things go wrong 2015-07-14 21:02:54 -07:00
redmatrix
e8f19c1e15 Merge branch 'master' of https://github.com/redmatrix/redmatrix 
Conflicts:
	mod/connedit.php
 2015-07-14 17:10:13 -07:00
redmatrix
3687fef53c Merge https://github.com/redmatrix/redmatrix into pending_merge 2015-07-14 16:55:58 -07:00
redmatrix
a5989b0f31 coverup and ignore the illegal string offset message that some sites have been reporting. This does not fix it. A fix would be to examine the data that has been received and find out why it is mangled and trace this back to where it was mangled. 2015-07-14 16:54:16 -07:00
Mario Vavti
104cbcab72 make strings translateable 2015-07-14 21:32:18 +02:00
Mario Vavti
dd57864867 revert provide inherited perms for connection default permissions 2015-07-14 13:46:22 +02:00
Mario Vavti
d8edb66287 remove dbg 2015-07-14 13:21:39 +02:00
Mario Vavti
711dd1468d provide inherited perms for connection default permissions 2015-07-14 13:16:08 +02:00
Mario Vavti
7f71297383 cleanup connedit 2015-07-14 12:46:40 +02:00
redmatrix
da5cec24e0 Merge branch 'master' of https://github.com/redmatrix/hubzilla 2015-07-13 17:48:54 -07:00
redmatrix
6916c1076c Merge branch 'master' of https://github.com/redmatrix/redmatrix 2015-07-13 17:43:10 -07:00
redmatrix
3ec2dc81f2 allow sys editing of menu 2015-07-11 16:30:06 -07:00
Mario Vavti
04c794da10 whitespace and comment out info again 2015-07-12 01:12:20 +02:00
Mario Vavti
f81874ca49 fix sys channel menu in a morre standard way 2015-07-12 01:04:57 +02:00
Mario Vavti
6ca4240d96 menu_id is still needed 2015-07-12 00:49:03 +02:00
Mario Vavti
d8f03450e7 make menu creation for sys channel work 2015-07-12 00:40:12 +02:00
Mario Vavti
54bb2651f5 merge 2015-07-11 11:58:53 +02:00
redmatrix
a497d8ee66 Merge branch 'master' of https://github.com/redmatrix/redmatrix 
Conflicts:
	mod/editpost.php
	util/messages.po
	view/nl/messages.po
	view/nl/strings.php
 2015-07-10 14:27:41 -07:00
Mario Vavti
b6f28900e6 show status editor in /display on share action. 2015-07-10 21:48:24 +02:00
Mario Vavti
b1f926ba89 merge redmatrix fixes 2015-07-10 20:46:46 +02:00
Mario Vavti
fee607db56 more webpages - generic-content-wrapper fixes 2015-07-10 13:16:45 +02:00
Mario Vavti
1554b5a2ee add generic content wrapper to post/webpage editor and make editpost render correctly 2015-07-10 12:46:20 +02:00
Mario Vavti
c7b55f7753 revert 
do not show status editor in /display - we most probably want to read the thread or comment.
 2015-07-09 22:31:21 +02:00