| Commit message (Expand) | Author | Age | Files | Lines |
... | |
| | * | | | | | | | | | | | | Merge remote-tracking branch 'upstream/dev' into wiki | Andrew Manning | 2016-05-27 | 152 | -5312/+4411 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ |
|
| | * | | | | | | | | | | | | | Delete wiki (in progress) | Andrew Manning | 2016-05-24 | 4 | -19/+89 |
| | * | | | | | | | | | | | | | List of wikis populates with links according to observer permissions. | Andrew Manning | 2016-05-21 | 5 | -13/+39 |
| | * | | | | | | | | | | | | | Successful new wiki git repo and item table record | Andrew Manning | 2016-05-21 | 5 | -82/+103 |
| | * | | | | | | | | | | | | | Forgot some templates | Andrew Manning | 2016-05-21 | 2 | -0/+21 |
| | * | | | | | | | | | | | | | Trying to fix wiki branch starting fresh from dev | Andrew Manning | 2016-05-21 | 454 | -0/+3459 |
* | | | | | | | | | | | | | | | Merge branch 'dev' into sabre32 | Mario Vavti | 2016-06-10 | 10 | -3504/+3553 |
|\| | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | strings update | redmatrix | 2016-06-10 | 1 | -3447/+3449 |
| * | | | | | | | | | | | | | | foreach: invalid argument | redmatrix | 2016-06-09 | 2 | -14/+16 |
| * | | | | | | | | | | | | | | change loglevel | redmatrix | 2016-06-09 | 1 | -1/+1 |
| * | | | | | | | | | | | | | | several "to-do" updates | redmatrix | 2016-06-09 | 3 | -22/+9 |
| * | | | | | | | | | | | | | | add safemode tool | redmatrix | 2016-06-09 | 1 | -0/+1 |
| * | | | | | | | | | | | | | | Create the initial 1.8 changelog entry (subject to further changes) | redmatrix | 2016-06-09 | 1 | -0/+69 |
| | |_|_|_|_|_|_|_|_|_|_|_|/
| |/| | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | remove the automatic ajax page load on pgdn key; it can load content much fas... | redmatrix | 2016-06-09 | 1 | -16/+0 |
| * | | | | | | | | | | | | | namespace issue with openid reverse auth | redmatrix | 2016-06-09 | 1 | -4/+4 |
| * | | | | | | | | | | | | | allow an exclusion for transmitting hidden file activities. There may be a be... | redmatrix | 2016-06-09 | 1 | -1/+5 |
* | | | | | | | | | | | | | | 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 |
| | |_|_|_|_|_|_|_|_|/
| |/| | | | | | | | | |
|