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 |
|
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 |
|
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
|
1a0655f34e
|
more work on mail flags
|
2015-06-23 21:01:59 -07:00 |
|
redmatrix
|
cb76fb8b9b
|
item flag fixes discovered after a few merges
|
2015-06-23 19:45:39 -07:00 |
|
redmatrix
|
833098e346
|
Merge branch 'master' of https://github.com/redmatrix/redmatrix
Conflicts:
include/items.php
mod/item.php
|
2015-06-23 17:30:35 -07: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
|
ae6612025d
|
Merge branch 'master' of https://github.com/redmatrix/redmatrix
Conflicts:
include/items.php
util/messages.po
|
2015-06-21 20:51:07 -07: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
|
6aa159e2ac
|
Merge branch 'master' of https://github.com/redmatrix/redmatrix
|
2015-06-18 19:15:01 -07:00 |
|
redmatrix
|
25e134dd9c
|
set return url from apps page
|
2015-06-18 17:53:26 -07:00 |
|
redmatrix
|
2963be60e5
|
more photos work
|
2015-06-17 18:26:56 -07:00 |
|
redmatrix
|
6ab20eb1b5
|
lots of work on merging photo and file albums/folders
|
2015-06-17 17:44:31 -07:00 |
|
redmatrix
|
65661b7ec3
|
Merge branch 'master' of https://github.com/redmatrix/redmatrix
Conflicts:
mod/photos.php
mod/siteinfo.php
|
2015-06-16 18:43:03 -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 |
|
redmatrix
|
d84b3cfc3c
|
remove file/attachments when their associated photos are removed
|
2015-06-16 17:50:15 -07:00 |
|
jeroenpraat
|
24befa2197
|
Small fix in siteinfo
|
2015-06-16 13:24:10 +02:00 |
|