| Commit message (Expand) | Author | Age | Files | Lines |
* | more style work | Mario Vavti | 2016-06-09 | 2 | -2/+12 |
* | Merge branch 'sabre32' of https://github.com/redmatrix/hubzilla into sabre32 | Mario Vavti | 2016-06-09 | 2 | -0/+12 |
|\ |
|
| * | Merge branch 'dev' into sabre32 | Mario Vavti | 2016-06-09 | 25 | -6391/+6420 |
| |\ |
|
| | * | issue #59 | redmatrix | 2016-06-08 | 1 | -0/+7 |
| | * | potential fix to hubzilla-addons issue 16 | redmatrix | 2016-06-08 | 1 | -0/+5 |
| * | | Merge branch 'sabre32' of https://github.com/redmatrix/hubzilla into sabre32 | Mario Vavti | 2016-06-06 | 1785 | -413/+391 |
| |\ \ |
|
| * \ \ | Merge branch 'sabre32' of https://github.com/redmatrix/hubzilla into sabre32 | Mario Vavti | 2016-06-03 | 107 | -692/+755 |
| |\ \ \ |
|
| * \ \ \ | Merge branch 'sabre32' of https://github.com/redmatrix/hubzilla into sabre32 | Mario Vavti | 2016-06-01 | 46 | -461/+295 |
| |\ \ \ \ |
|
| * \ \ \ \ | Merge branch 'dev' into sabre32 | Mario Vavti | 2016-05-31 | 360 | -55169/+272 |
| |\ \ \ \ \ |
|
* | \ \ \ \ \ | Merge branch 'dev' into sabre32 | Mario Vavti | 2016-06-08 | 11 | -397/+470 |
|\ \ \ \ \ \ \
| | |_|_|_|_|/
| |/| | | | | |
|
| * | | | | | | block random_profile from accessing sys channels | redmatrix | 2016-06-07 | 1 | -1/+2 |
| * | | | | | | whitespace | redmatrix | 2016-06-07 | 1 | -2/+5 |
| * | | | | | | Finish the config family | redmatrix | 2016-06-07 | 6 | -369/+442 |
| * | | | | | | slight alteration to the base description | redmatrix | 2016-06-07 | 1 | -2/+2 |
| * | | | | | | 'recent photos' query was buggered, also fix issue #163 by adding configurabl... | redmatrix | 2016-06-07 | 3 | -25/+21 |
* | | | | | | | Merge branch 'dev' into sabre32 | Mario Vavti | 2016-06-07 | 6 | -49/+95 |
|\| | | | | | |
|
| * | | | | | | rename admin/users to admin/accounts, provide sortable columns in account and... | redmatrix | 2016-06-06 | 4 | -48/+68 |
| * | | | | | | new utility: util/safemode (on or off); requires util/addons | redmatrix | 2016-06-06 | 2 | -1/+27 |
* | | | | | | | 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 |