aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'upstream/master' into autocompleteStefan Parviainen2014-12-2110-43/+75
|\
| * Merge https://github.com/friendica/red into pending_mergefriendica2014-12-2013-218/+1210
| |\
| | * Merge pull request #749 from pafcu/hijackingdocfixRedMatrix2014-12-211-1/+1
| | |\ | | | | | | | | protect_tag_hijacking (incorrect) -> prevent_tag_hijacking in docs (corr...
| | | * protect_tag_hijacking (incorrect) -> prevent_tag_hijacking in docs (correct)Stefan Parviainen2014-12-201-1/+1
| | | |
| | * | Merge pull request #748 from pafcu/smilyjsonRedMatrix2014-12-212-32/+51
| | |\ \ | | | | | | | | | | Access list of smilies over JSON
| | | * | Access list of smilies over JSONStefan Parviainen2014-12-202-32/+51
| | | | |
| | * | | Merge pull request #747 from pafcu/autocompleteRedMatrix2014-12-214-176/+1136
| | |\ \ \ | | | | | | | | | | | | Better contact autocomplete based on jquery-textcomplete
| | * | | | Oopsie in GermanThomas Willingham2014-12-201-1/+1
| | | | | |
| | * | | | Doco - fix some tags.Thomas Willingham2014-12-205-9/+12
| | | |_|/ | | |/| |
| | * | | Merge branch 'master' of https://github.com/friendica/redThomas Willingham2014-12-2075-3688/+4234
| | |\ \ \ | | | | |/ | | | |/|
| | * | | More FAQThomas Willingham2014-12-201-0/+10
| | | | |
| * | | | rev updatefriendica2014-12-201-1/+1
| | |/ / | |/| |
* | | | Autocomplete smiliesStefan Parviainen2014-12-201-1/+9
| |_|/ |/| |
* | | Remove unnecessary loggingStefan Parviainen2014-12-201-3/+1
| | |
* | | Better autocomplete based on jquery-textcompleteStefan Parviainen2014-12-204-176/+1138
|/ /
* | provide link to help for channel permission roles when creating a channelfriendica2014-12-193-0/+7
| |
* | doc updatesfriendica2014-12-1970-3681/+4195
| |
* | incorrect check for sys ownershipfriendica2014-12-191-4/+5
| |
* | Merge https://github.com/friendica/red into pending_mergefriendica2014-12-181-4/+3
|\|
| * My links are also out of date.Thomas Willingham2014-12-181-3/+3
| |
| * deleted a dead linkOliver2014-12-181-1/+0
| |
* | mod/import: try ten times to create a unique webbie if the chosen one is in use.friendica2014-12-182-4/+28
|/
* make the size of directory photos fixed so that the screen doesn't jump ↵friendica2014-12-171-0/+2
| | | | around when loading.
* allow a variety of latitude/longitude delimiters since nobody can agree on them.friendica2014-12-171-1/+3
|
* This needs a lot more cleanup but at least it's a bit more complete now.friendica2014-12-171-16/+101
|
* minor clarifications on a few settingsfriendica2014-12-171-9/+10
|
* Merge https://github.com/friendica/red into pending_mergefriendica2014-12-171-0/+13
|\
| * Doco - another handful of configsThomas Willingham2014-12-171-0/+13
| |
* | ability to generate arbitrary map with [ map=lat/lon] and also free form ↵friendica2014-12-172-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_mergefriendica2014-12-172-1183/+1199
|\
| * update nlJeroen2014-12-172-1183/+1199
| |
* | make unique hub filter more robust and straight-forward so it's easier to ↵friendica2014-12-171-7/+25
|/ | | | understand and debug since it's such a critical piece of the delivery chain
* Merge https://github.com/friendica/red into pending_mergefriendica2014-12-172-3/+3
|\
| * fix label of preview buttonmarijus2014-12-172-2/+2
| |
| * fix editing of postsmarijus2014-12-171-1/+1
| |
* | critical notifier fix to make diaspora delivery work reliably again. If ↵friendica2014-12-172-19/+12
|/ | | | everything breaks revert or debug.
* essentials for creating a "block-style" list-mode page such as one might ↵friendica2014-12-163-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 anomoliesfriendica2014-12-165-6/+8
|
* call collapseHeight when neededfriendica2014-12-162-0/+5
|
* add divmore to directory entriesfriendica2014-12-163-3/+4
|
* Add [ map ] element to bbcode, no closing tag. Requires a map generator ↵friendica2014-12-162-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_mergefriendica2014-12-162-2/+7
|\
| * Minor docoThomas Willingham2014-12-162-2/+7
| |
* | edit and preview removed from additional features and turned into core ↵friendica2014-12-167-11/+10
| | | | | | | | functionality (always enabled).
* | build a channel based thread viewing link when in list_mode and when using ↵friendica2014-12-162-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 ↵friendica2014-12-164-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_mergefriendica2014-12-1512-1212/+1260
|\
| * Merge branch 'master' of https://github.com/friendica/redThomas Willingham2014-12-151-1/+4
| |\
| | * Merge pull request #746 from pafcu/autofollowdocThomas Willingham2014-12-151-1/+4
| | |\ | | | | | | | | Document the auto_follow option
| | | * Document the auto_follow optionStefan Parviainen2014-12-151-1/+4
| | | |