 redmatrix
|
5c526995d8
|
resolve conflicts
|
2015-09-28 19:07:31 -07:00 |
|
|
redmatrix
|
50ee82e8bd
|
Merge https://github.com/redmatrix/redmatrix into pending_merge
|
2015-09-28 19:06:10 -07:00 |
|
|
redmatrix
|
3a8e1e0484
|
process_delivery: ignore self
|
2015-09-28 19:04:36 -07:00 |
|
|
redmatrix
|
edbcba6f11
|
schema support for additional site types
|
2015-09-28 04:15:21 -07:00 |
|
|
redmatrix
|
e04f04ef0f
|
Merge https://github.com/redmatrix/redmatrix into pending_merge
Conflicts:
install/update.php
|
2015-09-23 22:33:48 -07:00 |
|
|
redmatrix
|
0f3c2c4b24
|
add vdata field for caldav
|
2015-09-23 22:32:46 -07:00 |
|
|
redmatrix
|
8a94a4938f
|
dummy update
|
2015-09-23 22:31:49 -07:00 |
|
|
redmatrix
|
15b241cc3e
|
remove dummy update from merge
|
2015-09-22 02:34:34 -07:00 |
|
|
redmatrix
|
2b07a69b93
|
Merge https://github.com/redmatrix/redmatrix into pending_merge
|
2015-09-22 02:34:05 -07:00 |
|
|
redmatrix
|
5068ce0569
|
dummy update
|
2015-09-22 02:33:24 -07:00 |
|
|
redmatrix
|
0b1b11ea53
|
heavy lifting for delivery reports
|
2015-09-22 02:32:04 -07:00 |
|
|
redmatrix
|
40bb1699a5
|
DB table for delivery reports
|
2015-09-18 22:55:47 -07:00 |
|
|
redmatrix
|
74827133b2
|
Merge https://github.com/redmatrix/redmatrix into pending_merge
Conflicts:
util/messages.po
|
2015-09-18 22:46:21 -07:00 |
|
|
redmatrix
|
3dc066a143
|
dummy update
|
2015-09-18 22:43:35 -07:00 |
|
|
redmatrix
|
46e9c4299e
|
Merge https://github.com/redmatrix/redmatrix into pending_merge
|
2015-09-03 15:48:52 -07:00 |
|
|
redmatrix
|
e1af81ea55
|
in this case no results is not an error
|
2015-09-03 15:48:01 -07:00 |
|
|
redmatrix
|
99848ab3bb
|
Merge https://github.com/redmatrix/redmatrix into pending_merge
|
2015-09-03 13:11:25 -07:00 |
|
 zottel
|
5cef672f9a
|
fix update 1148
|
2015-09-03 13:55:47 +02:00 |
|
|
redmatrix
|
669e111118
|
add timestamps for syncing apps
|
2015-09-02 21:07:24 -07:00 |
|
|
redmatrix
|
360fda15e9
|
Merge https://github.com/redmatrix/redmatrix into pending_merge
|
2015-09-02 20:54:00 -07:00 |
|
|
redmatrix
|
2018b88093
|
dummy update
|
2015-09-02 20:53:26 -07:00 |
|
|
redmatrix
|
3852b5ce7f
|
separate objs/things from taxonomy
|
2015-09-01 17:06:58 -07:00 |
|
|
redmatrix
|
d753ae4cf1
|
dummy update placeholder
|
2015-09-01 16:25:10 -07:00 |
|
|
redmatrix
|
d7089ab471
|
Merge https://github.com/redmatrix/redmatrix into pending_merge
Conflicts:
include/identity.php
install/update.php
util/messages.po
view/nl/messages.po
|
2015-08-31 21:00:28 -07:00 |
|
|
redmatrix
|
d7cf7316be
|
change the likes db structure to make it more easily importable/exportable
|
2015-08-31 20:55:25 -07:00 |
|
|
redmatrix
|
de3012ccf1
|
documentation re-org
|
2015-08-31 17:08:09 -07:00 |
|
|
redmatrix
|
b1f091e4d7
|
issues with abook sync between hubzilla and red
|
2015-08-23 17:40:47 -07:00 |
|
|
redmatrix
|
43fbbfe0df
|
Merge https://github.com/redmatrix/redmatrix into pending_merge
|
2015-08-20 22:14:51 -07:00 |
|
|
redmatrix
|
fef93af0a6
|
missed this one - it's required
|
2015-08-20 22:13:25 -07:00 |
|
|
redmatrix
|
3b1554db2e
|
Merge https://github.com/redmatrix/redmatrix into pending_merge
|
2015-08-18 17:15:53 -07:00 |
|
|
redmatrix
|
37d07a7d2a
|
add event_sequence for vtodo's
|
2015-08-18 17:10:40 -07:00 |
|
|
redmatrix
|
6a1d1867f0
|
Merge https://github.com/redmatrix/redmatrix into pending_merge
|
2015-08-16 19:13:29 -07:00 |
|
|
redmatrix
|
b3b566c907
|
add DB support for tasks, todo items and repeating events
|
2015-08-16 17:17:34 -07:00 |
|
|
redmatrix
|
ec41899328
|
update some of the old attach.flag values to the new schema
|
2015-07-30 17:16:23 -07:00 |
|
|
redmatrix
|
26411ab385
|
Merge branch 'master' of https://github.com/redmatrix/redmatrix
|
2015-07-30 17:12:23 -07:00 |
|
|
redmatrix
|
4c6368d075
|
dummy update
|
2015-07-30 17:07:03 -07:00 |
|
|
redmatrix
|
4abb114474
|
very crude but working doc search
|
2015-07-05 21:09:04 -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
|
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
|
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
|
859a2ac8ef
|
DB changes for some channel flags
|
2015-06-15 17:28:52 -07:00 |
|
|
redmatrix
|
41085ae03f
|
start on the DAV/photos merger
|
2015-06-11 22:32:08 -07:00 |
|
|
redmatrix
|
ca870dbf31
|
more work on item table optimisation
|
2015-06-10 16:59:04 -07:00 |
|
|
redmatrix
|
03357481f7
|
Merge branch 'master' of https://github.com/redmatrix/redmatrix
Conflicts:
install/schema_mysql.sql
mod/home.php
mod/page.php
view/nl/messages.po
view/nl/strings.php
|
2015-06-09 16:52:00 -07:00 |
|
|
redmatrix
|
39f0e6fe62
|
add site_dead flag to prevent delivery to dead sites. Allow sys channel webpages to be viewed even if site is configured "block public".
|
2015-06-08 16:55:17 -07:00 |
|
|
redmatrix
|
8fe3daab21
|
Merge branch 'master' of https://github.com/redmatrix/redmatrix
Conflicts:
install/schema_mysql.sql
mod/impel.php
view/pt-br/messages.po
view/pt-br/strings.php
|
2015-05-28 19:06:31 -07:00 |
|
|
redmatrix
|
0f09a4499b
|
add menu_created, menu_edited fields to DB
|
2015-05-28 16:59:56 -07:00 |
|
|
redmatrix
|
e68a00d381
|
more db structure
|
2015-05-19 22:43:24 -07:00 |
|
|
redmatrix
|
c78869e437
|
Merge branch 'master' of https://github.com/redmatrix/redmatrix
Conflicts:
view/nl/messages.po
view/nl/strings.php
|
2015-05-19 17:36:11 -07:00 |
|