Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2018-02-19 | 12 | -66/+128 | |
|\ | ||||||
| * | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2018-02-19 | 1 | -1/+15 | |
| |\ | ||||||
| * | | updates 1201 and 1200 should return success for postgres. notifications: ↵ | Mario Vavti | 2018-02-19 | 4 | -8/+18 | |
| | | | | | | | | | | | | remove class show and session storage entry when we mark all notifications seen | |||||
| * | | do not show summary if it is equal to body and some styling for the ↵ | Mario Vavti | 2018-02-19 | 3 | -2/+13 | |
| | | | | | | | | | | | | summary/article toggle links | |||||
| * | | Merge pull request #981 from anaqreon/dev | git-marijus | 2018-02-19 | 2 | -2/+29 | |
| |\ \ | | | | | | | | | Update code tag styling so bbcode [code] blocks and wiki markdown ... | |||||
| | * | | Update code tag styling so bbcode [code] blocks and wiki markdown inline ↵ | Andrew Manning | 2018-02-18 | 2 | -2/+29 | |
| | | | | | | | | | | | | | | | | code render nicely. | |||||
| * | | | Merge pull request #980 from dawnbreak/dev | git-marijus | 2018-02-19 | 3 | -53/+44 | |
| |\ \ \ | | | | | | | | | | | Refactor OAuth2Server a bit. | |||||
| | * | | | Refactor OAuth2Server a bit. | Klaus Weidenbach | 2018-02-17 | 3 | -53/+44 | |
| | |/ / | ||||||
| * | | | backport update 1201 to the new update system and move dummy update to 1202 | Mario Vavti | 2018-02-19 | 2 | -5/+28 | |
| | | | | ||||||
* | | | | OAEP padding mismatch on some newer encryption methods | zotlabs | 2018-02-19 | 2 | -9/+7 | |
| | | | | ||||||
* | | | | more logging | zotlabs | 2018-02-19 | 1 | -0/+1 | |
| | | | | ||||||
* | | | | add logging | zotlabs | 2018-02-19 | 1 | -0/+2 | |
| | | | | ||||||
* | | | | and fix the typo | zotlabs | 2018-02-19 | 1 | -1/+1 | |
| | | | | ||||||
* | | | | fix the fix for precision | zotlabs | 2018-02-19 | 1 | -1/+1 | |
| |_|/ |/| | | ||||||
* | | | target zot6 deliveries with more precision to ensure we handle a very ↵ | zotlabs | 2018-02-19 | 1 | -1/+15 | |
|/ / | | | | | | | precise type of content until the mechanism is extended to other types in the future | |||||
* | | crypto improvements (use pkcs1_oaep_padding instead of the older pkcs1_padding) | zotlabs | 2018-02-16 | 1 | -5/+22 | |
| | | ||||||
* | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2018-02-16 | 4 | -11/+13 | |
|\| | ||||||
| * | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2018-02-16 | 4 | -54/+171 | |
| |\ | ||||||
| * | | bump version | Mario Vavti | 2018-02-15 | 1 | -1/+1 | |
| | | | ||||||
| * | | some more DB tuning. | Mario Vavti | 2018-02-15 | 5 | -11/+29 | |
| | | | ||||||
| * | | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2018-02-15 | 8 | -12/+41 | |
| |\ \ | ||||||
* | | | | refactor of the DB update system. Updates are now stored individually in ↵ | zotlabs | 2018-02-16 | 205 | -3214/+4585 | |
| |_|/ |/| | | | | | | | | 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. | |||||
* | | | extend the oauth2 storage driver so that we can use our own channel table | zotlabs | 2018-02-15 | 4 | -54/+171 | |
| | | | ||||||
* | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2018-02-14 | 3 | -9/+30 | |
|\| | | |/ |/| | ||||||
| * | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2018-02-14 | 4 | -2/+162 | |
| |\ | ||||||
| * | | fix item link in fsprint | Mario Vavti | 2018-02-13 | 1 | -1/+1 | |
| | | | ||||||
| * | | match against item verb | Mario Vavti | 2018-02-13 | 1 | -4/+4 | |
| | | | ||||||
| * | | since we only save the parent mid in notify we must look for thr_parent when ↵ | Mario Vavti | 2018-02-13 | 2 | -2/+13 | |
| | | | | | | | | | | | | dealing with likes | |||||
| * | | fix parent id for likes in status notifications. | Mario Vavti | 2018-02-13 | 1 | -2/+12 | |
| | | | ||||||
* | | | provide option to block the public stream unless authenticated, since there ↵ | zotlabs | 2018-02-14 | 8 | -12/+41 | |
| |/ |/| | | | | | could be legal issues with unmoderated content | |||||
* | | Merge branch 'share' | zotlabs | 2018-02-13 | 3 | -1/+161 | |
|\ \ | ||||||
| * | | turn shares into activities - make certain to pull addons or JSON-LD will ↵ | zotlabs | 2018-02-13 | 3 | -4/+149 | |
| | | | | | | | | | | | | chuck a wobbly | |||||
| * | | initial share refactor | zotlabs | 2018-02-12 | 1 | -1/+16 | |
| |/ | ||||||
* / | defperms: bad query | zotlabs | 2018-02-13 | 1 | -1/+1 | |
|/ | ||||||
* | if always_show_in_notices is set to 1 also show likes and dislikes | Mario Vavti | 2018-02-12 | 1 | -15/+28 | |
| | ||||||
* | slightly improve cropper style | Mario Vavti | 2018-02-12 | 3 | -11/+14 | |
| | ||||||
* | fix issue with new cropping lib and whitespace | Mario Vavti | 2018-02-12 | 2 | -24/+22 | |
| | ||||||
* | the 'each' function (used in startup() to revert magic quotes) is deprecated ↵ | zotlabs | 2018-02-11 | 1 | -23/+0 | |
| | | | | 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. | |||||
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2018-02-11 | 25 | -405/+516 | |
|\ | ||||||
| * | Merge pull request #976 from phellmes/time-ago-strings | git-marijus | 2018-02-11 | 3 | -34/+40 | |
| |\ | | | | | | | more flexibility for relative date/time translations | |||||
| | * | update DE translation strings for new relative date/time options | phellmes | 2018-02-11 | 2 | -30/+30 | |
| | | | | | | | | | | | | | | | temporary manual string update in relation to last commit until changes reach Transifex and can be updated there | |||||
| | * | add flexibility to prefix/suffix string translations for jquery.timeago | phellmes | 2018-02-11 | 1 | -4/+10 | |
| | | | | | | | | | | | | | | | | | | | | | 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. | |||||
| * | | this might seem rediculous but it helps mysql to find the better index for ↵ | Mario Vavti | 2018-02-11 | 1 | -1/+1 | |
| |/ | | | | | | | this query | |||||
| * | finally fix channel query | Mario Vavti | 2018-02-09 | 1 | -4/+4 | |
| | | ||||||
| * | use distinct in channel item query and minor notification cache improvement | Mario Vavti | 2018-02-09 | 2 | -5/+7 | |
| | | ||||||
| * | bump version | Mario Vavti | 2018-02-09 | 1 | -1/+1 | |
| | | ||||||
| * | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2018-02-09 | 4 | -15/+204 | |
| |\ | ||||||
| * | | wrong link | Mario Vavti | 2018-02-08 | 1 | -1/+1 | |
| | | | ||||||
| * | | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2018-02-08 | 1 | -44/+0 | |
| |\ \ | ||||||
| * | | | more db and queries finetuning | Mario Vavti | 2018-02-08 | 4 | -18/+32 | |
| | | | |