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

4477 Commits

Author SHA1 Message Date
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
Mario Vavti
0bec45e570 do not show status editor in /display - we most probably want to read the thread or comment. 2015-07-09 21:03:10 +02:00
Mario Vavti
efa55437d4 increase width of the aside area and make default profile image size 300x300 2015-07-09 13:59:16 +02:00
redmatrix
43354ab385 inconsistent naming of block item types 2015-07-08 18:05:38 -07:00
redmatrix
6b41074396 Merge branch 'master' of https://github.com/redmatrix/redmatrix 2015-07-07 16:50:25 -07:00
Mario Vavti
f6cf992aee fix sorting of channel suggestions 2015-07-07 22:48:01 +02:00
Mario Vavti
f67d9d59af rename function get_directory_settings => get_directory_setting and move sort options to directory title bar 2015-07-07 22:29:27 +02:00
redmatrix
75469a61bf Merge pull request #4 from git-marijus/master 
abook_pending should probably be 1 in this place
 2015-07-08 06:19:48 +10:00
Mario Vavti
9c577e0422 make public forums only setting sticky and simplify function to get directory settings 2015-07-07 21:41:37 +02:00
redmatrix
7cfaae8d4f ok that's wretchedly inefficient but provides a basic relevance search for strings in doc files. 2015-07-06 20:21:41 -07:00
Mario Vavti
53f4b260cf abook_pending should probably be 1 in this place 2015-07-06 22:48:12 +02:00
redmatrix
4abb114474 very crude but working doc search 2015-07-05 21:09:04 -07:00
redmatrix
f20933e1e0 more work on db storage of doco 2015-07-05 19:52:41 -07:00
redmatrix
df8f6e45e2 mod/help: read doc files from the database if present and newer than the copy in the filesystem. 2015-07-04 14:46:40 -07:00
redmatrix
90a31f4ad5 Merge branch 'master' of https://github.com/redmatrix/redmatrix 
Conflicts:
	include/zot.php
 2015-07-02 22:00:15 -07:00
redmatrix
065a50c920 a few clone sync fixes as well as some work on hubzilla clone sync back to redmatrix 2015-07-02 21:55:36 -07:00
redmatrix
9369e521bb a bit of cleanup and explanatory text on mod/pconfig 2015-07-02 20:57:06 -07:00
redmatrix
f6fae2ebd9 web version of util/pconfig 2015-07-02 19:54:22 -07:00
redmatrix
75560b0496 turn attached audio/video into audio/video elements as well as providing an attachment link 2015-07-01 16:23:25 -07:00
redmatrix
d5c085a3c6 cleanup of import to allow cross-product import going one way. Note - items/content are not yet importable 2015-06-30 20:21:09 -07:00
redmatrix
1e3dffc29d Merge branch 'master' of https://github.com/redmatrix/redmatrix 2015-06-30 20:19:50 -07:00
redmatrix
86b12ea750 lots of work on clone/import from redmatrix to hubzilla (won't go back the other way) 2015-06-30 20:18:48 -07:00
redmatrix
22cb09f537 warn if export data file is from an incompatible project or if the DB version differs significantly from the current DB. This is to avoid people cloning a hubzilla channel back to red and potentially stuffing up the works. Hopefully we can migrate upwards someday. Downwards is always going to be an issue. 2015-06-29 22:37:18 -07:00
redmatrix
97e8275dc2 Merge branch 'master' of https://github.com/redmatrix/redmatrix 2015-06-29 22:19:44 -07:00
redmatrix
0b347ccc14 turn the connection filter into a feature. 2015-06-29 20:35:56 -07:00
redmatrix
6e8ad5089e Merge branch 'master' of https://github.com/redmatrix/redmatrix 
Conflicts:
	view/nl/messages.po
	view/nl/strings.php
 2015-06-29 18:01:51 -07:00
Mario Vavti
7ef4397634 fix directory location 2015-06-29 14:25:04 +02:00
redmatrix
63f2e9b412 Merge branch 'master' of https://github.com/redmatrix/redmatrix 
Conflicts:
	include/zot.php
	mod/connedit.php
	util/messages.po
 2015-06-28 22:33:13 -07:00
redmatrix
090dae46e5 Merge https://github.com/redmatrix/redmatrix into pending_merge 2015-06-28 21:19:28 -07:00
redmatrix
de13497333 no this isn't it. well ok, it's part of it, but not the important part. it's still pretty cool. 2015-06-28 21:16:56 -07:00
Alexandre Hannud Abdo
7fafcbb6ef simply 'post' is a better default term than 'status' 2015-06-27 18:10:18 -03:00
redmatrix
a3d7e8456a undo the disabling of browser_prefetch and for the time being revert the HTML cache until we can isolate all the zid and observer calls. Also get rid of youtube and vimeo bbcode tags which we should not be using any more. 2015-06-25 20:07:10 -07:00
redmatrix
70975dda4a remove all QR-code stuff from core - now in qrator addon 2015-06-25 19:05:49 -07:00
redmatrix
5f3edabd45 Merge branch 'master' of https://github.com/redmatrix/redmatrix 
Conflicts:
	doc/de/features.bb
	view/de/messages.po
	view/de/strings.php
 2015-06-24 16:34:52 -07:00
Mario Vavti
f707f4d49a Merge branch 'master' of https://github.com/redmatrix/redmatrix 2015-06-24 12:33:53 +02:00