Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge https://github.com/friendica/red into pending_merge | friendica | 2014-12-26 | 1 | -3/+0 |
|\ | |||||
| * | Cruft left over from stuff we don't have anymore. | Thomas Willingham | 2014-12-26 | 1 | -3/+0 |
| | | |||||
* | | doc update | friendica | 2014-12-26 | 1 | -1/+1 |
|/ | |||||
* | Pass sitename to apps | Thomas Willingham | 2014-12-22 | 1 | -0/+1 |
| | |||||
* | provide last successful poll run time (using relative time) in siteinfo so ↵ | friendica | 2014-12-21 | 1 | -1/+5 |
| | | | | that we can tell folks that have no idea what we're talking about that their poller definitely isn't running and this is probably why nothing works correctly. | ||||
* | Merge https://github.com/friendica/red into pending_merge | friendica | 2014-12-21 | 1 | -1/+2 |
|\ | |||||
| * | files: make mod/filestorage.php load via ajax and some design work. work in ↵ | marijus | 2014-12-21 | 1 | -1/+2 |
| | | | | | | | | progress... | ||||
* | | fix double encoding of homepage in profile activity - not as ↵ | friendica | 2014-12-21 | 1 | -1/+1 |
|/ | | | | straight-forward as it looked | ||||
* | Access list of smilies over JSON | Stefan Parviainen | 2014-12-20 | 1 | -1/+13 |
| | |||||
* | provide link to help for channel permission roles when creating a channel | friendica | 2014-12-19 | 1 | -0/+2 |
| | |||||
* | incorrect check for sys ownership | friendica | 2014-12-19 | 1 | -4/+5 |
| | |||||
* | mod/import: try ten times to create a unique webbie if the chosen one is in use. | friendica | 2014-12-18 | 1 | -3/+27 |
| | |||||
* | fix some directory anomolies | friendica | 2014-12-16 | 1 | -1/+1 |
| | |||||
* | add divmore to directory entries | friendica | 2014-12-16 | 1 | -1/+2 |
| | |||||
* | Merge https://github.com/friendica/red into pending_merge | friendica | 2014-12-16 | 1 | -1/+1 |
|\ | |||||
| * | Minor doco | Thomas Willingham | 2014-12-16 | 1 | -1/+1 |
| | | |||||
* | | edit and preview removed from additional features and turned into core ↵ | friendica | 2014-12-16 | 4 | -4/+4 |
|/ | | | | functionality (always enabled). | ||||
* | add Thomas's Diaspora repair script as include/fixd.php - altered so it can ↵ | friendica | 2014-12-16 | 1 | -5/+4 |
| | | | | | | be re-run if necessary with a count of remaining hublocs to be fixed. Some sites are down so it probably can't ever get to zero. The check for a null join is quite an expensive query. It could block your DB for a couple minutes while it runs. Also some preliminary work on a means to take the channel module out of list/forum mode if a specific mid is requested. | ||||
* | Merge https://github.com/friendica/red into pending_merge | friendica | 2014-12-15 | 1 | -12/+27 |
|\ | |||||
| * | Issue #743 | Thomas Willingham | 2014-12-15 | 1 | -12/+27 |
| | | |||||
* | | wall tags | friendica | 2014-12-15 | 5 | -15/+33 |
|/ | |||||
* | Issue #739 | Thomas Willingham | 2014-12-13 | 1 | -1/+1 |
| | |||||
* | Missing '' | Thomas Willingham | 2014-12-10 | 1 | -1/+1 |
| | |||||
* | Bring back 'no special theme for mobile' | Thomas Willingham | 2014-12-10 | 1 | -6/+8 |
| | |||||
* | Make it clear that title and categories are optional | Stefan Parviainen | 2014-12-08 | 4 | -8/+8 |
| | |||||
* | Merge pull request #726 from pafcu/tagsinotherchannels | Thomas Willingham | 2014-12-08 | 1 | -259/+3 |
|\ | | | | | Show tags in other channels profile field to make it easier to navigate ... | ||||
| * | Show tags in other channels profile field to make it easier to navigate to ↵ | Stefan Parviainen | 2014-12-07 | 1 | -259/+3 |
| | | | | | | | | the channels | ||||
* | | Merge pull request #724 from pafcu/suggestionsindir | Thomas Willingham | 2014-12-08 | 1 | -3/+43 |
|\ \ | | | | | | | Show suggestions in directory | ||||
| * | | Suggestions in dir redux. Suggestions are now showed in directory if ↵ | Stefan Parviainen | 2014-12-07 | 1 | -2/+4 |
| | | | | | | | | | | | | suggest=1 parameter is given to directory. | ||||
| * | | Revert "Revert "Directory shows channel suggestions by default"" | Stefan Parviainen | 2014-12-07 | 1 | -2/+40 |
| |/ | | | | | | | This reverts commit bfde28f28eae1f4b00aac03b2714254d14ab7464. | ||||
* | | Merge pull request #723 from pafcu/diropts | Thomas Willingham | 2014-12-08 | 2 | -4/+4 |
|\ \ | | | | | | | Directory sorting as a dropdown, forum filter as checkbox, option to sor... | ||||
| * | | Directory sorting as a dropdown, forum filter as checkbox, option to sort ↵ | Stefan Parviainen | 2014-12-07 | 2 | -4/+4 |
| |/ | | | | | | | oldest first | ||||
* | | Put dir back - the fat lady didn't sing afterall. | Thomas Willingham | 2014-12-04 | 1 | -1/+1 |
| | | |||||
* | | Don't allow affinity of 0 in connedit. | Thomas Willingham | 2014-12-02 | 1 | -0/+1 |
| | | |||||
* | | The other half of 'any theme for any device'. Closes #71 | Thomas Willingham | 2014-11-30 | 1 | -6/+11 |
| | | |||||
* | | Handle included txt files (ie, install doco) as BBCode, otherwise it strips all | Thomas Willingham | 2014-11-30 | 1 | -1/+1 |
|/ | | | | | white space. Was going to use Markdown, but lots of not-markdown gets parsed then, so... | ||||
* | Merge remote-tracking branch 'upstream/master' | Habeas Codice | 2014-11-26 | 5 | -3/+43 |
|\ | |||||
| * | hide online presence maps to DNT | friendica | 2014-11-24 | 1 | -0/+3 |
| | | |||||
| * | add event export (this month) to event UI | friendica | 2014-11-24 | 1 | -0/+12 |
| | | |||||
| * | add link to search forums in the directory | friendica | 2014-11-23 | 1 | -0/+8 |
| | | |||||
| * | allow directory searches to be filtered by (public forums) and/or (! public ↵ | friendica | 2014-11-23 | 2 | -3/+17 |
| | | | | | | | | forums) | ||||
| * | Merge https://github.com/friendica/red into pending_merge | friendica | 2014-11-23 | 1 | -1/+3 |
| |\ | |||||
| * | | project roadmap | friendica | 2014-11-23 | 1 | -0/+3 |
| | | | |||||
* | | | fix true toggle | Habeas Codice | 2014-11-26 | 1 | -1/+2 |
| |/ |/| | |||||
* | | added dbdriver to siteinfo json to better track affected sites | Habeas Codice | 2014-11-22 | 1 | -1/+3 |
|/ | |||||
* | Merge remote-tracking branch 'upstream/master' | Habeas Codice | 2014-11-21 | 2 | -10/+174 |
|\ | |||||
| * | yet another option for the homepage | friendica | 2014-11-20 | 2 | -10/+174 |
| | | |||||
* | | implicit type conversion | Habeas Codice | 2014-11-21 | 1 | -1/+1 |
|/ | |||||
* | Merge remote-tracking branch 'upstream/master' | Habeas Codice | 2014-11-19 | 5 | -16/+20 |
|\ | |||||
| * | minor photo flag issue - and some more whitespace edits | friendica | 2014-11-19 | 1 | -1/+1 |
| | |