Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | Update connections.tpl | mrjive | 2018-01-29 | 1 | -1/+1 | |
| | | | | | | ||||||
| * | | | | | Merge pull request #12 from redmatrix/dev | mrjive | 2018-01-26 | 28 | -1004/+999 | |
| |\ \ \ \ \ | | | | | | | | | | | | | | | Dev | |||||
| * \ \ \ \ \ | Merge pull request #11 from redmatrix/dev | mrjive | 2018-01-24 | 171 | -9879/+35010 | |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | Dev | |||||
| * \ \ \ \ \ \ | Merge pull request #10 from redmatrix/dev | mrjive | 2018-01-22 | 26 | -300/+274 | |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Dev | |||||
| * \ \ \ \ \ \ \ | Merge pull request #8 from redmatrix/dev | mrjive | 2018-01-18 | 1 | -1/+3 | |
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | section-content-info-wrapper for register text | |||||
| * \ \ \ \ \ \ \ \ | Merge pull request #7 from redmatrix/dev | mrjive | 2018-01-16 | 569 | -20244/+34966 | |
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | Dev | |||||
* | \ \ \ \ \ \ \ \ \ | Merge pull request #999 from mjfriaza/dev | git-marijus | 2018-03-13 | 2 | -9/+9 | |
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | Spanish translation: adapted the new timeago's stuff | |||||
| * | | | | | | | | | | Spanish translation: adapted the new timeago's stuff | Manuel Jiménez Friaza | 2018-03-13 | 2 | -9/+9 | |
| | | | | | | | | | | | ||||||
* | | | | | | | | | | | Merge pull request #997 from mjfriaza/dev | git-marijus | 2018-03-13 | 2 | -5/+5 | |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Spanish translation: added "el" before "artículo", which is the correct construction | |||||
| * | | | | | | | | | | Spanish translation: added el before artículo, which is the correct ↵ | Manuel Jiménez Friaza | 2018-03-11 | 2 | -5/+5 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | construction. | |||||
* | | | | | | | | | | | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2018-03-13 | 6 | -6/+46 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | unicode/emoji usernames. Warning: experimental feature, unstable, untested, ↵ | zotlabs | 2018-03-12 | 4 | -6/+36 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | disabled by default, use at your own risk, may not federate to other platforms and protocols. May not clone correctly. Bug reports which neglect to include detailed roubleshooting information and patches/pull requests will be ignored. | |||||
| * | | | | | | | | | | | obscure permission issue with custom permissions when using the highly ↵ | zotlabs | 2018-03-12 | 2 | -0/+10 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | discouraged advisory privacy modes | |||||
* | | | | | | | | | | | | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2018-03-12 | 4 | -20/+30 | |
|\| | | | | | | | | | | | ||||||
| * | | | | | | | | | | | Setup - .htconfig.php write access is now required for automated ↵ | zotlabs | 2018-03-11 | 1 | -8/+12 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | installation. [String change - leave in dev for the next release] | |||||
| * | | | | | | | | | | | remove debugging | zotlabs | 2018-03-10 | 1 | -2/+0 | |
| | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | trim expects error ... in admin/site | zotlabs | 2018-03-10 | 3 | -13/+20 | |
| | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | update mysql schema | Mario Vavti | 2018-03-11 | 1 | -3/+0 | |
| | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | do not use trim on array | Mario Vavti | 2018-03-10 | 1 | -1/+1 | |
| | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | update changelog | Mario Vavti | 2018-03-09 | 1 | -1/+1 | |
| | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | Merge pull request #994 from Reylak/dev | git-marijus | 2018-03-09 | 1 | -15/+30 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | RedBasic theme dark schema update | |||||
| * | | | | | | | | | | | | Uniformize title input with other input fields | Mathieu "Matbac" Bacou | 2018-03-08 | 1 | -0/+4 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add rounded corners to mimic categories input field and main text area. | |||||
| * | | | | | | | | | | | | Remove useless background spec for category field | Mathieu "Matbac" Bacou | 2018-03-08 | 1 | -1/+0 | |
| | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | Fix background of tags field | Mathieu "Matbac" Bacou | 2018-03-08 | 1 | -15/+23 | |
| | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | Fix code background in wiki pages | Mathieu "Thrar" Bacou | 2018-03-08 | 1 | -0/+4 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix needed after commit c444e40c016c0faaec604335093b19661b3585b7 | |||||
* | | | | | | | | | | | | | remove redundant comma | Mario Vavti | 2018-03-09 | 1 | -1/+1 | |
| | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2018-03-09 | 2 | -2/+2 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| / / / / / / / / / / / | |/ / / / / / / / / / / | ||||||
| * | | | | | | | | | | | notifications-btn-1 does not actually require the text-white class and this ↵ | zotlabs | 2018-03-08 | 2 | -2/+2 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | is known to cause issues on dark themes | |||||
* | | | | | | | | | | | | use dbunescbin() for cover photos | Mario | 2018-03-08 | 1 | -1/+1 | |
| | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | fix syntax error in postgres update | Mario | 2018-03-08 | 1 | -3/+3 | |
| | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2018-03-08 | 6 | -3/+74 | |
|\| | | | | | | | | | | | ||||||
| * | | | | | | | | | | | remove extraneous logging | zotlabs | 2018-03-07 | 1 | -3/+1 | |
| | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | hashtag autocomplete | zotlabs | 2018-03-07 | 2 | -1/+44 | |
| | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | federated polls: GNU-Social requires us to preserve the original order of ↵ | zotlabs | 2018-03-07 | 4 | -2/+32 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the poll answers for use in making a vote, unlike diaspora (which selects by guid) and activitypub (which selects by non-localisable text). | |||||
* | | | | | | | | | | | | we need the javascript in the template since strings are involved | Mario Vavti | 2018-03-07 | 6 | -162/+181 | |
| | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | more bootstrap accordion fixes | Mario Vavti | 2018-03-07 | 2 | -10/+10 | |
| | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | we do not support separate mobile themes anymore | Mario Vavti | 2018-03-07 | 2 | -8/+8 | |
|/ / / / / / / / / / / | ||||||
* | | | | | | | | | | | federated polls: add poll_author which will be necessary for Diaspora federation | zotlabs | 2018-03-06 | 4 | -1/+31 | |
| | | | | | | | | | | | ||||||
* | | | | | | | | | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2018-03-06 | 2 | -0/+144 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | update changelog | Mario Vavti | 2018-03-06 | 1 | -0/+126 | |
| | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | Merge pull request #991 from anaqreon/dev | git-marijus | 2018-03-06 | 1 | -0/+18 | |
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve rendering of Readme files in plugin settings | |||||
| | * | | | | | | | | | | | Improve rendering of Readme files in plugin settings | Andrew Manning | 2018-03-05 | 1 | -0/+18 | |
| |/ / / / / / / / / / / | ||||||
* / / / / / / / / / / / | don't add pending connections to the default privacy group until accepted | zotlabs | 2018-03-06 | 1 | -7/+10 | |
|/ / / / / / / / / / / | ||||||
* | | | | | | | | | | | add pdl file for mod moderate | Mario Vavti | 2018-03-05 | 1 | -0/+4 | |
| | | | | | | | | | | | ||||||
* | | | | | | | | | | | fix javascript error if there are no notifications | Mario Vavti | 2018-03-05 | 1 | -2/+1 | |
| | | | | | | | | | | | ||||||
* | | | | | | | | | | | update redbasic theme screenshot | Mario Vavti | 2018-03-05 | 2 | -0/+0 | |
| | | | | | | | | | | | ||||||
* | | | | | | | | | | | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2018-03-05 | 6 | -18/+54 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | fix some issues with friend suggestions on standalone sites with no ↵ | zotlabs | 2018-03-04 | 4 | -9/+16 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'suggestme' volunteers. This wrongly pulled up a site directory suggesting everybody on the site. While a better outcome than finding nobody, this does not fit with our ethical design goals. If there are no friends of friends, we will only suggest those who volunteer to be on the default suggestion list. Also do not attempt to load poco data from dead sites. | |||||
| * | | | | | | | | | | | bugfix: unable to reset profile fields to defaults in admin/profs by ↵ | zotlabs | 2018-03-04 | 2 | -9/+31 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | emptying the textarea | |||||
| * | | | | | | | | | | | restrict mail messages to max_import_size | zotlabs | 2018-03-04 | 1 | -0/+7 | |
| | | | | | | | | | | | |