Haakon Meland Eriksen
|
90463ee67d
|
Make upload and encrypt easier on phones by editing jot.tpl
|
2015-11-12 07:45:37 +01:00 |
|
redmatrix
|
6e04dd96a1
|
will also need api doco
|
2015-11-11 20:51:15 -08:00 |
|
redmatrix
|
f7c837aad0
|
Merge https://github.com/redmatrix/hubzilla into pending_merge
|
2015-11-11 15:13:01 -08:00 |
|
redmatrix
|
bd3d323849
|
run markdown through html purifier for those who insist on mixing html with markdown.
|
2015-11-11 15:09:22 -08:00 |
|
Haakon Meland Eriksen
|
e26b558e53
|
Promoted upload of images and encryption
|
2015-11-11 23:55:05 +01:00 |
|
Haakon Meland Eriksen
|
85e5cd7f98
|
Rearranged comment buttons back
|
2015-11-11 23:43:41 +01:00 |
|
Haakon Meland Eriksen
|
1d8cac6e73
|
Rearranged comment buttons
|
2015-11-11 23:31:18 +01:00 |
|
redmatrix
|
52f6bd03b7
|
Merge pull request #149 from waitman/master
updates to Postgres schema
|
2015-11-12 09:07:26 +11:00 |
|
ken restivo
|
75c10eaff5
|
Merge pull request #144 from kenrestivo/api-auth-fix
api_auth.php must be included since the function moved.
|
2015-11-11 11:18:41 -08:00 |
|
mrjive
|
53a796afcc
|
Merge pull request #8 from redmatrix/master
get fresh code from HZ base
|
2015-11-11 16:51:48 +01:00 |
|
Waitman Gobble
|
f94a8698dd
|
updates to Postgres schema
|
2015-11-11 07:42:41 -08:00 |
|
ken restivo
|
ffb8059c24
|
api_auth.php must be included since the function moved.
|
2015-11-11 02:26:12 -08:00 |
|
redmatrix
|
bc7c0ed844
|
Merge pull request #143 from kenrestivo/allow-importing-by-proxy
Bust out import_account() into a separate function
|
2015-11-11 19:42:52 +11:00 |
|
redmatrix
|
ac9250fc4a
|
Merge pull request #141 from HaakonME/master
Added Hubzilla plugin repo for ownMapp - decentralized and private map sharing
|
2015-11-11 18:08:19 +11:00 |
|
redmatrix
|
f1492945ec
|
Merge pull request #140 from kenrestivo/move-export-to-plugin
Moving this out into a plugin; hopefully one that will work with RM
|
2015-11-11 18:08:03 +11:00 |
|
ken restivo
|
10ccdbacba
|
Bust out import_account() into a separate function to allow importing accounts by proxy, i.e. for admins to import a channel on behalf of a user.
|
2015-11-10 23:07:28 -08:00 |
|
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 |
|
Haakon Meland Eriksen
|
609e42cdd8
|
Merge remote-tracking branch 'upstream/master'
|
2015-11-11 07:26:15 +01: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 |
|
Haakon Meland Eriksen
|
23d30ab2c5
|
Merge remote-tracking branch 'upstream/master'
|
2015-11-10 23:50:54 +01:00 |
|
ken restivo
|
741afeea41
|
Moving this out into a plugin; hopefully one that will work with Redmatrix as well.
|
2015-11-10 14:48:50 -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 |
|
Haakon Meland Eriksen
|
5c7dfcfe43
|
Fixed ownMapp repo address
|
2015-11-10 16:09:11 +01:00 |
|
Haakon Meland Eriksen
|
cff866172a
|
Fixed ownMapp repo address
|
2015-11-10 16:06:11 +01:00 |
|
Haakon Meland Eriksen
|
31a612aa89
|
Fixed ownMapp repo address
|
2015-11-10 15:58:24 +01:00 |
|
Haakon Meland Eriksen
|
b782c46e51
|
Merge remote-tracking branch 'upstream/master'
|
2015-11-10 07:36:51 +01:00 |
|
Haakon Meland Eriksen
|
eaa47760bc
|
Add ownMap
|
2015-11-10 07:35:24 +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 |
|