Commit graph

4220 commits

Author SHA1 Message Date
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
b6f28900e6 show status editor in /display on share action. 2015-07-10 21:48:24 +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
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
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
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
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
0b347ccc14 turn the connection filter into a feature. 2015-06-29 20:35:56 -07:00
Mario Vavti
7ef4397634 fix directory location 2015-06-29 14:25:04 +02: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
Mario Vavti
f707f4d49a Merge branch 'master' of https://github.com/redmatrix/redmatrix 2015-06-24 12:33:53 +02:00
Mario Vavti
201ba411ba Reflect in directory title if we watch the local or the global directory 2015-06-24 12:33:37 +02:00
redmatrix
7975bc828f typo 2015-06-23 16:22:21 -07:00
Mario Vavti
30ba2803e7 Merge branch 'master' of https://github.com/redmatrix/redmatrix 2015-06-23 13:06:40 +02:00
Mario Vavti
b6c4601d8f some work on directory 2015-06-23 13:06:22 +02:00
redmatrix
45d66657d7 Merge pull request #356 from solstag/signature_edit_fix
properly trims edited posts before signing so signature verification …
2015-06-23 14:47:59 +10:00
Alexandre Hannud Abdo
a189fc0872 properly trims edited posts before signing so signature verification works 2015-06-23 01:08:02 -03:00
redmatrix
d46f5467b3 Merge https://github.com/redmatrix/redmatrix into pending_merge 2015-06-22 16:09:36 -07:00
redmatrix
9879cf3c6c ensure we always sign a trimmed item body. 2015-06-22 16:09:02 -07:00
Mario Vavti
a4775aab9b Bring /help in line with the rest of the app 2015-06-22 14:02:14 +02:00
redmatrix
0ad71b3efa import: Improve the descriptive text for this feature 2015-06-21 19:11:07 -07:00
redmatrix
68534fd5dc some diaspora import issues uncovered during dry-run tests 2015-06-21 17:30:23 -07:00
redmatrix
a6b9d1595e automatically gunzip Diaspora export files if we're on a *nix system 2015-06-19 17:18:01 -07:00
redmatrix
6bd90816dd very early attempt diaspora import from diaspora export file. Currently the json export has to be gunzipped prior to uploading and we're net yet adding connections (which should come soon) and we can't import items until they add guids to the export file - so consider it a work in progress. This first attempt should create a channel and get your profile details setup providing there isn't a nickname conflict on the server. That will also be handled later. 2015-06-19 16:39:03 -07:00
redmatrix
25e134dd9c set return url from apps page 2015-06-18 17:53:26 -07:00
redmatrix
ec54111e6b Merge pull request #349 from git-marijus/master
make photo upload work for remote channels with perms
2015-06-17 11:14:18 +10:00
jeroenpraat
24befa2197 Small fix in siteinfo 2015-06-16 13:24:10 +02:00
Mario Vavti
93f48cd8bb make photo upload work for remote channels with perms 2015-06-16 12:18:50 +02:00
Mario Vavti
905cd1da5b do not allow/show acl button on photo edit if not owner 2015-06-15 13:04:16 +02:00
redmatrix
04551ac32b Merge https://github.com/redmatrix/redmatrix into pending_merge 2015-06-10 17:45:04 -07:00
redmatrix
9a5d9fb8c5 put block_public back where it is needed, which is in mod_public and not mod_home 2015-06-10 17:44:04 -07:00
Alexandre Hannud Abdo
a31fdd3fbb correctly fix attachment permissions from private mentions
by postponing code that removes the attachment tag from the body
2015-06-10 15:37:10 -03:00
Mario Vavti
edd2d1e8d4 show login without checking for block_public, local or remote channel 2015-06-10 13:24:16 +02:00
Mario Vavti
20a317b5b7 really show login form if it is enabled 2015-06-10 11:58:45 +02:00
redmatrix
9592f7f3e6 put mirror_frontpage setting into admin/site 2015-06-09 19:37:12 -07:00
redmatrix
d08c43d80c toggle diaspora protocol on a per-channel level in addition to the existing per site setting. Default is enabled if the site setting is enabled. 2015-06-09 18:50:11 -07:00
redmatrix
faa7f97c25 s/broder/border/ 2015-06-09 16:52:53 -07:00
redmatrix
805e2a28ee add nomadic identities as webfinger aliases 2015-06-09 16:29:51 -07:00
redmatrix
54b61f817d provide a mechanism for loading the frontpage without redirecting. 2015-06-08 21:19:05 -07:00