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

• 07d62bc111 typo zotlabs 2017-04-12 18:48:06 -07:00
• 91d0f87181 make sure the new fields don't leak through sync packets and break older versions zotlabs 2017-04-12 17:43:27 -07:00
• 1c32564536 backend infrastructure for 'channel protection password'; which will be used to optionally encrypt export files and resolve channel/identity ownership/hijacking disputes zotlabs 2017-04-12 17:32:28 -07:00
• da07108be9 make sure the new fields don't leak through sync packets and break older versions zotlabs 2017-04-12 17:43:27 -07:00
• d7f4526a00 backend infrastructure for 'channel protection password'; which will be used to optionally encrypt export files and resolve channel/identity ownership/hijacking disputes zotlabs 2017-04-12 17:32:28 -07:00
• 63dd6ad01a don't allow any null fields in notify creation zotlabs 2017-04-11 23:05:56 -07:00
• 7b173a75e4 correct the mastodon "boost" (aka 'share') author attribution by checking for share activities and pulling the original author info from the activity:object zotlabsandMario Vavti 2017-04-11 20:17:22 -07:00
• cb5a047e5d ugly hack to webfinger to allow connections to be made to mastodon servers. zotlabsandMario Vavti 2017-04-10 20:31:45 -07:00
• ed5abe5981 some signatures showing as invalid because of recent import_author_zot() changes. zotlabsandMario Vavti 2017-04-09 20:25:41 -07:00
• 940534e303 webfinger cleanup zotlabs 2017-04-11 22:02:29 -07:00
• 1609473e5d correct the mastodon "boost" (aka 'share') author attribution by checking for share activities and pulling the original author info from the activity:object zotlabs 2017-04-11 20:17:22 -07:00
• 1f951e2bd3 Merge pull request #714 from mjfriaza/dev git-marijusandGitHub 2017-04-11 06:55:12 +02:00
• ed8e4962b9 ugly hack to webfinger to allow connections to be made to mastodon servers. zotlabs 2017-04-10 20:31:45 -07:00
• 10f9f9cc80 Updated the Spanish translation Manuel Jiménez Friaza 2017-04-10 12:50:42 +02:00
• 56c8e00b84 Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge zotlabs 2017-04-09 20:27:54 -07:00
• 063577c19e some signatures showing as invalid because of recent import_author_zot() changes. zotlabs 2017-04-09 20:25:41 -07:00
• 57f20c0c22 Merge pull request #713 from zotlabs/photo-zero git-marijusandGitHub 2017-04-08 10:15:40 +02:00
• e682b93883 Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge zotlabs 2017-04-07 15:00:31 -07:00
• a32b097e3c photo size-0 issue zotlabs 2017-04-07 14:56:12 -07:00
• 2ebf76cd50 Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge zotlabs 2017-04-07 14:56:53 -07:00
• 65e5894363 photo size-0 issue zotlabs 2017-04-07 14:56:12 -07:00
• dbef80f7bd fix from downstream zotlabs 2017-04-07 13:37:18 -07:00
• 06b0c89aee Merge pull request #712 from zotlabs/fr_update git-marijusandGitHub 2017-04-07 21:00:37 +02:00
• 113bfe8fa2 remove redundant string Mario Vavti 2017-04-07 18:41:13 +02:00
• df4e193990 the string was there but the template var was wrong Mario Vavti 2017-04-07 13:35:17 +02:00
• 28207c3313 css fixes and missing string Mario Vavti 2017-04-07 11:31:10 +02:00
• e685c580f2 only log zot_refresh content if json decode was successful. zotlabsandMario Vavti 2017-04-06 19:55:43 -07:00
• e6139c9f49 revisit the import_author_zot algorithm yet again. There was one bug that we weren't returning necessary information in the first SQL query - and performance/loading problem if one tries to refresh a dead site. zotlabsandMario Vavti 2017-04-06 16:24:19 -07:00
• fac654ec5d remove redundant and non-functional/broken check for successfully cloned channel record which was left over from an earlier method of creating the table; which was deprecated a few months back. zotlabsandMario Vavti 2017-03-20 15:24:47 -07:00
• 1352e334b1 Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge zotlabs 2017-04-06 20:07:15 -07:00
• 69ab6639b2 Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge zotlabs 2017-04-06 20:05:53 -07:00
• d52ee7ae27 only log zot_refresh content if json decode was successful. zotlabs 2017-04-06 19:55:43 -07:00
• ebcfc7f2b2 revisit the import_author_zot algorithm yet again. There was one bug that we weren't returning necessary information in the first SQL query - and performance/loading problem if one tries to refresh a dead site. zotlabs 2017-04-06 16:24:19 -07:00
• b347e1d861 import_author_xchan - since we rarely refresh zot-info for non-connections, force a cache reload once a week to catch things like profile photo updates and location changes zotlabsandMario Vavti 2017-04-05 17:08:13 -07:00
• 8cb4a29a51 revert grid and bars icon size change zotlabs 2017-04-05 19:21:27 -07:00
• 9fb08fb502 make legal_webbie() pluggable - * this should not be merged with federated projects unless the federation drivers make use of the hooks. zotlabs 2017-04-05 19:08:43 -07:00
• 6710a77c26 Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge zotlabs 2017-04-05 17:14:11 -07:00
• e442fe753e Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge zotlabs 2017-04-05 17:11:35 -07:00
• a4685e6df3 import_author_xchan - since we rarely refresh zot-info for non-connections, force a cache reload once a week to catch things like profile photo updates and location changes zotlabs 2017-04-05 17:08:13 -07:00
• a4f6c24273 we should probably stick to 0.875rem font-size (this is equal to 14px with a default browser setting of 16px) to give 90% of the members a nice desktop experience. The font-awesome icons are only rendered clean with 14px (and multiples) fontsize. They look somewhat unfocused with 16px font-size. The font-size setting has moved to display setting -> custom theme settings. Set it to 1rem there to use the slightly taller default browser size. Mario Vavti 2017-04-05 21:34:36 +02:00
• 53853814ff adjust font-size Mario Vavti 2017-04-05 21:13:48 +02:00
• fb31f629c6 update bd-dev and remove hotfix Mario Vavti 2017-04-05 14:12:18 +02:00
• 50612565e9 create site_store_lowlevel() to initialise data structures for the site table zotlabsandMario Vavti 2017-04-03 16:43:30 -07:00
• a92256e1cb legal_webbie() now provides different character rules depending on whether you federate or not. Added some comments in a few places that needed them. zotlabs 2017-04-03 22:13:12 -07:00
• d6c23486d5 create site_store_lowlevel() to initialise data structures for the site table zotlabs 2017-04-03 16:43:30 -07:00
• d2bafdb2bf fr strings update (Monret) zotlabs 2017-04-03 15:53:48 -07:00
• f2f2b534e6 Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge zotlabs 2017-04-03 15:55:22 -07:00
• 2d9ae8ff2c Revert "fr strings update (Monret)" zotlabs 2017-04-03 15:55:03 -07:00
• 4e4d406d23 fr strings update (Monret) zotlabs 2017-04-03 15:53:48 -07:00
• a9bda2b12e sql error photos_albums_list with non-logged-in viewer zotlabsandMario Vavti 2017-04-02 22:20:37 -07:00
• 5fb7ea8dbd fix connectDefaultShare generated js function, though it isn't obvious if we still use it. zotlabsandMario Vavti 2017-04-02 20:35:45 -07:00
• d35678b891 change hook for perm_is_allowed while retaining backwards compatibility zotlabsandMario Vavti 2017-04-02 20:03:27 -07:00
• 405e3fc214 import_author_zot() - check for both hubloc and xchan entries. This should catch and repair entries which were subject to transient storage failures. zotlabsandMario Vavti 2017-04-02 19:46:20 -07:00
• fbba78411d app sorting issue zotlabsandMario Vavti 2017-04-02 17:34:16 -07:00
• 75cd816e02 logic error zotlabsandMario Vavti 2017-04-02 17:12:42 -07:00
• c8a886e399 import authors from any unrecognised network as network 'unknown'. zotlabsandMario Vavti 2017-04-02 17:09:51 -07:00
• 19b2568133 whitespace zotlabsandMario Vavti 2017-03-30 21:04:55 -07:00
• ccc8a05eb0 Merge pull request #711 from zotlabs/crypto-upgrade git-marijusandGitHub 2017-04-03 10:38:09 +02:00
• 26125bcf0b sql error photos_albums_list with non-logged-in viewer zotlabs 2017-04-02 22:20:37 -07:00
• 263efbfe39 reference to deprecated function import_author_diaspora in socgraph.php zotlabs 2017-04-02 21:49:50 -07:00
• 9a5ce2354d remove some obsolete permissions stuff zotlabs 2017-04-02 20:51:40 -07:00
• f25f5aeaaa fix connectDefaultShare generated js function, though it isn't obvious if we still use it. zotlabs 2017-04-02 20:35:45 -07:00
• af14020e42 change hook for perm_is_allowed while retaining backwards compatibility zotlabs 2017-04-02 20:03:27 -07:00
• 4a49643bcd import_author_zot() - check for both hubloc and xchan entries. This should catch and repair entries which were subject to transient storage failures. zotlabs 2017-04-02 19:46:20 -07:00
• 29596d12e3 app sorting issue zotlabs 2017-04-02 17:34:16 -07:00
• 1a28fb2a0c logic error zotlabs 2017-04-02 17:12:42 -07:00
• d985db60cc import authors from any unrecognised network as network 'unknown'. zotlabs 2017-04-02 17:09:51 -07:00
• a76ad1478f crypto updates zotlabs 2017-04-02 16:44:44 -07:00
• 044067f055 harden security zotlabs 2017-04-02 16:40:36 -07:00
• 810d9e21bc use aes-ctr which is slightly/arguably better than a poke in the eye and don't restrict the crypto algorithm by server role. zotlabs 2017-04-01 15:30:59 -07:00
• 7256579c16 Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge zotlabs 2017-03-31 17:27:18 -07:00
• ecf30b2c71 strings zotlabs 2017-03-31 17:25:04 -07:00
• 95f4f14dca triple a is more sane Mario Vavti 2017-03-31 19:14:24 +02:00
• 391854058e minor css adjustments Mario Vavti 2017-03-31 18:13:36 +02:00
• 1bcee2f11c various form css fixes Mario Vavti 2017-03-31 16:13:58 +02:00
• 572a04b40a make btn-outline-secondary color slightly darker Mario Vavti 2017-03-31 14:20:13 +02:00
• d9ee8b2c32 Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev Mario Vavti 2017-03-31 13:59:43 +02:00
• 614366e499 css fixes Mario Vavti 2017-03-31 13:59:28 +02:00
• 89e3f3210f Merge pull request #710 from dawnbreak/importcsrf git-marijusandGitHub 2017-03-31 13:40:02 +02:00
• dc55c710da add max height to #navbar-collapse-2 Mario Vavti 2017-03-31 13:38:55 +02:00
• 47817b8ae1 version bump Mario Vavti 2017-03-31 11:11:07 +02:00
• 3e66549ea4 regenerate hmessages.po Mario Vavti 2017-03-31 11:10:31 +02:00
• 8b7d0f33c3 fix a couple more instances where we were still calling mail() directly for site critical messages zotlabsandMario Vavti 2017-03-28 17:49:48 -07:00
• a20fd4d463 get rid of some more deprecated uses of $a zotlabsandMario Vavti 2017-03-28 17:00:44 -07:00
• bfd506f184 remove obsolete app argument from load_pdl zotlabsandMario Vavti 2017-03-28 16:07:22 -07:00
• c20aa6062c get rid of get_app() zotlabsandMario Vavti 2017-03-28 16:02:47 -07:00
• b2a51db14e add 'author_is_pmable()' function with plugin hooks to control whether or not to display a 'send mail' link in the thread author menu. zotlabsandMario Vavti 2017-03-27 15:49:48 -07:00
• 33ff7bf968 provide platform specific install script zotlabsandMario Vavti 2017-03-25 14:19:32 -07:00
• 57a8b3f857 provide compatibility with old-style update system zotlabsandMario Vavti 2017-03-25 13:22:14 -07:00
• 6e5a06421f get rid of 'davguest' and allow for project specific DB updates (currently db updates are common between all possible projects/subprojects/forks). zotlabsandMario Vavti 2017-03-25 13:07:46 -07:00
• 5f0004b416 move db_upgrade to zlib zotlabsandMario Vavti 2017-03-23 21:49:20 -07:00
• e79f450af9 aes256gcm is not ready for prime time. Stay tuned. Until it is, we're pretty much stuffed unless we go to 3rd party crypto libs. zotlabs 2017-03-30 21:45:29 -07:00
• c4f5d17db6 Merge branch 'importcsrf' of https://github.com/dawnbreak/hubzilla into csrf zotlabs 2017-03-30 21:05:31 -07:00
• d1a018f2e8 whitespace zotlabs 2017-03-30 21:04:55 -07:00
• 6118570118 make aes256gcm the primary crypto mode zotlabs 2017-03-30 20:43:49 -07:00
• a9cceea850 Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge zotlabs 2017-03-30 16:10:59 -07:00
• 81736a0129 🔒 Add CSRF protection for import and import_items. Klaus Weidenbach 2017-03-29 23:53:03 +02:00
• dea4879938 Merge pull request #709 from dawnbreak/docu KlausandGitHub 2017-03-30 23:10:53 +02:00
• 2e2f984c45 Add some documentation for import functions. Klaus Weidenbach 2017-03-24 23:32:53 +01:00
• bb639b08f7 do not allow creating two wikis with the same name Mario Vavti 2017-03-30 15:07:48 +02:00