Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | | | | | | | | | | | | Merge branch 'dev' into sabre32 | Mario Vavti | 2016-06-06 | 9 | -5948/+5846 | |
|\| | | | | | | | | | | | | | | | | |_|_|_|_|/ / / / / / / / / / / |/| | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | adjust the autocomplete regex slightly to account for emoji names | redmatrix | 2016-06-05 | 1 | -1/+1 | |
| * | | | | | | | | | | | | | | | move pconfig to static class | redmatrix | 2016-06-05 | 2 | -174/+195 | |
| * | | | | | | | | | | | | | | | We need a laugh icon more than we need a cry icon. | redmatrix | 2016-06-05 | 1 | -1/+1 | |
| | |_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | redmatrix | 2016-06-05 | 4 | -5772/+5642 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | | Updating NL + es_ES strings | jeroenpraat | 2016-06-06 | 4 | -5772/+5642 | |
| | | |_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | ||||||
| * / | | | | | | | | | | | | | I don't know how to make this any clearer: "For these reasons we strongly rec... | redmatrix | 2016-06-05 | 1 | -0/+7 | |
| |/ / / / / / / / / / / / / | ||||||
* | | | | / / / / / / / / / | Merge branch 'dev' into sabre32 | Mario Vavti | 2016-06-05 | 1785 | -413/+391 | |
|\| | | | | | | | | | | | | | |_|_|_|/ / / / / / / / / |/| | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | provide a hover class for smiley emojis which renders them slightly larger on... | redmatrix | 2016-06-04 | 2 | -1/+6 | |
| * | | | | | | | | | | | | another switch of type and ttype | redmatrix | 2016-06-04 | 1 | -1/+1 | |
| * | | | | | | | | | | | | the :tone variants are messed up, remove them | redmatrix | 2016-06-04 | 1 | -0/+2 | |
| * | | | | | | | | | | | | return of the project smilie | redmatrix | 2016-06-04 | 1 | -2/+3 | |
| * | | | | | | | | | | | | For emojis in posts, extend smilies and save a lot of duplication of effort | redmatrix | 2016-06-04 | 4 | -14/+14 | |
| * | | | | | | | | | | | | short-term solution to emoji size issue - make them 32px from the sender | redmatrix | 2016-06-04 | 1 | -1/+1 | |
| * | | | | | | | | | | | | cross-site encoding issue with tags | redmatrix | 2016-06-04 | 1 | -4/+2 | |
| | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | ||||||
| * | | | | | | | | | | | class functions called incorrectly | redmatrix | 2016-06-04 | 1 | -3/+3 | |
| | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | ||||||
| * | | | | | | | | | | allow bbcode emojis (at least the single unicode character forms) | redmatrix | 2016-06-03 | 1 | -0/+14 | |
| * | | | | | | | | | | App::init() should be static | redmatrix | 2016-06-03 | 1 | -1/+1 | |
| * | | | | | | | | | | need to set item_origin on locally created reactions so they propagate properly | redmatrix | 2016-06-03 | 1 | -0/+1 | |
| * | | | | | | | | | | missed table rename in event query in mod_manage | redmatrix | 2016-06-03 | 1 | -5/+5 | |
| * | | | | | | | | | | allow any (current) emoji to be displayed on any site, and provide a default ... | redmatrix | 2016-06-03 | 1775 | -15/+15 | |
| * | | | | | | | | | | turn emoji ability into a feature so that either a member or the site admin c... | redmatrix | 2016-06-03 | 3 | -1/+3 | |
| * | | | | | | | | | | missed an object -> obj conversion in prepare_body | redmatrix | 2016-06-03 | 1 | -1/+1 | |
| * | | | | | | | | | | strings | redmatrix | 2016-06-03 | 1 | -381/+336 | |
* | | | | | | | | | | | Merge branch 'dev' into sabre32 | Mario Vavti | 2016-06-03 | 2 | -95/+95 | |
|\| | | | | | | | | | | ||||||
| * | | | | | | | | | | some theming for emoji button | Mario Vavti | 2016-06-03 | 2 | -95/+95 | |
* | | | | | | | | | | | Merge branch 'dev' into sabre32 | Mario Vavti | 2016-06-03 | 66 | -8/+146 | |
|\| | | | | | | | | | | ||||||
| * | | | | | | | | | | restrict emoji reactions to the top level for now. | redmatrix | 2016-06-02 | 1 | -0/+2 | |
| * | | | | | | | | | | menu entries for basic emoji support. I could use a bit of help theming this.... | redmatrix | 2016-06-02 | 2 | -0/+33 | |
| * | | | | | | | | | | experimental emoji support | redmatrix | 2016-06-02 | 61 | -0/+52 | |
| | |_|_|_|_|_|_|_|/ | |/| | | | | | | | | ||||||
| * | | | | | | | | | some initial emoji reaction work | redmatrix | 2016-06-02 | 2 | -1/+6 | |
| * | | | | | | | | | preserve app categories when updating a system app | redmatrix | 2016-06-02 | 1 | -7/+25 | |
| * | | | | | | | | | adjust algorithm to ensure new system apps are installed. | redmatrix | 2016-06-02 | 1 | -3/+12 | |
| * | | | | | | | | | install system apps if a) they have never been installed, or b) if the app ve... | redmatrix | 2016-06-02 | 1 | -10/+29 | |
* | | | | | | | | | | Merge branch 'dev' into sabre32 | Mario Vavti | 2016-06-02 | 42 | -616/+541 | |
|\| | | | | | | | | | |_|_|/ / / / / / |/| | | | | | | | | ||||||
| * | | | | | | | | check all return values | redmatrix | 2016-06-01 | 1 | -1/+1 | |
| * | | | | | | | | the rest of the schema updates - WARNING: some third party plugins may fail; ... | redmatrix | 2016-06-01 | 42 | -616/+541 | |
* | | | | | | | | | Merge branch 'dev' into sabre32 | Mario Vavti | 2016-06-01 | 46 | -461/+295 | |
|\| | | | | | | | | ||||||
| * | | | | | | | | more db column renames | redmatrix | 2016-05-31 | 36 | -163/+210 | |
| * | | | | | | | | more removal of reserved words from DB schemas | redmatrix | 2016-05-31 | 12 | -37/+54 | |
| * | | | | | | | | provide a sort of mutex lock around db logging so it can't possibly recurse. ... | redmatrix | 2016-05-31 | 2 | -10/+18 | |
| * | | | | | | | | don't remove missing hooks while update_r1169 is happpening - temp fix | redmatrix | 2016-05-31 | 1 | -5/+8 | |
| * | | | | | | | | remove unused tables | redmatrix | 2016-05-30 | 5 | -258/+17 | |
| | |/ / / / / / | |/| | | | | | | ||||||
* | | | | | | | | Merge branch 'dev' into sabre32 | Mario Vavti | 2016-05-31 | 360 | -55169/+272 | |
|\| | | | | | | | ||||||
| * | | | | | | | remove a bunch of unused stuff, some of which is orphaned and some which repr... | redmatrix | 2016-05-30 | 343 | -54949/+0 | |
| * | | | | | | | don't update hubloc_connected any more often than 15 minutes. We don't requir... | redmatrix | 2016-05-30 | 1 | -5/+11 | |
| * | | | | | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | redmatrix | 2016-05-30 | 3 | -18/+21 | |
| |\ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ | Merge pull request #405 from git-marijus/dev | hubzilla | 2016-05-31 | 3 | -18/+21 | |
| | |\ \ \ \ \ \ \ | ||||||
| | | * | | | | | | | render code bbcode inline if there are no linebreaks in the text. | Mario Vavti | 2016-05-30 | 3 | -18/+21 | |
| | | | |_|_|_|_|/ | | | |/| | | | | | ||||||
| * | | | | | | | | start removing reserved words from database column names (this run: addon and... | redmatrix | 2016-05-30 | 10 | -33/+51 |