Commit graph

15077 commits

Author SHA1 Message Date
redmatrix
d683573402 Merge pull request #142 from kenrestivo/refactor-out-api-auth
Move api_auth() out to a file that can be included from plugins/modules
2015-11-11 18:01:48 +11:00
ken restivo
ddce0412ac Move api_auth() out to a file that can be included from plugins/modules to allow them to expose their own programmatic API. 2015-11-10 22:50:18 -08:00
redmatrix
7235c20854 Merge https://github.com/redmatrix/hubzilla into pending_merge 2015-11-10 19:03:03 -08:00
redmatrix
e7bedf4433 do a better job of preserving linebreaks in posts for channels that use markdown 2015-11-10 19:02:28 -08:00
redmatrix
cd989977b8 Merge pull request #139 from sasiflo/master
Replaced references to redmatrix logo.
2015-11-11 07:53:08 +11:00
sasiflo
1216508dc2 Replaced references to redmatrix logo. 2015-11-10 17:11:12 +01:00
redmatrix
7ec6879887 more doco 2015-11-09 20:56:37 -08:00
redmatrix
c4a3487f0c remove the obsolete avatar_img function (gravatar/libravatar lookup) 2015-11-09 20:29:36 -08:00
redmatrix
e6de9bfa4e get rid of the pre-comanche widget placement and wgl code 2015-11-09 19:42:37 -08:00
redmatrix
c0260ff701 more doco 2015-11-09 18:25:18 -08:00
redmatrix
fba2603304 add avatars to likes/dislikes/etc. 2015-11-09 15:58:19 -08:00
redmatrix
7d5acef20a remove list bullets from extended like list 2015-11-09 15:18:26 -08:00
redmatrix
cda8fb3380 Merge https://github.com/redmatrix/hubzilla into pending_merge 2015-11-09 14:56:53 -08:00
redmatrix
862a310075 thwart attempts to use an external private directory as a directory server 2015-11-09 14:53:58 -08:00
redmatrix
98146eae07 Merge pull request #134 from HaakonME/master
Keep only zot.meta.xml for schemaSpy report generation
2015-11-10 08:41:33 +11:00
redmatrix
c277039fb4 Merge pull request #135 from kenrestivo/account-id-link
Manually document account_id link for schemaSpy.
2015-11-10 08:41:22 +11:00
redmatrix
92577ddaed Merge pull request #136 from kenrestivo/generate-schemaspy
First attempt at auto-generating the schemaspy docs
2015-11-10 08:41:02 +11:00
jeroenpraat
b99b6b5ae9 This is better 2015-11-09 16:37:22 +01:00
jeroenpraat
cda81e35db Using bootstrap classes, so other themes/schemas also work. Plus margin when collapsed. 2015-11-09 15:08:50 +01:00
redmatrix
271a41b7dd Merge https://github.com/redmatrix/hubzilla into pending_merge 2015-11-09 01:04:12 -08:00
redmatrix
69aeddd185 Merge https://github.com/redmatrix/redmatrix into pending_merge
Conflicts:
	README.md
	version.inc
2015-11-09 01:03:57 -08:00
redmatrix
99bd69adfe remove references to redmatrix.me 2015-11-09 00:59:48 -08:00
Wave
115a53225e Merge pull request #137 from wave72/master
Updated Italian strings
2015-11-09 08:58:58 +01:00
Paolo Tacconi
36c196e18c Updated Italian strings 2015-11-09 08:54:18 +01:00
ken restivo
0c8219e683 Correct directory (this runs from inside hubzilla_er 2015-11-08 22:58:21 -08:00
ken restivo
de9c44fc56 First attempt at auto-generating schemaspy. 2015-11-08 22:51:58 -08:00
ken restivo
d1dbc50a1c Manually document account_id link for schemaSpy. 2015-11-08 22:14:15 -08:00
Haakon Meland Eriksen
0fbea73581 Keep only zot.meta.xml for schemaSpy report generation, not the report itself 2015-11-09 06:24:02 +01:00
redmatrix
10f7199c63 Merge pull request #133 from kenrestivo/export-v1
First pass at endpoints for exporting users and channels as admin.
2015-11-09 16:05:38 +11:00
ken restivo
49d6605377 First pass at endpoints for exporting users and channels in bulk as admin. 2015-11-08 20:50:36 -08:00
redmatrix
11c8cabf28 suppress duplicate locations in connedit, issue #111 2015-11-08 20:41:11 -08:00
redmatrix
00132cd977 Merge https://github.com/redmatrix/hubzilla into pending_merge 2015-11-08 20:02:52 -08:00
redmatrix
5e1b61eb02 some more db doco 2015-11-08 20:02:35 -08:00
redmatrix
dfb49558f4 Merge pull request #132 from kenrestivo/test-for-email
Add unit tests for valid email function.
2015-11-09 14:39:00 +11:00
redmatrix
4e1c308162 make jotnets modal 2015-11-08 17:48:43 -08:00
redmatrix
5c2692a8ea no comment permission bug, also implement delete() in RedDirectory per Waitman 2015-11-08 16:36:36 -08:00
ken restivo
9c240de303 Add unit tests for valid email function. 2015-11-08 14:37:48 -08:00
redmatrix
2536dc39b5 Merge https://github.com/redmatrix/hubzilla into pending_merge 2015-11-08 13:55:21 -08:00
redmatrix
cf0bff8582 relative attachment not fetched due to os filename issue 2015-11-08 13:54:31 -08:00
redmatrix
9c12ba5708 Merge pull request #131 from tluther/master
Quick fix: Moved Twitter select box to the top of ACL selector
2015-11-09 06:44:18 +11:00
Tobias Luther
8639eda70f Quick fix: Moved Twitter select box to the top of ACL selector 2015-11-08 12:20:58 +01:00
redmatrix
1874346c46 Merge pull request #129 from HaakonME/master
Hubzilla database entity-relationship documentation and HonO fix
2015-11-08 16:57:56 +11:00
jeroenpraat
16040063dc A few quotes too many. Also translations for tooltip. 2015-11-08 00:08:02 +01:00
jeroenpraat
2b0b03eebc Fix ffsapi for non-English languages (or better when 's was used in the strings) - Update nl+es 2015-11-08 00:04:02 +01:00
Haakon Meland Eriksen
df2b687a95 Merge remote-tracking branch 'upstream/master' 2015-11-07 16:48:10 +01:00
redmatrix
44fa4d1081 more db schema doco 2015-11-06 23:43:48 -08:00
Haakon Meland Eriksen
ce4bb8e5ec Merge remote-tracking branch 'upstream/master' 2015-11-07 07:13:33 +01:00
redmatrix
8154453803 Merge pull request #130 from kenrestivo/link-from-human
Human docs > Computer-generated Docs
2015-11-07 14:52:37 +11:00
redmatrix
b29fe50f70 update db doco for attach structure to match hubzilla schema 2015-11-06 18:57:17 -08:00
ken restivo
cce46722d8 Human > computer 2015-11-06 17:34:52 -08:00