43992dc463
do not show summary if it is equal to body and some styling for the summary/article toggle links
2018-02-19 14:11:58 +01:00
fac5d81790
Merge pull request #981 from anaqreon/dev
...
Update code tag styling so bbcode [code] blocks and wiki markdown ...
2018-02-19 11:11:31 +01:00
b56633e1d6
Merge pull request #980 from dawnbreak/dev
...
Refactor OAuth2Server a bit.
2018-02-19 11:11:08 +01:00
1732ffed7a
backport update 1201 to the new update system and move dummy update to 1202
2018-02-19 10:59:21 +01:00
c444e40c01
Update code tag styling so bbcode [code] blocks and wiki markdown inline code render nicely.
2018-02-18 10:09:05 -05:00
46cb45d94b
crypto improvements (use pkcs1_oaep_padding instead of the older pkcs1_padding)
2018-02-16 18:45:15 -08:00
4a5d1076ed
Refactor OAuth2Server a bit.
2018-02-17 01:49:01 +01:00
4e6072fb29
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge
2018-02-16 16:42:45 -08:00
f492f808f4
refactor of the DB update system. Updates are now stored individually in Zotlabs/Update/_nnnn.php and are objects; so only the pending updates need to be loaded and executed rather than all historical updates. There is one single number (DB_UPDATE_VERSION) representing the current version and it is EQUAL TO the last known update. A dummy update _1201 was created to address the difference in counting behaviour; it will be executed on the next change of DB_UPDATE_VERSION as well as the next update. The database config values are also loaded from disk on every update immediately before setting the update lock in order to reduce timing conflicts and race conditions.
2018-02-16 12:42:02 -08:00
547ef772ab
Merge remote-tracking branch 'mike/master' into dev
2018-02-16 20:47:20 +01:00
27cd26ec1e
extend the oauth2 storage driver so that we can use our own channel table
2018-02-15 18:47:56 -08:00
2216c3dd32
bump version
2018-02-15 19:41:24 +01:00
9e251a1abc
some more DB tuning.
2018-02-15 19:24:15 +01:00
45b42cbc1c
Merge remote-tracking branch 'mike/master' into dev
2018-02-15 09:00:52 +01:00
c11ebd12d5
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge
2018-02-14 15:37:35 -08:00
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
0336082920
Merge remote-tracking branch 'mike/master' into dev
2018-02-14 10:29:36 +01:00
24da5d82db
Merge branch 'share'
2018-02-13 20:09:55 -08:00
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
6ca3442ba3
defperms: bad query
2018-02-13 12:13:37 -08:00
27baf46eb5
fix item link in fsprint
2018-02-13 12:33:49 +01:00
d2dcb93866
match against item verb
2018-02-13 12:04:48 +01:00
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
b221c68e4b
fix parent id for likes in status notifications.
2018-02-13 10:29:32 +01:00
fd81a4bdc4
initial share refactor
2018-02-12 21:43:04 -08:00
b7fb78245a
if always_show_in_notices is set to 1 also show likes and dislikes
2018-02-12 22:48:53 +01:00
571a9642a5
slightly improve cropper style
2018-02-12 11:06:21 +01:00
9e2424ee76
fix issue with new cropping lib and whitespace
2018-02-12 10:43:20 +01:00
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
0f8d2d4e58
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge
2018-02-11 19:36:37 -08:00
63107f5b2f
second part of hubzilla issue #972
2018-02-11 18:17:17 -08:00
a31331bfd9
hubzilla issue #972 - provide system toggle to allow/disallow anonymous comments
2018-02-11 18:02:28 -08:00
07d33a1183
use new forum tag style in forum search postings
2018-02-11 15:34:34 -08:00
0dbb024c99
purify summary
2018-02-11 14:12:24 -08:00
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
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
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
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
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
6cc3294395
finally fix channel query
2018-02-09 20:36:14 +01:00
5f229d81e9
use distinct in channel item query and minor notification cache improvement
2018-02-09 14:06:59 +01:00
cb70192f36
bump version
2018-02-09 10:36:43 +01:00
2227de5f65
Merge remote-tracking branch 'mike/master' into dev
2018-02-09 06:58:12 +01:00
3dfafb710c
cosmetic
2018-02-08 21:32:18 -08:00
9f5d44fa32
turn the logs down again
2018-02-08 16:30:44 -08:00
cd1e5d4171
zot6 testing
2018-02-08 16:22:10 -08:00
beec49847f
missing quote
2018-02-08 15:45:33 -08:00
e4503f743e
logging
2018-02-08 15:36:22 -08:00
635c5e532b
z6 testing
2018-02-08 15:32:54 -08:00
384cb215be
wrong link
2018-02-08 10:26:49 +01:00
Mario Vavti
Andrew Manning
zotlabs
Klaus Weidenbach
phellmes