redmatrix
|
d2565d0f61
|
looks like chat has been neglected a bit recently
|
2015-09-20 21:37:18 -07:00 |
|
redmatrix
|
4fde0bf62e
|
Merge https://github.com/redmatrix/redmatrix into pending_merge
Conflicts:
include/zot.php
|
2015-09-20 20:58:55 -07:00 |
|
redmatrix
|
a679081993
|
new delivery report format
|
2015-09-20 20:21:54 -07:00 |
|
redmatrix
|
177292de13
|
Merge https://github.com/redmatrix/redmatrix into pending_merge
Conflicts:
include/zot.php
|
2015-09-20 18:10:25 -07:00 |
|
redmatrix
|
efcb4abfd0
|
improve on the last attempt
|
2015-09-20 18:08:06 -07:00 |
|
redmatrix
|
1501d1c570
|
Merge https://github.com/redmatrix/redmatrix into pending_merge
Conflicts:
include/zot.php
|
2015-09-20 18:03:41 -07:00 |
|
redmatrix
|
59a56ac77f
|
catch the timestamp also
|
2015-09-20 17:47:41 -07:00 |
|
redmatrix
|
35f09f4f74
|
remove system flags from channel import packet
|
2015-09-20 17:45:23 -07:00 |
|
redmatrix
|
421dfce599
|
Merge https://github.com/redmatrix/hubzilla into pending_merge
|
2015-09-20 16:55:53 -07:00 |
|
redmatrix
|
b240c15014
|
Merge https://github.com/redmatrix/redmatrix into pending_merge
Conflicts:
include/zot.php
|
2015-09-20 16:55:24 -07:00 |
|
redmatrix
|
9de8df496a
|
we need the xchan record also
|
2015-09-20 16:52:21 -07:00 |
|
Haakon Meland Eriksen
|
4f65066572
|
Removed hot_deploy
|
2015-09-20 23:06:25 +02:00 |
|
Mario Vavti
|
c38687725d
|
kick right aside out a little earlier
|
2015-09-20 22:12:00 +02:00 |
|
Haakon Meland Eriksen
|
099f236f45
|
Merge remote-tracking branch 'upstream/master'
|
2015-09-20 21:29:41 +02:00 |
|
redmatrix
|
996cd7e2ab
|
Merge https://github.com/redmatrix/redmatrix into pending_merge
|
2015-09-20 00:28:22 -07:00 |
|
redmatrix
|
77df590f65
|
initial checkin delivery report class
|
2015-09-20 00:27:25 -07:00 |
|
redmatrix
|
ce064188c6
|
Merge https://github.com/redmatrix/redmatrix into pending_merge
Conflicts:
include/zot.php
|
2015-09-19 22:48:22 -07:00 |
|
redmatrix
|
5d6f59a598
|
clone new connections
|
2015-09-19 22:46:59 -07:00 |
|
redmatrix
|
f4a4cf1402
|
clone new connection requests
|
2015-09-19 15:36:07 -07:00 |
|
zottel
|
032ef0ca34
|
Merge remote-tracking branch 'upstream/master'
|
2015-09-19 20:11:59 +02:00 |
|
Haakon Meland Eriksen
|
5a7e8d8520
|
Merge remote-tracking branch 'upstream/master'
|
2015-09-19 11:35:31 +02:00 |
|
redmatrix
|
63146821d7
|
Merge https://github.com/redmatrix/redmatrix into pending_merge
|
2015-09-18 23:02:49 -07:00 |
|
redmatrix
|
9ed8eac8c6
|
include site identitfier on redmatrix delivery reports also
|
2015-09-18 23:02:03 -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
|
7c8706757d
|
Merge https://github.com/redmatrix/redmatrix into pending_merge
|
2015-09-18 22:44:23 -07:00 |
|
redmatrix
|
3dc066a143
|
dummy update
|
2015-09-18 22:43:35 -07:00 |
|
redmatrix
|
43251ed8ce
|
add reporting site to delivery report
|
2015-09-18 22:00:33 -07:00 |
|
redmatrix
|
1a16822987
|
Merge https://github.com/redmatrix/hubzilla into pending_merge
|
2015-09-18 14:32:23 -07:00 |
|
redmatrix
|
fdd4c1b9d1
|
more work on surviving hub re-installs
|
2015-09-18 14:31:29 -07:00 |
|
Haakon Meland Eriksen
|
1bd1050160
|
Added hot_deploy directly to .openshift/makers/hot_deploy
|
2015-09-18 18:58:43 +02:00 |
|
Haakon Meland Eriksen
|
525a0478b0
|
Added hot_deploy to deploy script - fixed echo
|
2015-09-18 18:55:56 +02:00 |
|
Haakon Meland Eriksen
|
ce28760c2a
|
Merge remote-tracking branch 'upstream/master'
|
2015-09-18 18:51:39 +02:00 |
|
Haakon Meland Eriksen
|
438cb1d7e0
|
Added hot_deploy to deploy script
|
2015-09-18 18:51:03 +02:00 |
|
Mario Vavti
|
87c8cf4892
|
css fixes
|
2015-09-18 13:07:04 +02:00 |
|
redmatrix
|
f2fefb91d5
|
change photo permissions when attach permissions are changed through mod/filestorage, and fix lockview for photos.
|
2015-09-18 01:53:04 -07:00 |
|
zottel
|
4d05d477f8
|
Merge remote-tracking branch 'upstream/master'
|
2015-09-18 09:38:55 +02:00 |
|
redmatrix
|
cc95c3e9c8
|
start hooking in the new webfinger/zot merged discovery
|
2015-09-17 18:36:19 -07:00 |
|
redmatrix
|
f0a7a6a1e2
|
consolidate zotfinger and webfinger
|
2015-09-17 17:51:31 -07:00 |
|
jeroenpraat
|
4090843fef
|
Converse width for a few related (old) schemas back to 1024px / Name default theme to Focus / Non expert custom display settings above expert display settings, so people can better find them.
|
2015-09-17 22:39:48 +02:00 |
|
Mario Vavti
|
c6c18261a0
|
missing refernce to array
|
2015-09-17 19:33:44 +02:00 |
|
Mario Vavti
|
d9e83eb53a
|
Merge branch 'master' of https://github.com/redmatrix/hubzilla
|
2015-09-17 19:25:36 +02:00 |
|
Mario Vavti
|
1cf404177d
|
quickfix for private messages - needs a lot more work
|
2015-09-17 19:25:13 +02:00 |
|
git-marijus
|
ed9ffec5ba
|
Merge pull request #46 from anaqreon/master
Corrected some missing space typos in docs
|
2015-09-17 17:38:20 +02:00 |
|
jeroenpraat
|
582607c0f0
|
Another (hopefully final) Spanish update
|
2015-09-17 16:28:31 +02:00 |
|
Mario Vavti
|
6cd5826d21
|
Revert "moved submit button to the bottom in settings.tpl"
This reverts commit 1500691cc2 .
|
2015-09-17 15:05:40 +02:00 |
|
Mario Vavti
|
b7e953f50e
|
fix calculation of content height with margins
|
2015-09-17 14:14:01 +02:00 |
|
Andrew Manning
|
9f630b6653
|
Corrected some missing space typos in docs
|
2015-09-17 06:44:12 -04:00 |
|
zottel
|
3017dbc8c1
|
Merge remote-tracking branch 'upstream/master'
|
2015-09-17 08:50:28 +02:00 |
|
redmatrix
|
5d33b34be7
|
Merge https://github.com/redmatrix/redmatrix into pending_merge
|
2015-09-16 21:57:57 -07:00 |
|