aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* Merge remote-tracking branch 'mike/master' into devMario Vavti2018-02-202-3/+3
|\
| * copy/paste error resulting in bad behaviourzotlabs2018-02-201-1/+1
| * don't try to handle OAEP for plugin crypto methods; let them do it if desiredzotlabs2018-02-201-2/+2
* | Merge remote-tracking branch 'mike/master' into devMario Vavti2018-02-201-1/+6
|\|
| * encrypt/decrypt function not foundzotlabs2018-02-201-1/+6
* | remove order by clauseMario Vavti2018-02-201-1/+1
* | missing fileMario Vavti2018-02-201-0/+29
* | more index finetuning to fix the expire queryMario Vavti2018-02-202-5/+5
|/
* Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2018-02-1912-66/+128
|\
| * Merge remote-tracking branch 'mike/master' into devMario Vavti2018-02-191-1/+15
| |\
| * | updates 1201 and 1200 should return success for postgres. notifications: remo...Mario Vavti2018-02-194-8/+18
| * | do not show summary if it is equal to body and some styling for the summary/a...Mario Vavti2018-02-193-2/+13
| * | Merge pull request #981 from anaqreon/devgit-marijus2018-02-192-2/+29
| |\ \
| | * | Update code tag styling so bbcode [code] blocks and wiki markdown inline code...Andrew Manning2018-02-182-2/+29
| * | | Merge pull request #980 from dawnbreak/devgit-marijus2018-02-193-53/+44
| |\ \ \
| | * | | Refactor OAuth2Server a bit.Klaus Weidenbach2018-02-173-53/+44
| | |/ /
| * | | backport update 1201 to the new update system and move dummy update to 1202Mario Vavti2018-02-192-5/+28
* | | | OAEP padding mismatch on some newer encryption methodszotlabs2018-02-192-9/+7
* | | | more loggingzotlabs2018-02-191-0/+1
* | | | add loggingzotlabs2018-02-191-0/+2
* | | | and fix the typozotlabs2018-02-191-1/+1
* | | | fix the fix for precisionzotlabs2018-02-191-1/+1
| |_|/ |/| |
* | | target zot6 deliveries with more precision to ensure we handle a very precise...zotlabs2018-02-191-1/+15
|/ /
* | crypto improvements (use pkcs1_oaep_padding instead of the older pkcs1_padding)zotlabs2018-02-161-5/+22
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2018-02-164-11/+13
|\|
| * Merge remote-tracking branch 'mike/master' into devMario Vavti2018-02-164-54/+171
| |\
| * | bump versionMario Vavti2018-02-151-1/+1
| * | some more DB tuning.Mario Vavti2018-02-155-11/+29
| * | Merge remote-tracking branch 'mike/master' into devMario Vavti2018-02-158-12/+41
| |\ \
* | | | refactor of the DB update system. Updates are now stored individually in Zotl...zotlabs2018-02-16205-3214/+4585
| |_|/ |/| |
* | | extend the oauth2 storage driver so that we can use our own channel tablezotlabs2018-02-154-54/+171
* | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2018-02-143-9/+30
|\| | | |/ |/|
| * Merge remote-tracking branch 'mike/master' into devMario Vavti2018-02-144-2/+162
| |\
| * | fix item link in fsprintMario Vavti2018-02-131-1/+1
| * | match against item verbMario Vavti2018-02-131-4/+4
| * | since we only save the parent mid in notify we must look for thr_parent when ...Mario Vavti2018-02-132-2/+13
| * | fix parent id for likes in status notifications.Mario Vavti2018-02-131-2/+12
* | | provide option to block the public stream unless authenticated, since there c...zotlabs2018-02-148-12/+41
| |/ |/|
* | Merge branch 'share'zotlabs2018-02-133-1/+161
|\ \
| * | turn shares into activities - make certain to pull addons or JSON-LD will chu...zotlabs2018-02-133-4/+149
| * | initial share refactorzotlabs2018-02-121-1/+16
| |/
* / defperms: bad queryzotlabs2018-02-131-1/+1
|/
* if always_show_in_notices is set to 1 also show likes and dislikesMario Vavti2018-02-121-15/+28
* slightly improve cropper styleMario Vavti2018-02-123-11/+14
* fix issue with new cropping lib and whitespaceMario Vavti2018-02-122-24/+22
* the 'each' function (used in startup() to revert magic quotes) is deprecated ...zotlabs2018-02-111-23/+0
* Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2018-02-1125-405/+516
|\
| * Merge pull request #976 from phellmes/time-ago-stringsgit-marijus2018-02-113-34/+40
| |\
| | * update DE translation strings for new relative date/time optionsphellmes2018-02-112-30/+30
| | * add flexibility to prefix/suffix string translations for jquery.timeagophellmes2018-02-111-4/+10