aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'dev' into sabre32Mario Vavti2016-06-1010-3504/+3553
|\
| * strings updateredmatrix2016-06-101-3447/+3449
| * foreach: invalid argumentredmatrix2016-06-092-14/+16
| * change loglevelredmatrix2016-06-091-1/+1
| * several "to-do" updatesredmatrix2016-06-093-22/+9
| * add safemode toolredmatrix2016-06-091-0/+1
| * Create the initial 1.8 changelog entry (subject to further changes)redmatrix2016-06-091-0/+69
| * remove the automatic ajax page load on pgdn key; it can load content much fas...redmatrix2016-06-091-16/+0
| * namespace issue with openid reverse authredmatrix2016-06-091-4/+4
| * allow an exclusion for transmitting hidden file activities. There may be a be...redmatrix2016-06-091-1/+5
* | more style workMario Vavti2016-06-092-2/+12
* | Merge branch 'sabre32' of https://github.com/redmatrix/hubzilla into sabre32Mario Vavti2016-06-092-0/+12
|\ \
| * | Merge branch 'dev' into sabre32Mario Vavti2016-06-0925-6391/+6420
| |\|
| | * issue #59redmatrix2016-06-081-0/+7
| | * potential fix to hubzilla-addons issue 16redmatrix2016-06-081-0/+5
| * | Merge branch 'sabre32' of https://github.com/redmatrix/hubzilla into sabre32Mario Vavti2016-06-061785-413/+391
| |\ \
| * \ \ Merge branch 'sabre32' of https://github.com/redmatrix/hubzilla into sabre32Mario Vavti2016-06-03107-692/+755
| |\ \ \
| * \ \ \ Merge branch 'sabre32' of https://github.com/redmatrix/hubzilla into sabre32Mario Vavti2016-06-0146-461/+295
| |\ \ \ \
| * \ \ \ \ Merge branch 'dev' into sabre32Mario Vavti2016-05-31360-55169/+272
| |\ \ \ \ \
* | \ \ \ \ \ Merge branch 'dev' into sabre32Mario Vavti2016-06-0811-397/+470
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| * | | | | | block random_profile from accessing sys channelsredmatrix2016-06-071-1/+2
| * | | | | | whitespaceredmatrix2016-06-071-2/+5
| * | | | | | Finish the config familyredmatrix2016-06-076-369/+442
| * | | | | | slight alteration to the base descriptionredmatrix2016-06-071-2/+2
| * | | | | | 'recent photos' query was buggered, also fix issue #163 by adding configurabl...redmatrix2016-06-073-25/+21
* | | | | | | Merge branch 'dev' into sabre32Mario Vavti2016-06-076-49/+95
|\| | | | | |
| * | | | | | rename admin/users to admin/accounts, provide sortable columns in account and...redmatrix2016-06-064-48/+68
| * | | | | | new utility: util/safemode (on or off); requires util/addonsredmatrix2016-06-062-1/+27
* | | | | | | Merge branch 'dev' into sabre32Mario Vavti2016-06-069-5948/+5846
|\| | | | | | | |_|_|_|_|/ |/| | | | |
| * | | | | adjust the autocomplete regex slightly to account for emoji namesredmatrix2016-06-051-1/+1
| * | | | | move pconfig to static classredmatrix2016-06-052-174/+195
| * | | | | We need a laugh icon more than we need a cry icon.redmatrix2016-06-051-1/+1
| * | | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergeredmatrix2016-06-054-5772/+5642
| |\ \ \ \ \
| | * | | | | Updating NL + es_ES stringsjeroenpraat2016-06-064-5772/+5642
| * | | | | | I don't know how to make this any clearer: "For these reasons we strongly rec...redmatrix2016-06-051-0/+7
| |/ / / / /
* | | | | / 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