Commit Graph

Select branches

Hide Pull Requests

3.6RC

CAPTHA

develop

japanese

master

origin

0.10

0.11

0.8

0.9

1.0

1.1

1.10

1.12

1.14

1.14.2

1.2

1.3

1.3.1

1.4

1.6

1.8

2.0

2.2

2.4

2.4.2

2.6

2.6.1

2.6.2

2.6.3

2.8

2.8.1

3.0

3.0.1

3.2

3.2.1

3.2.2

3.4

3.4.1

3.4.2

3.6

3.6.1

Mono Color

• 85e5cd7f98 Rearranged comment buttons back Haakon Meland Eriksen 2015-11-11 23:43:41 +01:00
• 1d8cac6e73 Rearranged comment buttons Haakon Meland Eriksen 2015-11-11 23:31:18 +01:00
• 52f6bd03b7 Merge pull request #149 from waitman/master redmatrix 2015-11-12 09:07:26 +11:00
• 75c10eaff5 Merge pull request #144 from kenrestivo/api-auth-fix ken restivo 2015-11-11 11:18:41 -08:00
• 53a796afcc Merge pull request #8 from redmatrix/master mrjive 2015-11-11 16:51:48 +01:00
• f94a8698dd updates to Postgres schema Waitman Gobble 2015-11-11 07:42:41 -08:00
• ffb8059c24 api_auth.php must be included since the function moved. ken restivo 2015-11-11 02:26:12 -08:00
• bc7c0ed844 Merge pull request #143 from kenrestivo/allow-importing-by-proxy redmatrix 2015-11-11 19:42:52 +11:00
• ac9250fc4a Merge pull request #141 from HaakonME/master redmatrix 2015-11-11 18:08:19 +11:00
• f1492945ec Merge pull request #140 from kenrestivo/move-export-to-plugin redmatrix 2015-11-11 18:08:03 +11:00
• 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. ken restivo 2015-11-10 23:07:28 -08:00
• d683573402 Merge pull request #142 from kenrestivo/refactor-out-api-auth redmatrix 2015-11-11 18:01:48 +11:00
• ddce0412ac Move api_auth() out to a file that can be included from plugins/modules to allow them to expose their own programmatic API. ken restivo 2015-11-10 22:50:18 -08:00
• 609e42cdd8 Merge remote-tracking branch 'upstream/master' Haakon Meland Eriksen 2015-11-11 07:26:15 +01:00
• 7235c20854 Merge https://github.com/redmatrix/hubzilla into pending_merge 0.11 redmatrix 2015-11-10 19:03:03 -08:00
• e7bedf4433 do a better job of preserving linebreaks in posts for channels that use markdown redmatrix 2015-11-10 19:02:28 -08:00
• 23d30ab2c5 Merge remote-tracking branch 'upstream/master' Haakon Meland Eriksen 2015-11-10 23:50:54 +01:00
• 741afeea41 Moving this out into a plugin; hopefully one that will work with Redmatrix as well. ken restivo 2015-11-10 14:48:50 -08:00
• cd989977b8 Merge pull request #139 from sasiflo/master redmatrix 2015-11-11 07:53:08 +11:00
• 1216508dc2 Replaced references to redmatrix logo. sasiflo 2015-11-10 17:11:12 +01:00
• 5c7dfcfe43 Fixed ownMapp repo address Haakon Meland Eriksen 2015-11-10 16:09:11 +01:00
• cff866172a Fixed ownMapp repo address Haakon Meland Eriksen 2015-11-10 16:06:11 +01:00
• 31a612aa89 Fixed ownMapp repo address Haakon Meland Eriksen 2015-11-10 15:58:24 +01:00
• b782c46e51 Merge remote-tracking branch 'upstream/master' Haakon Meland Eriksen 2015-11-10 07:36:51 +01:00
• eaa47760bc Add ownMap Haakon Meland Eriksen 2015-11-10 07:35:24 +01:00
• 7ec6879887 more doco redmatrix 2015-11-09 20:56:37 -08:00
• c4a3487f0c remove the obsolete avatar_img function (gravatar/libravatar lookup) redmatrix 2015-11-09 20:29:36 -08:00
• e6de9bfa4e get rid of the pre-comanche widget placement and wgl code redmatrix 2015-11-09 19:42:37 -08:00
• c0260ff701 more doco redmatrix 2015-11-09 18:25:18 -08:00
• fba2603304 add avatars to likes/dislikes/etc. redmatrix 2015-11-09 15:58:19 -08:00
• 7d5acef20a remove list bullets from extended like list redmatrix 2015-11-09 15:18:26 -08:00
• cda8fb3380 Merge https://github.com/redmatrix/hubzilla into pending_merge redmatrix 2015-11-09 14:56:53 -08:00
• 862a310075 thwart attempts to use an external private directory as a directory server redmatrix 2015-11-09 14:53:58 -08:00
• 98146eae07 Merge pull request #134 from HaakonME/master redmatrix 2015-11-10 08:41:33 +11:00
• c277039fb4 Merge pull request #135 from kenrestivo/account-id-link redmatrix 2015-11-10 08:41:22 +11:00
• 92577ddaed Merge pull request #136 from kenrestivo/generate-schemaspy redmatrix 2015-11-10 08:41:02 +11:00
• b99b6b5ae9 This is better jeroenpraat 2015-11-09 16:37:22 +01:00
• cda81e35db Using bootstrap classes, so other themes/schemas also work. Plus margin when collapsed. jeroenpraat 2015-11-09 15:08:50 +01:00
• 271a41b7dd Merge https://github.com/redmatrix/hubzilla into pending_merge redmatrix 2015-11-09 01:04:12 -08:00
• 69aeddd185 Merge https://github.com/redmatrix/redmatrix into pending_merge redmatrix 2015-11-09 01:03:57 -08:00
• 99bd69adfe remove references to redmatrix.me redmatrix 2015-11-09 00:59:48 -08:00
• 115a53225e Merge pull request #137 from wave72/master Wave 2015-11-09 08:58:58 +01:00
• 36c196e18c Updated Italian strings Paolo Tacconi 2015-11-09 08:54:18 +01:00
• 0c8219e683 Correct directory (this runs from inside hubzilla_er ken restivo 2015-11-08 22:58:21 -08:00
• de9c44fc56 First attempt at auto-generating schemaspy. ken restivo 2015-11-08 22:51:58 -08:00
• d1dbc50a1c Manually document account_id link for schemaSpy. ken restivo 2015-11-08 22:14:15 -08:00
• 0fbea73581 Keep only zot.meta.xml for schemaSpy report generation, not the report itself Haakon Meland Eriksen 2015-11-09 06:24:02 +01:00
• 10f7199c63 Merge pull request #133 from kenrestivo/export-v1 redmatrix 2015-11-09 16:05:38 +11:00
• 49d6605377 First pass at endpoints for exporting users and channels in bulk as admin. ken restivo 2015-11-08 20:50:36 -08:00
• 11c8cabf28 suppress duplicate locations in connedit, issue #111 redmatrix 2015-11-08 20:41:11 -08:00
• 00132cd977 Merge https://github.com/redmatrix/hubzilla into pending_merge redmatrix 2015-11-08 20:02:52 -08:00
• 5e1b61eb02 some more db doco redmatrix 2015-11-08 20:02:35 -08:00
• dfb49558f4 Merge pull request #132 from kenrestivo/test-for-email redmatrix 2015-11-09 14:39:00 +11:00
• 4e1c308162 make jotnets modal redmatrix 2015-11-08 17:48:43 -08:00
• 5c2692a8ea no comment permission bug, also implement delete() in RedDirectory per Waitman redmatrix 2015-11-08 16:36:36 -08:00
• 9c240de303 Add unit tests for valid email function. ken restivo 2015-11-08 14:37:48 -08:00
• 2536dc39b5 Merge https://github.com/redmatrix/hubzilla into pending_merge redmatrix 2015-11-08 13:55:21 -08:00
• cf0bff8582 relative attachment not fetched due to os filename issue redmatrix 2015-11-08 13:54:31 -08:00
• 9c12ba5708 Merge pull request #131 from tluther/master redmatrix 2015-11-09 06:44:18 +11:00
• 8639eda70f Quick fix: Moved Twitter select box to the top of ACL selector Tobias Luther 2015-11-08 12:20:58 +01:00
• 1874346c46 Merge pull request #129 from HaakonME/master redmatrix 2015-11-08 16:57:56 +11:00
• 16040063dc A few quotes too many. Also translations for tooltip. jeroenpraat 2015-11-08 00:08:02 +01:00
• 2b0b03eebc Fix ffsapi for non-English languages (or better when 's was used in the strings) - Update nl+es jeroenpraat 2015-11-08 00:04:02 +01:00
• df2b687a95 Merge remote-tracking branch 'upstream/master' Haakon Meland Eriksen 2015-11-07 16:48:10 +01:00
• 44fa4d1081 more db schema doco redmatrix 2015-11-06 23:43:48 -08:00
• ce4bb8e5ec Merge remote-tracking branch 'upstream/master' Haakon Meland Eriksen 2015-11-07 07:13:33 +01:00
• 8154453803 Merge pull request #130 from kenrestivo/link-from-human redmatrix 2015-11-07 14:52:37 +11:00
• b29fe50f70 update db doco for attach structure to match hubzilla schema redmatrix 2015-11-06 18:57:17 -08:00
• cce46722d8 Human > computer ken restivo 2015-11-06 17:34:03 -08:00
• 85ae07e7c8 update the abook schema doco with the hubzilla schema changes redmatrix 2015-11-06 15:49:22 -08:00
• e3da813360 database schema documentation for item table redmatrix 2015-11-06 14:43:32 -08:00
• 9a42d63516 Merge https://github.com/redmatrix/redmatrix into pending_merge redmatrix 2015-11-06 12:43:51 -08:00
• 4620eb32d2 version and string update redmatrix 2015-11-06 12:35:43 -08:00
• 1c8f63f1e5 rev update redmatrix 2015-11-06 12:34:29 -08:00
• c40f6060da Hubzilla report created by schemaSpy using zot.meta.xml to imply relationships Haakon Meland Eriksen 2015-11-06 17:26:04 +01:00
• 5776af30e8 Merge remote-tracking branch 'upstream/master' Haakon Meland Eriksen 2015-11-06 15:58:56 +01:00
• 30d083ac3c Merge pull request #2 from redmatrix/master Wave 2015-11-06 09:09:58 +01:00
• 4ca0c2cfd1 more hook doco redmatrix 2015-11-05 21:06:09 -08:00
• 12db46dcad a bit of explanation at the beginning redmatrix 2015-11-05 20:49:25 -08:00
• 9e6547a887 add the hook detail to the doco list redmatrix 2015-11-05 20:21:41 -08:00
• 017ea0d624 more work on hook doco redmatrix 2015-11-05 20:19:38 -08:00
• a29b8b369e update hooklist redmatrix 2015-11-05 20:10:49 -08:00
• 6b26b4e3b8 the journey of 1000 miles begins with a single step redmatrix 2015-11-05 17:38:21 -08:00
• 7df92ba62c preliminary hook detail files redmatrix 2015-11-05 17:23:36 -08:00
• 9cad4c11fe typo redmatrix 2015-11-05 16:36:19 -08:00
• 5b42edb42a Merge https://github.com/redmatrix/hubzilla into pending_merge redmatrix 2015-11-05 16:28:54 -08:00
• a26d8609a9 handle old files with partial paths redmatrix 2015-11-05 16:28:10 -08:00
• 001e4276d3 first cut at some much better hook documentation derived from bamfic's automated list (doc/hooks.html) redmatrix 2015-11-05 16:08:18 -08:00
• 94437a8fcd Firefox Share app. Paper plane icon is public domain. Shorted the name in ffsapi > compare it with other providers. Changed bookmark (checkmark) item to selfmade Hubzilla bookmark icon for Firefox (bookmark icon = bootstrap icon). jeroenpraat 2015-11-05 22:57:52 +01:00
• 91f751d105 Merge remote-tracking branch 'upstream/master' Haakon Meland Eriksen 2015-11-05 16:54:39 +01:00
• 0db5a8673d Firefox share (that seems now the official name) button added to misc. settings. jeroenpraat 2015-11-05 16:20:56 +01:00
• 91f2e05d5d Style the button jeroenpraat 2015-11-05 09:06:45 +01:00
• 58fe4f5cb3 fix the file chunking api now that we've got working data to test with redmatrix 2015-11-05 00:00:41 -08:00
• 2ebd9a2774 fix path for attachments using os_storage uploaded through attach_store redmatrix 2015-11-04 23:48:55 -08:00
• 8db428458a forgot this one redmatrix 2015-11-04 23:21:16 -08:00
• f8b612a2c0 Merge https://github.com/redmatrix/redmatrix into pending_merge redmatrix 2015-11-04 23:17:09 -08:00
• 76043d97bd dummy update redmatrix 2015-11-04 23:06:37 -08:00
• 07bd396837 Merge remote-tracking branch 'upstream/master' Haakon Meland Eriksen 2015-11-05 06:34:14 +01:00
• f7468ab473 re-arrange file api calls so the api pathnames don't shadow each other redmatrix 2015-11-04 20:50:43 -08:00
• 1213893a71 api calls to fetch file (attach) meta data and to chunk file content fetching which will eventually allow us to clone large videos without hitting memory limits redmatrix 2015-11-04 19:49:41 -08:00