redmatrix
|
cbfb94c55c
|
Merge https://github.com/redmatrix/redmatrix into pending_merge
|
2015-07-03 14:32:17 -07:00 |
|
redmatrix
|
0b9332fde9
|
in hubzilla we're going to convert doco to items. define it here so that an accidental import/export doesn't chuck a wobbly.
|
2015-07-03 14:30:42 -07:00 |
|
redmatrix
|
2f12039941
|
Merge pull request #370 from tuscanhobbit/master
Updated Italian localization
|
2015-07-03 20:24:13 +10:00 |
|
Paolo Tacconi
|
7d4615e319
|
Updated Italian localization
|
2015-07-03 12:01:30 +02:00 |
|
zzottel
|
b0a6e2ce26
|
Merge pull request #369 from zzottel/master
update German main help file
|
2015-07-03 11:03:08 +02:00 |
|
zottel
|
8042ae9fe8
|
update German main help file
|
2015-07-03 11:01:26 +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
|
54301a9ff5
|
Merge https://github.com/redmatrix/redmatrix into pending_merge
|
2015-07-01 18:51:47 -07:00 |
|
redmatrix
|
3f38e52caf
|
provide backward compatibility with hubzilla extended item export
|
2015-07-01 18:49:34 -07:00 |
|
git-marijus
|
e068bdc9d7
|
Merge pull request #365 from adsfkajlsfdas/master
Clean up
|
2015-07-01 11:47:17 +02:00 |
|
Mario Vavti
|
f54688a547
|
since we can now use plain upstream justifiedGallery library - switch to minified version
|
2015-07-01 11:42:17 +02:00 |
|
Mario Vavti
|
9c4e9f8759
|
update justifiedGallery to versio 3.6.0
|
2015-07-01 11:34:36 +02:00 |
|
Thomas Willingham
|
aa41842d24
|
Clean up
|
2015-06-30 17:49:09 +01: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 |
|
redmatrix
|
2072ea721f
|
Merge https://github.com/redmatrix/redmatrix into pending_merge
|
2015-06-29 16:56:45 -07:00 |
|
redmatrix
|
0b012e2995
|
some prep work
|
2015-06-29 16:56:18 -07:00 |
|
jeroenpraat
|
aad8fc1946
|
Update NL + 1 revert css, see comment here: 22b9e97ae2
|
2015-06-30 00:26:16 +02:00 |
|
jeroenpraat
|
abb153e711
|
Probably a ugly hack, but it's the only way I could found that cuts off very long channel names in the admin area. If there's a better alternative, be my guest.
|
2015-06-29 23:09:36 +02: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 |
|
redmatrix
|
bad22498bc
|
Merge pull request #363 from solstag/postnotstatus
simply 'post' is a better default term than 'status'
|
2015-06-28 07:46:15 +10:00 |
|
Alexandre Hannud Abdo
|
7fafcbb6ef
|
simply 'post' is a better default term than 'status'
|
2015-06-27 18:10:18 -03:00 |
|
Mario Vavti
|
22b9e97ae2
|
css fixes
|
2015-06-27 22:27:17 +02:00 |
|
redmatrix
|
1ee1b6a334
|
Merge https://github.com/redmatrix/redmatrix into pending_merge
|
2015-06-26 16:38:19 -07:00 |
|
redmatrix
|
002be8f9ce
|
project updates
|
2015-06-26 16:37:55 -07:00 |
|
Mario Vavti
|
9406c5a55c
|
Merge branch 'master' of https://github.com/redmatrix/redmatrix
|
2015-06-25 12:54:42 +02:00 |
|
Mario Vavti
|
e9cc06dc11
|
directory: only provide connect button if we are not already connected
|
2015-06-24 21:12:20 +02:00 |
|
zzottel
|
364a3cb972
|
Merge pull request #360 from zzottel/master
update German strings and help files
|
2015-06-24 16:57:25 +02:00 |
|
zottel
|
38302051f2
|
update German help files
|
2015-06-24 16:54:17 +02:00 |
|
zottel
|
50de9325b6
|
update to German strings
|
2015-06-24 16:53:46 +02:00 |
|
Mario Vavti
|
05c7022ff8
|
Add a new redbasic scheme called focus - It is supposed to focus on the main content by adding a slight shadow and centering the main content on the screen. Also the default width of the content is set to 640px.
|
2015-06-24 13:05:33 +02: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 |
|
redmatrix
|
0d8fcbe48d
|
discovered a couple of loose ends in the per-member enable diaspora setting
|
2015-06-22 15:03:47 -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
|
f59edbb48f
|
Merge https://github.com/redmatrix/redmatrix into pending_merge
|
2015-06-21 17:31:09 -07:00 |
|
redmatrix
|
68534fd5dc
|
some diaspora import issues uncovered during dry-run tests
|
2015-06-21 17:30:23 -07:00 |
|
redmatrix
|
1c9a222697
|
Merge pull request #355 from dawnbreak/master
Compatible update for .htaccess v2.
|
2015-06-22 09:16:33 +10:00 |
|