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

• 6613275cc2 Merge pull request #215 from royalterra/master redmatrix 2015-12-12 09:15:24 +11:00
• e7d9863432 Hubzilla textbox - promoting Hubzilla features in jot.tpl - third version Haakon Meland Eriksen 2015-12-11 19:40:09 +01:00
• b9af0645c2 Hubzilla textbox - promoting Hubzilla features in jot.tpl - third version Haakon Meland Eriksen 2015-12-11 19:34:29 +01:00
• 9fb7a12849 incorrect obj_type on several items redmatrix 2015-12-11 02:52:43 -08:00
• 4633273279 Update INSTALL.txt royalterra 2015-12-11 09:49:14 +00:00
• d0482133a5 Update INSTALL.txt royalterra 2015-12-11 09:48:04 +00:00
• 4ff31d0a41 Merge pull request #1 from redmatrix/master royalterra 2015-12-11 09:39:01 +00:00
• f73c82632f some minor cleanup - change the default of the discover tab (public stream access) redmatrix 2015-12-10 19:18:55 -08:00
• 8389d8677d some major cleanup of api authentication stuff - still needs much more and this still may not solve #206 redmatrix 2015-12-10 16:39:46 -08:00
• 7fa944ed95 don't spit out sabre xml on permission denied exceptions, just provide a 401 redmatrix 2015-12-10 15:13:10 -08:00
• 2340092008 Merge https://github.com/redmatrix/hubzilla into pending_merge redmatrix 2015-12-10 14:44:37 -08:00
• 6cd3296c08 Missing underscores in doc jeroenpraat 2015-12-10 23:32:25 +01:00
• d86bc0b6cf Hubzilla textbox - promoting Hubzilla features in jot.tpl - third version Haakon Meland Eriksen 2015-12-10 20:43:32 +01:00
• e01d4f289b Hubzilla textbox - promoting Hubzilla features in jot.tpl - third version Haakon Meland Eriksen 2015-12-10 07:27:42 +01:00
• 8e1e301764 refactor a few more redundant returns redmatrix 2015-12-09 21:03:29 -08:00
• bd37f59829 simplify magic-auth - a lot... Would be even simpler if we didn't need to provide remote debugging, which takes up about half the code. But we need that because nobody wants to try and debug this shit by asking somebody at the other end to report what's in their logfile. We've tried this repeatedly. The only thing we can do is bring back all the debugging data so you can look at it yourself. redmatrix 2015-12-09 20:51:00 -08:00
• 72edc9cd6c start working on the singleton setting redmatrix 2015-12-09 18:30:30 -08:00
• 93123e1fa8 Merge https://github.com/redmatrix/hubzilla into pending_merge redmatrix 2015-12-09 14:56:27 -08:00
• 4b6dcbb057 provide paths for include files redmatrix 2015-12-09 14:56:08 -08:00
• 47f7165b07 Some work on the login, register and default home page. Mostly neatly centering things on different viewport widths. Bluegrid schema updated. jeroenpraat 2015-12-09 23:41:37 +01:00
• ae2c0e6552 Merge https://github.com/redmatrix/hubzilla into pending_merge redmatrix 2015-12-09 11:51:55 -08:00
• 200eabe052 add empty arg redmatrix 2015-12-09 11:51:31 -08:00
• 5042200492 Merge pull request #212 from msooon/master redmatrix 2015-12-10 06:24:30 +11:00
• 2e73e6bfb6 Fix #109. jeroenpraat 2015-12-09 14:37:14 +01:00
• c1d10bbbcb Merge pull request #1 from msooon/Lets-encrypt-support msooon 2015-12-09 12:21:17 +01:00
• 746acc21f7 Let’s Encrypt added msooon 2015-12-09 10:54:48 +01:00
• f5226a748f Let’s Encrypt added msooon 2015-12-09 10:48:41 +01:00
• 6a3995014e Hubzilla textbox - promoting Hubzilla features in jot.tpl - third version Haakon Meland Eriksen 2015-12-09 07:38:58 +01:00
• 534a537319 Hubzilla textbox - promoting Hubzilla features in jot.tpl - third version Haakon Meland Eriksen 2015-12-09 07:31:18 +01:00
• 10eefc4eed Hubzilla textbox - promoting Hubzilla features in jot.tpl - second version Haakon Meland Eriksen 2015-12-09 07:28:55 +01:00
• 3d4b3b6a92 Hubzilla textbox - promoting Hubzilla features in jot.tpl Haakon Meland Eriksen 2015-12-09 07:19:31 +01:00
• 0f4ceedbb4 remove duplicated code redmatrix 2015-12-08 20:47:55 -08:00
• 656e5fd052 use killme() instead of die() so that any sessions are closed cleanly. redmatrix 2015-12-08 20:42:46 -08:00
• 5735cad457 remove extra debug logging and ensure we don't try to authenticate without a hubloc redmatrix 2015-12-08 19:43:49 -08:00
• 648f972cf0 Merge https://github.com/redmatrix/hubzilla into pending_merge redmatrix 2015-12-08 18:32:05 -08:00
• baab9b6fbc more libzot stuff redmatrix 2015-12-08 18:31:33 -08:00
• 60b0f9af90 Merge branch 'master' of https://github.com/redmatrix/hubzilla jeroenpraat 2015-12-09 01:39:20 +01:00
• 9d04406f9a First part of fix for issue #109 jeroenpraat 2015-12-09 01:39:02 +01:00
• 29ac533cc9 remove some unused stuff redmatrix 2015-12-08 16:32:06 -08:00
• 79340c5147 change to fallback server list redmatrix 2015-12-08 11:08:00 -08:00
• b9f5076cfc move the diaspora templates out of core (except for diaspora_vcard, which is still stuck here for the present time) redmatrix 2015-12-07 19:17:40 -08:00
• 241607e7d7 Merge https://github.com/redmatrix/hubzilla into pending_merge redmatrix 2015-12-07 16:15:52 -08:00
• bd7d851758 a loose end redmatrix 2015-12-07 16:11:39 -08:00
• 5de1a1ce10 extra paren removed redmatrix 2015-12-07 16:06:43 -08:00
• 8b974f8f74 abstract the message handlers redmatrix 2015-12-07 16:01:54 -08:00
• 96d94551f9 update es+nl jeroenpraat 2015-12-07 21:10:36 +01:00
• ba8d9c0f0b Merge branch 'master' of https://github.com/redmatrix/hubzilla Mario Vavti 2015-12-07 20:28:51 +01:00
• 68cbebe1a5 mod_mitem.js is obsolete Mario Vavti 2015-12-07 20:28:17 +01:00
• 0174cb10ae fix issue #210 Mario Vavti 2015-12-07 19:11:32 +01:00
• 293df6308c some style.css janitor work Mario Vavti 2015-12-07 18:57:03 +01:00
• af29822f04 override bs default margin Mario Vavti 2015-12-07 15:45:21 +01:00
• 0df4f9c114 change album_id logic to make it work with ajax calls Mario Vavti 2015-12-07 13:27:35 +01:00
• 69c9f4588c make justify gallery work with more than one albums per page (eg album widget) Mario Vavti 2015-12-07 12:13:51 +01:00
• 53627c89a7 Merge branch 'dev' redmatrix 2015-12-06 20:50:02 -08:00
• f7f0d2b265 provide plugin hooks for blacklist checking functions. redmatrix 2015-12-06 20:45:21 -08:00
• 2d799f2c11 remove duplicated code redmatrix 2015-12-06 19:59:46 -08:00
• aa5b7eb98a minor optimisation redmatrix 2015-12-06 19:48:46 -08:00
• 1c22e8ae7e whitespace redmatrix 2015-12-06 19:32:39 -08:00
• 4d301bc5a6 comment order redmatrix 2015-12-06 19:29:01 -08:00
• 4ccd9ae6da start of v4 redmatrix 2015-12-06 19:16:38 -08:00
• c8c9916b59 Merge branch 'master' of https://github.com/redmatrix/hubzilla Mario Vavti 2015-12-07 00:01:03 +01:00
• 5490919557 css fixes for blockquote and code (use same padding) Mario Vavti 2015-12-07 00:00:47 +01:00
• 3f920da413 update error redmatrix 2015-12-06 14:25:47 -08:00
• 2393db3943 Merge branch 'dev' redmatrix 2015-12-06 14:24:18 -08:00
• a88ec1b1af Merge https://github.com/redmatrix/hubzilla into pending_merge redmatrix 2015-12-06 14:22:55 -08:00
• 553b3a5c6c version redmatrix 2015-12-06 14:22:36 -08:00
• a6cb25020b add missing smarty files Mario Vavti 2015-12-06 23:12:37 +01:00
• 26c465ad0c update smarty to 3.1.28-dev which fixes a bug where changes in a template are only visible on the second pageload which is annoying for developing Mario Vavti 2015-12-06 21:09:58 +01:00
• f2d7083183 remove more unneeded smarty files Mario Vavti 2015-12-06 20:25:42 +01:00
• ef09a29854 remove composer release notes Mario Vavti 2015-12-06 20:14:12 +01:00
• c23ce16caf update smarty library - seems to bring some performance improvement Mario Vavti 2015-12-06 20:12:05 +01:00
• 78a70fed2f fix css issue in directory Mario Vavti 2015-12-06 16:37:57 +01:00
• 9dfe5dee64 change text "Red developers" in update failed email redmatrix 2015-12-05 13:56:32 -08:00
• 36ef1d1bc6 move the instance stuff to abook where it belongs redmatrix 2015-12-05 13:24:58 -08:00
• 10db51e6c2 Merge branch 'master' into dev redmatrix 2015-12-05 12:48:46 -08:00
• 61aa33af1d Merge https://github.com/redmatrix/hubzilla into pending_merge redmatrix 2015-12-05 12:41:08 -08:00
• d8dc055dce version and string update redmatrix 2015-12-05 12:40:35 -08:00
• ce686d2c06 Merge pull request #209 from HaakonME/master redmatrix 2015-12-06 07:35:31 +11:00
• 7119976199 Merge remote-tracking branch 'upstream/master' Haakon Meland Eriksen 2015-12-05 11:26:07 +01:00
• dd7edc8ced Updated Norwegian translation Haakon Meland Eriksen 2015-12-05 11:25:36 +01:00
• 4428f70ea2 Merge pull request #208 from anaqreon/mail-text-height redmatrix 2015-12-05 07:47:15 +11:00
• 0bb7589418 Enlarge the default mail composition text area. Andrew Manning 2015-12-04 15:29:57 -05:00
• 0513463256 Merge pull request #9 from redmatrix/master mrjive 2015-12-04 10:32:14 +01:00
• 8a9d743f6f fix rendering of unseen forum posts count Mario Vavti 2015-12-04 10:17:13 +01:00
• 4cab74c18c use the channel blacklist for items and mail, still todo: directory and stuff redmatrix 2015-12-03 21:05:48 -08:00
• 615c97132d add hubzilla.nl as fallback redmatrix 2015-12-03 19:18:12 -08:00
• 4b707db4b3 Merge https://github.com/redmatrix/hubzilla into pending_merge redmatrix 2015-12-03 18:28:32 -08:00
• 70c5f347c4 remove non-working directory server from the project fallback list. redmatrix 2015-12-03 18:27:49 -08:00
• 5217d89543 srand() is for seeding the PRNG. You want rand() here. ken restivo 2015-12-03 18:21:25 -08:00
• ca55bbdaed use the std_version where applicable instead of matching to the git. redmatrix 2015-12-03 17:09:05 -08:00
• 366e735ad8 time to tag the sucker 1.0 redmatrix 2015-12-03 14:44:03 -08:00
• c363fc71eb Merge remote-tracking branch 'upstream/master' Haakon Meland Eriksen 2015-12-03 18:14:52 +01:00
• 9f3ea71d5d non-functional changes (changes to comments, etc.) redmatrix 2015-12-02 20:45:21 -08:00
• 75058e54b8 provide correct error if a directory server requires a realm_token and one wasn't provided redmatrix 2015-12-02 18:37:22 -08:00
• ed5405d4f7 prevent function name re-declaration in widget space redmatrix 2015-12-02 18:25:09 -08:00
• 8dd4270a6a Merge https://github.com/redmatrix/hubzilla into pending_merge redmatrix 2015-12-02 16:23:28 -08:00
• c29f622b90 introduce STD_VERSION and get_std_version() [in include/plugin.php], we begin with 0.11.1 since it is an incompatible interface change to 0.11. redmatrix 2015-12-02 16:21:15 -08:00
• bc0e415926 es+nl and bluegrid update jeroenpraat 2015-12-03 00:01:51 +01:00
• c48965ea2f fix nav search popup active background color Mario Vavti 2015-12-02 22:58:38 +01:00
• bb995f1bb6 fix mail attachment and photo permissions. issue #202 Mario Vavti 2015-12-02 11:34:40 +01:00