Commit Graph

20885 Commits

Author SHA1 Message Date
Andrew Manning 89a825cd03 OAuth2TestVehicle module can create and delete oauth2 database tables. 2018-02-20 21:11:38 -05:00
Andrew Manning 7d0c1bb737 Created test vehicle module oauth2test 2018-02-18 20:24:41 -05:00
Andrew Manning c444e40c01 Update code tag styling so bbcode [code] blocks and wiki markdown inline code render nicely. 2018-02-18 10:09:05 -05:00
Mario Vavti 547ef772ab Merge remote-tracking branch 'mike/master' into dev 2018-02-16 20:47:20 +01:00
zotlabs 27cd26ec1e extend the oauth2 storage driver so that we can use our own channel table 2018-02-15 18:47:56 -08:00
Mario Vavti 2216c3dd32 bump version 2018-02-15 19:41:24 +01:00
Mario Vavti 9e251a1abc some more DB tuning. 2018-02-15 19:24:15 +01:00
Mario Vavti 45b42cbc1c Merge remote-tracking branch 'mike/master' into dev 2018-02-15 09:00:52 +01:00
zotlabs c11ebd12d5 Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge 2018-02-14 15:37:35 -08:00
zotlabs 465d89129c provide option to block the public stream unless authenticated, since there could be legal issues with unmoderated content 2018-02-14 15:32:33 -08:00
Mario Vavti 0336082920 Merge remote-tracking branch 'mike/master' into dev 2018-02-14 10:29:36 +01:00
zotlabs 24da5d82db Merge branch 'share' 2018-02-13 20:09:55 -08:00
zotlabs 64809dd277 turn shares into activities - make certain to pull addons or JSON-LD will chuck a wobbly 2018-02-13 20:07:57 -08:00
zotlabs 6ca3442ba3 defperms: bad query 2018-02-13 12:13:37 -08:00
Mario Vavti 27baf46eb5 fix item link in fsprint 2018-02-13 12:33:49 +01:00
Mario Vavti d2dcb93866 match against item verb 2018-02-13 12:04:48 +01:00
Mario Vavti d826515ba8 since we only save the parent mid in notify we must look for thr_parent when dealing with likes 2018-02-13 11:01:58 +01:00
Mario Vavti b221c68e4b fix parent id for likes in status notifications. 2018-02-13 10:29:32 +01:00
zotlabs fd81a4bdc4 initial share refactor 2018-02-12 21:43:04 -08:00
Mario Vavti b7fb78245a if always_show_in_notices is set to 1 also show likes and dislikes 2018-02-12 22:48:53 +01:00
Mario Vavti 571a9642a5 slightly improve cropper style 2018-02-12 11:06:21 +01:00
Mario Vavti 9e2424ee76 fix issue with new cropping lib and whitespace 2018-02-12 10:43:20 +01:00
zotlabs 6d2661a8f7 the 'each' function (used in startup() to revert magic quotes) is deprecated in php7.2. Since magic quotes themselves have been deprecated as a default condition for several years, the cleaning of globals should no longer be required and was also removed. 2018-02-11 20:11:18 -08:00
zotlabs 0f8d2d4e58 Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge 2018-02-11 19:36:37 -08:00
zotlabs 63107f5b2f second part of hubzilla issue #972 2018-02-11 18:17:17 -08:00
zotlabs a31331bfd9 hubzilla issue #972 - provide system toggle to allow/disallow anonymous comments 2018-02-11 18:02:28 -08:00
zotlabs 07d33a1183 use new forum tag style in forum search postings 2018-02-11 15:34:34 -08:00
zotlabs 0dbb024c99 purify summary 2018-02-11 14:12:24 -08:00
git-marijus ba954b8cfe Merge pull request #976 from phellmes/time-ago-strings
more flexibility for relative date/time translations
2018-02-11 22:50:39 +01:00
Mario Vavti 3fa809ae79 this might seem rediculous but it helps mysql to find the better index for this query 2018-02-11 20:53:27 +01:00
phellmes 1a9c1ecfb1 update DE translation strings for new relative date/time options
temporary manual string update in relation to last commit
until changes reach Transifex and can be updated there
2018-02-11 17:01:47 +01:00
phellmes c6b2652c01 add flexibility to prefix/suffix string translations for jquery.timeago
In addition to use the defaults or any other translated strings this allows
now to force an empty string by setting the translation to NONE.
Translators can choose to either use prefixes only, suffixes only,
none of them or both of them - whatever sounds best in their language.
2018-02-11 16:08:34 +01:00
zotlabs 5a9ea29614 hubzilla issue #975 (searching for title as well as body could present a performance issue, so perhaps the tradeoffs should be debated) 2018-02-09 14:08:29 -08:00
Mario Vavti 6cc3294395 finally fix channel query 2018-02-09 20:36:14 +01:00
Mario Vavti 5f229d81e9 use distinct in channel item query and minor notification cache improvement 2018-02-09 14:06:59 +01:00
Mario Vavti cb70192f36 bump version 2018-02-09 10:36:43 +01:00
Mario Vavti 2227de5f65 Merge remote-tracking branch 'mike/master' into dev 2018-02-09 06:58:12 +01:00
zotlabs 3dfafb710c cosmetic 2018-02-08 21:32:18 -08:00
zotlabs 9f5d44fa32 turn the logs down again 2018-02-08 16:30:44 -08:00
zotlabs cd1e5d4171 zot6 testing 2018-02-08 16:22:10 -08:00
zotlabs beec49847f missing quote 2018-02-08 15:45:33 -08:00
zotlabs e4503f743e logging 2018-02-08 15:36:22 -08:00
zotlabs 635c5e532b z6 testing 2018-02-08 15:32:54 -08:00
Mario Vavti 384cb215be wrong link 2018-02-08 10:26:49 +01:00
Mario Vavti 9e64ce7da7 Merge remote-tracking branch 'mike/master' into dev 2018-02-08 10:12:04 +01:00
Mario Vavti 661c20e452 more db and queries finetuning 2018-02-08 09:47:49 +01:00
zotlabs 4c27fa5c37 debug the crypto function 2018-02-07 22:04:53 -08:00
zotlabs 6cf2e9945a encrypt the httpsig for zot6 transport 2018-02-07 21:53:47 -08:00
zotlabs b21a5c3ce9 compatibility: fallback to legacy zot if OWA succeeds but no data['msg'] is present 2018-02-07 20:17:32 -08:00
zotlabs 5057a4bd4c zot6 delivery work 2018-02-07 19:15:56 -08:00