 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 |
|
 Klaus Weidenbach
|
c3fa0a3ca7
|
Compatible update for .htaccess.
This should hopefully work in Apache 2.2 and 2.4.
|
2015-06-22 00:45:29 +02:00 |
|
|
Klaus
|
b197c7420a
|
Merge pull request #354 from redmatrix/revert-353-master
Revert "Compatible update for .htaccess."
|
2015-06-22 00:35:31 +02:00 |
|
|
Klaus
|
26ff848639
|
Revert "Compatible update for .htaccess."
|
2015-06-22 00:33:53 +02:00 |
|
|
redmatrix
|
9f9dee28ca
|
Merge pull request #353 from dawnbreak/master
Compatible update for .htaccess.
|
2015-06-22 08:09:00 +10:00 |
|
|
Klaus Weidenbach
|
5a96f3331a
|
Compatible update for .htaccess.
This should hopefully work in Apache 2.2 and 2.4.
|
2015-06-21 23:58:19 +02:00 |
|
|
Mario Vavti
|
c1e0987b88
|
do not show default in scheme selection dropdown. default.php and default.css should be symlinks. adjust doco accordingly.
|
2015-06-21 17:53:44 +02:00 |
|
|
redmatrix
|
e1caf77480
|
Merge pull request #352 from solstag/store_update_fix
Make item_store_update only affect the data we requested
|
2015-06-21 10:07:58 +10:00 |
|
|
redmatrix
|
9dfb8a3401
|
ensure the photo driver is included
|
2015-06-20 16:24:10 -07:00 |
|
|
redmatrix
|
dd950baa82
|
import_diaspora - incorrect method for importing channel photo, and add duplicate reddress detection/correction
|
2015-06-20 16:21:25 -07:00 |
|
|
Alexandre Hannud Abdo
|
ec23a94b6d
|
Make item_store_update only affect the data we requested
|
2015-06-20 02:21:25 -03:00 |
|
|
redmatrix
|
ddbaabd62d
|
wrong logic
|
2015-06-19 18:08:10 -07:00 |
|
|
redmatrix
|
94e7a425e6
|
import_diaspora - a few more atypical settings
|
2015-06-19 18:06:55 -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
|
e85d2c4b90
|
import_diaspora: add all the friends
|
2015-06-19 17:07:31 -07:00 |
|
|
redmatrix
|
0a9d3b4025
|
Merge https://github.com/redmatrix/redmatrix into pending_merge
|
2015-06-19 16:44:16 -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 |
|
|
Mario Vavti
|
8b563951ff
|
more generic-content-wrapper and some css fixes
|
2015-06-19 15:49:06 +02:00 |
|
|
Mario Vavti
|
1432b1e83f
|
cloud.tpl
|
2015-06-19 12:45:18 +02:00 |
|
|
Mario Vavti
|
de84f48e2f
|
bring some more generic-content-wrappers and fix some of them
|
2015-06-19 12:44:11 +02:00 |
|
|
redmatrix
|
25e134dd9c
|
set return url from apps page
|
2015-06-18 17:53:26 -07:00 |
|
|
redmatrix
|
7e59580812
|
Merge https://github.com/redmatrix/redmatrix into pending_merge
|
2015-06-18 16:36:47 -07:00 |
|
|
redmatrix
|
1a9c059062
|
issues with markdownify and escaped HTML
|
2015-06-18 16:35:40 -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 |
|