| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge https://github.com/friendica/red into pending_merge | friendica | 2014-12-21 | 21 | -103/+1708 |
| |\ | |||||
| | * | Merge pull request #757 from git-marijus/master | RedMatrix | 2014-12-22 | 10 | -63/+75 |
| | |\ | | | | | | | files: make mod/filestorage.php load via ajax and some design work. work... | ||||
| | | * | fix button visibility | marijus | 2014-12-21 | 1 | -3/+6 |
| | | | | |||||
| | | * | forgot to git add files | marijus | 2014-12-21 | 2 | -0/+15 |
| | | | | |||||
| | | * | files: make mod/filestorage.php load via ajax and some design work. work in ↵ | marijus | 2014-12-21 | 8 | -63/+57 |
| | | | | | | | | | | | | | progress... | ||||
| | * | | Merge pull request #756 from encyclomundi/master | RedMatrix | 2014-12-22 | 1 | -1/+1 |
| | |\ \ | | | | | | | | | change address book to connections | ||||
| | | * | | change address book to connections | Charles | 2014-12-21 | 1 | -1/+1 |
| | | | | | |||||
| | * | | | Merge pull request #755 from pafcu/docfix | RedMatrix | 2014-12-22 | 1 | -1/+1 |
| | |\ \ \ | | | | | | | | | | | Fix issue #752 | ||||
| | | * | | | Fix issue #752 | Stefan Parviainen | 2014-12-21 | 1 | -1/+1 |
| | | | | | | |||||
| | * | | | | Merge pull request #754 from pafcu/categoryinput | RedMatrix | 2014-12-22 | 9 | -36/+1629 |
| | |\ \ \ \ | | | | | | | | | | | | | Fancy categories input in editor | ||||
| | | * | | | | Add bootstrap-tagsinput library | Stefan Parviainen | 2014-12-21 | 5 | -0/+1589 |
| | | | | | | | |||||
| | | * | | | | Fancy categories input with bootstrap-tagsinput | Stefan Parviainen | 2014-12-21 | 4 | -36/+40 |
| | | |/ / / | |||||
| | * | | | | Merge pull request #753 from pafcu/autocomplete | RedMatrix | 2014-12-22 | 1 | -2/+2 |
| | |\ \ \ \ | | |_|_|/ | |/| | | | Correct domain for smily requests | ||||
| | | * | | | Fix whitespace disappearing at the beginning of completed smily | Stefan Parviainen | 2014-12-21 | 1 | -1/+1 |
| | | | | | | |||||
| | | * | | | Correct domain for smily requests | Stefan Parviainen | 2014-12-21 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | fix double encoding of homepage in profile activity - not as ↵ | friendica | 2014-12-21 | 4 | -3/+8 |
| |/ / / / | | | | | | | | | | | | | straight-forward as it looked | ||||
| * | / / | Merge pull request #751 from pafcu/autocomplete | RedMatrix | 2014-12-21 | 1 | -1/+9 |
| |\| | | | |/ / |/| | | Autocomplete smilies | ||||
| | * | | 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 |
| |\ \ | |||||
 |
index : volse-hubzilla.git | |
| Volse Hubzilla -- soft fork of main Hubzilla core for Volse | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |