Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'upstream/master' into autocomplete | Stefan Parviainen | 2014-12-21 | 10 | -43/+75 |
|\ | |||||
| * | Merge https://github.com/friendica/red into pending_merge | friendica | 2014-12-20 | 13 | -218/+1210 |
| |\ | |||||
| | * | Merge pull request #749 from pafcu/hijackingdocfix | RedMatrix | 2014-12-21 | 1 | -1/+1 |
| | |\ | | | | | | | | | protect_tag_hijacking (incorrect) -> prevent_tag_hijacking in docs (corr... | ||||
| | | * | protect_tag_hijacking (incorrect) -> prevent_tag_hijacking in docs (correct) | Stefan Parviainen | 2014-12-20 | 1 | -1/+1 |
| | | | | |||||
| | * | | Merge pull request #748 from pafcu/smilyjson | RedMatrix | 2014-12-21 | 2 | -32/+51 |
| | |\ \ | | | | | | | | | | | Access list of smilies over JSON | ||||
| | | * | | Access list of smilies over JSON | Stefan Parviainen | 2014-12-20 | 2 | -32/+51 |
| | | | | | |||||
| | * | | | Merge pull request #747 from pafcu/autocomplete | RedMatrix | 2014-12-21 | 4 | -176/+1136 |
| | |\ \ \ | | | | | | | | | | | | | Better contact autocomplete based on jquery-textcomplete | ||||
| | * | | | | Oopsie in German | Thomas Willingham | 2014-12-20 | 1 | -1/+1 |
| | | | | | | |||||
| | * | | | | Doco - fix some tags. | Thomas Willingham | 2014-12-20 | 5 | -9/+12 |
| | | |_|/ | | |/| | | |||||
| | * | | | Merge branch 'master' of https://github.com/friendica/red | Thomas Willingham | 2014-12-20 | 75 | -3688/+4234 |
| | |\ \ \ | | | | |/ | | | |/| | |||||
| | * | | | More FAQ | Thomas Willingham | 2014-12-20 | 1 | -0/+10 |
| | | | | | |||||
| * | | | | rev update | friendica | 2014-12-20 | 1 | -1/+1 |
| | |/ / | |/| | | |||||
* | | | | Autocomplete smilies | Stefan Parviainen | 2014-12-20 | 1 | -1/+9 |
| |_|/ |/| | | |||||
* | | | Remove unnecessary logging | Stefan Parviainen | 2014-12-20 | 1 | -3/+1 |
| | | | |||||
* | | | Better autocomplete based on jquery-textcomplete | Stefan Parviainen | 2014-12-20 | 4 | -176/+1138 |
|/ / | |||||
* | | provide link to help for channel permission roles when creating a channel | friendica | 2014-12-19 | 3 | -0/+7 |
| | | |||||
* | | doc updates | friendica | 2014-12-19 | 70 | -3681/+4195 |
| | | |||||
* | | incorrect check for sys ownership | friendica | 2014-12-19 | 1 | -4/+5 |
| | | |||||
* | | Merge https://github.com/friendica/red into pending_merge | friendica | 2014-12-18 | 1 | -4/+3 |
|\| | |||||
| * | My links are also out of date. | Thomas Willingham | 2014-12-18 | 1 | -3/+3 |
| | | |||||
| * | deleted a dead link | Oliver | 2014-12-18 | 1 | -1/+0 |
| | | |||||
* | | mod/import: try ten times to create a unique webbie if the chosen one is in use. | friendica | 2014-12-18 | 2 | -4/+28 |
|/ | |||||
* | make the size of directory photos fixed so that the screen doesn't jump ↵ | friendica | 2014-12-17 | 1 | -0/+2 |
| | | | | around when loading. | ||||
* | allow a variety of latitude/longitude delimiters since nobody can agree on them. | friendica | 2014-12-17 | 1 | -1/+3 |
| | |||||
* | This needs a lot more cleanup but at least it's a bit more complete now. | friendica | 2014-12-17 | 1 | -16/+101 |
| | |||||
* | minor clarifications on a few settings | friendica | 2014-12-17 | 1 | -9/+10 |
| | |||||
* | Merge https://github.com/friendica/red into pending_merge | friendica | 2014-12-17 | 1 | -0/+13 |
|\ | |||||
| * | Doco - another handful of configs | Thomas Willingham | 2014-12-17 | 1 | -0/+13 |
| | | |||||
* | | ability to generate arbitrary map with [ map=lat/lon] and also free form ↵ | friendica | 2014-12-17 | 2 | -0/+25 |
|/ | | | | location using [ map]somewhere[/map] but the second one currently has no plugins available to generate it. | ||||
* | Merge https://github.com/friendica/red into pending_merge | friendica | 2014-12-17 | 2 | -1183/+1199 |
|\ | |||||
| * | update nl | Jeroen | 2014-12-17 | 2 | -1183/+1199 |
| | | |||||
* | | make unique hub filter more robust and straight-forward so it's easier to ↵ | friendica | 2014-12-17 | 1 | -7/+25 |
|/ | | | | understand and debug since it's such a critical piece of the delivery chain | ||||
* | Merge https://github.com/friendica/red into pending_merge | friendica | 2014-12-17 | 2 | -3/+3 |
|\ | |||||
| * | fix label of preview button | marijus | 2014-12-17 | 2 | -2/+2 |
| | | |||||
| * | fix editing of posts | marijus | 2014-12-17 | 1 | -1/+1 |
| | | |||||
* | | critical notifier fix to make diaspora delivery work reliably again. If ↵ | friendica | 2014-12-17 | 2 | -19/+12 |
|/ | | | | everything breaks revert or debug. | ||||
* | essentials for creating a "block-style" list-mode page such as one might ↵ | friendica | 2014-12-16 | 3 | -2/+22 |
| | | | | have for a pinterest-style layout. Just load view/theme/redbasic/css/blockmode.css after redbasic PCSS - you're done. We may need some other indicator besides the number of comments to indicate "click here to see the rest of the article", but we're a bit short on space so maybe a view icon will work. | ||||
* | fix some directory anomolies | friendica | 2014-12-16 | 5 | -6/+8 |
| | |||||
* | call collapseHeight when needed | friendica | 2014-12-16 | 2 | -0/+5 |
| | |||||
* | add divmore to directory entries | friendica | 2014-12-16 | 3 | -3/+4 |
| | |||||
* | Add [ map ] element to bbcode, no closing tag. Requires a map generator ↵ | friendica | 2014-12-16 | 2 | -0/+22 |
| | | | | plugin (like openstreetmap which was just updated) and also requires that the author has browser location enabled. | ||||
* | Merge https://github.com/friendica/red into pending_merge | friendica | 2014-12-16 | 2 | -2/+7 |
|\ | |||||
| * | Minor doco | Thomas Willingham | 2014-12-16 | 2 | -2/+7 |
| | | |||||
* | | edit and preview removed from additional features and turned into core ↵ | friendica | 2014-12-16 | 7 | -11/+10 |
| | | | | | | | | functionality (always enabled). | ||||
* | | build a channel based thread viewing link when in list_mode and when using ↵ | friendica | 2014-12-16 | 2 | -2/+10 |
|/ | | | | the channel module, which will disable list_mode (this was checked in yesterday) for the benefit of viewing threads with the correct identities and comment permissions instead of relying on the semi-random uid chosen by mod/display when viewed by an authenticated remote_user(). | ||||
* | add Thomas's Diaspora repair script as include/fixd.php - altered so it can ↵ | friendica | 2014-12-16 | 4 | -17/+51 |
| | | | | | | 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 | 12 | -1212/+1260 |
|\ | |||||
| * | Merge branch 'master' of https://github.com/friendica/red | Thomas Willingham | 2014-12-15 | 1 | -1/+4 |
| |\ | |||||
| | * | Merge pull request #746 from pafcu/autofollowdoc | Thomas Willingham | 2014-12-15 | 1 | -1/+4 |
| | |\ | | | | | | | | | Document the auto_follow option | ||||
| | | * | Document the auto_follow option | Stefan Parviainen | 2014-12-15 | 1 | -1/+4 |
| | | | |