aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'sabre32' of https://github.com/redmatrix/hubzilla into sabre32Mario Vavti2016-06-061785-413/+391
|\
| * Merge branch 'dev' into sabre32Mario Vavti2016-06-051785-413/+391
| |\
| | * provide a hover class for smiley emojis which renders them slightly larger on...redmatrix2016-06-042-1/+6
| | * another switch of type and ttyperedmatrix2016-06-041-1/+1
| | * the :tone variants are messed up, remove themredmatrix2016-06-041-0/+2
| | * return of the project smilieredmatrix2016-06-041-2/+3
| | * For emojis in posts, extend smilies and save a lot of duplication of effortredmatrix2016-06-044-14/+14
| | * short-term solution to emoji size issue - make them 32px from the senderredmatrix2016-06-041-1/+1
| | * cross-site encoding issue with tagsredmatrix2016-06-041-4/+2
| | * class functions called incorrectlyredmatrix2016-06-041-3/+3
| | * allow bbcode emojis (at least the single unicode character forms)redmatrix2016-06-031-0/+14
| | * App::init() should be staticredmatrix2016-06-031-1/+1
| | * need to set item_origin on locally created reactions so they propagate properlyredmatrix2016-06-031-0/+1
| | * missed table rename in event query in mod_manageredmatrix2016-06-031-5/+5
| | * allow any (current) emoji to be displayed on any site, and provide a default ...redmatrix2016-06-031775-15/+15
| | * turn emoji ability into a feature so that either a member or the site admin c...redmatrix2016-06-033-1/+3
| | * missed an object -> obj conversion in prepare_bodyredmatrix2016-06-031-1/+1
| | * stringsredmatrix2016-06-031-381/+336
* | | Merge branch 'sabre32' of https://github.com/redmatrix/hubzilla into sabre32Mario Vavti2016-06-03107-692/+755
|\| |
| * | Merge branch 'dev' into sabre32Mario Vavti2016-06-032-95/+95
| |\|
| | * some theming for emoji buttonMario Vavti2016-06-032-95/+95
| * | Merge branch 'dev' into sabre32Mario Vavti2016-06-0366-8/+146
| |\|
| | * restrict emoji reactions to the top level for now.redmatrix2016-06-021-0/+2
| | * menu entries for basic emoji support. I could use a bit of help theming this....redmatrix2016-06-022-0/+33
| | * experimental emoji supportredmatrix2016-06-0261-0/+52
| | * some initial emoji reaction workredmatrix2016-06-022-1/+6
| | * preserve app categories when updating a system appredmatrix2016-06-021-7/+25
| | * adjust algorithm to ensure new system apps are installed.redmatrix2016-06-021-3/+12
| | * install system apps if a) they have never been installed, or b) if the app ve...redmatrix2016-06-021-10/+29
| * | Merge branch 'dev' into sabre32Mario Vavti2016-06-0242-616/+541
| |\|
| | * check all return valuesredmatrix2016-06-011-1/+1
| | * the rest of the schema updates - WARNING: some third party plugins may fail; ...redmatrix2016-06-0142-616/+541
* | | Merge branch 'sabre32' of https://github.com/redmatrix/hubzilla into sabre32Mario Vavti2016-06-0146-461/+295
|\| |
| * | Merge branch 'dev' into sabre32Mario Vavti2016-06-0146-461/+295
| |\|
| | * more db column renamesredmatrix2016-05-3136-163/+210
| | * more removal of reserved words from DB schemasredmatrix2016-05-3112-37/+54
| | * provide a sort of mutex lock around db logging so it can't possibly recurse. ...redmatrix2016-05-312-10/+18
| | * don't remove missing hooks while update_r1169 is happpening - temp fixredmatrix2016-05-311-5/+8
| | * remove unused tablesredmatrix2016-05-305-258/+17
| * | Merge branch 'dev' into sabre32Mario Vavti2016-05-31360-55169/+272
| |\|
| * | Merge branch 'sabre32' of https://github.com/redmatrix/hubzilla into sabre32Mario Vavti2016-05-300-0/+0
| |\ \
| * \ \ Merge branch 'dev' into sabre32Mario Vavti2016-05-305-5/+7
| |\ \ \
* | \ \ \ Merge branch 'dev' into sabre32Mario Vavti2016-05-31360-55169/+272
|\ \ \ \ \ | |_|_|/ / |/| | | / | | |_|/ | |/| |
| * | | remove a bunch of unused stuff, some of which is orphaned and some which repr...redmatrix2016-05-30343-54949/+0
| * | | don't update hubloc_connected any more often than 15 minutes. We don't requir...redmatrix2016-05-301-5/+11
| * | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergeredmatrix2016-05-303-18/+21
| |\ \ \
| | * \ \ Merge pull request #405 from git-marijus/devhubzilla2016-05-313-18/+21
| | |\ \ \
| | | * | | render code bbcode inline if there are no linebreaks in the text.Mario Vavti2016-05-303-18/+21
| | | | |/ | | | |/|
| * | | | start removing reserved words from database column names (this run: addon and...redmatrix2016-05-3010-33/+51
| * | | | begin moving config to zotlabs. Leave procedural stubs for backward comaptibi...redmatrix2016-05-302-144/+183
| |/ / /