redmatrix
|
49239c936a
|
Merge https://github.com/redmatrix/redmatrix into pending_merge
|
2015-07-05 21:37:30 -07:00 |
|
redmatrix
|
f7c562fd21
|
version update
|
2015-07-05 21:37:04 -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 |
|
Mario Vavti
|
2011784faf
|
schema focus: adjust default width
|
2015-07-05 22:37:52 +02: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
|
a74631b554
|
Merge branch 'master' of https://github.com/redmatrix/redmatrix
Conflicts:
boot.php
include/items.php
util/messages.po
|
2015-07-03 15:03:56 -07:00 |
|
redmatrix
|
aa58f68bfd
|
Merge branch 'master' of https://github.com/redmatrix/redmatrix
Conflicts:
view/it/messages.po
view/it/strings.php
|
2015-07-03 14:59:04 -07:00 |
|
redmatrix
|
37c78bcf05
|
start doco cleanup
|
2015-07-03 14:56:48 -07:00 |
|
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
|
90a31f4ad5
|
Merge branch 'master' of https://github.com/redmatrix/redmatrix
Conflicts:
include/zot.php
|
2015-07-02 22:00:15 -07:00 |
|
redmatrix
|
1a5898bf80
|
sync abook entries from redmatrix
Merge branch 'master' of https://github.com/redmatrix/redmatrix
Conflicts:
include/items.php
|
2015-07-02 21:58:28 -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
|
54301a9ff5
|
Merge https://github.com/redmatrix/redmatrix into pending_merge
|
2015-07-01 18:51:47 -07:00 |
|
redmatrix
|
8b2b92fe32
|
provide compatibility with redmatrix extended item export
|
2015-07-01 18:50:37 -07:00 |
|
redmatrix
|
3f38e52caf
|
provide backward compatibility with hubzilla extended item export
|
2015-07-01 18:49:34 -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 |
|
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 |
|
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 |
|
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
|
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
|
a7135b5ecd
|
fix the postgres schema with all the changes to date
|
2015-06-29 19:58:44 -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 |
|
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
|
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 |
|
redmatrix
|
8d84472b4c
|
bring single instance file storage to dav and cloud uploaded photos
|
2015-06-27 16:36:30 -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 |
|