 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 |
|
 mrjive
|
024af91df8
|
Merge pull request #1 from redmatrix/master
updating from original codebase
|
2015-09-17 09:27:13 +02: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 |
|
|
redmatrix
|
f2104b0a5a
|
Merge https://github.com/redmatrix/redmatrix into pending_merge
|
2015-09-16 21:57:21 -07:00 |
|
|
redmatrix
|
84b004399e
|
push revision
|
2015-09-16 21:56:55 -07:00 |
|
|
redmatrix
|
e8a01f0916
|
Merge https://github.com/redmatrix/redmatrix into pending_merge
|
2015-09-16 21:56:34 -07:00 |
|
|
redmatrix
|
4f1d579ba1
|
Merge https://github.com/redmatrix/hubzilla into pending_merge
|
2015-09-16 21:56:26 -07:00 |
|
|
redmatrix
|
c34d8286a3
|
change matrix to grid, begin webfinger optimisation
|
2015-09-16 21:27:58 -07:00 |
|
|
redmatrix
|
4eb389f2d9
|
Merge pull request #45 from anaqreon/master
Started correcting vestiges of the RedMatrix and matrix, replacing wi…
|
2015-09-17 11:49:55 +10:00 |
|
|
Andrew Manning
|
999ac60a87
|
Started correcting vestiges of the RedMatrix and matrix, replacing with Hubzilla and grid
|
2015-09-16 21:44:24 -04:00 |
|
|
redmatrix
|
30af694e30
|
Merge pull request #44 from mrjive/move_submit_button
moved submit button to the bottom in settings.tpl
|
2015-09-17 10:19:43 +10:00 |
|
|
redmatrix
|
fa76da1dab
|
Merge pull request #43 from mrjive/toggleselect
added toggle_select
|
2015-09-17 10:19:27 +10:00 |
|
|
mrjive
|
1500691cc2
|
moved submit button to the bottom in settings.tpl
|
2015-09-16 04:46:47 -07:00 |
|
|
mrjive
|
fae5ea749a
|
added toggle_select
|
2015-09-16 02:25:44 -07:00 |
|
|
zottel
|
c2dac55edb
|
Merge remote-tracking branch 'upstream/master'
|
2015-09-16 09:56:11 +02:00 |
|
|
redmatrix
|
4c5a74284b
|
serve as application/xrd+xml
|
2015-09-15 21:47:01 -07:00 |
|
|
redmatrix
|
d0a3cfe765
|
italian string correction
|
2015-09-15 19:59:06 -07:00 |
|
|
jeroenpraat
|
580f1f1213
|
Less margin
|
2015-09-15 22:00:12 +02:00 |
|
|
jeroenpraat
|
b87d164f2f
|
Cleaned some wrong metadata from PNG files.
|
2015-09-15 21:50:49 +02:00 |
|
|
jeroenpraat
|
f3c8f342ff
|
Made the favicons a bit sharper (direct from SVG) and cleaned some wrong metadata from PNG files.
|
2015-09-15 21:49:26 +02:00 |
|
|
redmatrix
|
63a1d8d0db
|
make sure we've got a doc type
|
2015-09-15 01:39:38 -07:00 |
|
|
redmatrix
|
93f5cc1e60
|
I'm not going to tell you what's wrong because I'll be accused of bashing another project. I'll let you read the logs and figure it out for yourself. Follow the trail of evidence and you'll discover the truth.
|
2015-09-15 01:24:55 -07:00 |
|
|
redmatrix
|
68a503049b
|
persona
|
2015-09-14 22:24:58 -07:00 |
|
|
redmatrix
|
fae43010c5
|
nit
|
2015-09-14 21:35:41 -07:00 |
|
|
redmatrix
|
30351f5ade
|
Merge https://github.com/redmatrix/redmatrix into pending_merge
|
2015-09-14 21:35:30 -07:00 |
|
|
redmatrix
|
325a5b4af4
|
we need an owner for permissions_sql
|
2015-09-14 21:25:10 -07:00 |
|
|
redmatrix
|
021c81cb62
|
don't deliver to dead hubs
|
2015-09-14 20:43:39 -07:00 |
|
|
redmatrix
|
7099e09a5c
|
Merge https://github.com/redmatrix/hubzilla into pending_merge
|
2015-09-14 19:17:36 -07:00 |
|
|
redmatrix
|
97b990c9bf
|
site checking stuff
|
2015-09-14 19:16:25 -07:00 |
|
|
redmatrix
|
db3d99f7c7
|
Merge pull request #41 from redmatrix/display_load_average
Display load average on the siteinfo page
|
2015-09-15 10:53:05 +10:00 |
|
|
redmatrix
|
8fb4f37670
|
remove xchan_instance_url - it needs to be an abook field, not an xchan field
|
2015-09-14 16:05:58 -07:00 |
|
|
jeroenpraat
|
dfd4115f7a
|
Update siteinfo.tpl
|
2015-09-14 16:45:15 +02:00 |
|
|
jeroenpraat
|
e58ad35fb0
|
Update siteinfo.php
|
2015-09-14 16:42:32 +02:00 |
|
|
jeroenpraat
|
31db5078c1
|
Small update Spanish strings
|
2015-09-14 16:36:06 +02:00 |
|
|
Mario Vavti
|
40c78d23e6
|
quick fix for choklet bannertwo
|
2015-09-14 09:27:15 +02:00 |
|
|
Mario Vavti
|
ec1d6d537e
|
quick fix for choklet bannertwo
|
2015-09-14 09:20:08 +02:00 |
|
|
zottel
|
06bfd2b502
|
Merge remote-tracking branch 'upstream/master'
|
2015-09-14 08:55:46 +02:00 |
|