| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'upstream' | marijus | 2014-02-05 | 0 | -0/+0 |
| |\ | |||||
| | * | Merge branch 'master' of https://github.com/friendica/red into upstream | marijus | 2014-02-05 | 143 | -3694/+5472 |
| | |\ | |||||
| | * | | comment out since it is not clear if this is not implemented yet or obsolete | marijus | 2014-01-31 | 1 | -2/+2 |
| | | | | |||||
| * | | | add a sanitized style tag to bbcode | marijus | 2014-02-05 | 2 | -0/+59 |
| | | | | |||||
| * | | | Merge branch 'master' of https://github.com/friendica/red | marijus | 2014-02-05 | 23 | -26/+244 |
| |\ \ \ | | |/ | |/| | |||||
| | * | | preserve system bit when editing menus | friendica | 2014-02-05 | 2 | -1/+8 |
| | | | | |||||
| | * | | bookmarking bugfix | friendica | 2014-02-05 | 2 | -7/+10 |
| | | | | |||||
| | * | | bookmark debug logging | friendica | 2014-02-05 | 3 | -7/+9 |
| | | | | |||||
| | * | | make links in comments bookmark-able | friendica | 2014-02-04 | 4 | -5/+11 |
| | | | | |||||
| | * | | add icon translation for new icon | friendica | 2014-02-04 | 1 | -0/+1 |
| | | | | |||||
| | * | | bookmarks - mop up and go home | friendica | 2014-02-04 | 9 | -5/+66 |
| | | | | |||||
| | * | | bookmarking | friendica | 2014-02-04 | 7 | -15/+126 |
| | | | | |||||
| | * | | fix the search for system bookmarks | friendica | 2014-02-04 | 1 | -3/+9 |
| | | | | |||||
| | * | | Merge https://github.com/friendica/red into zpull | friendica | 2014-02-04 | 2 | -1134/+1188 |
| | |\ \ | |||||
| | * | | | bookmark permissions | friendica | 2014-02-04 | 8 | -4/+25 |
| | | | | | |||||
| * | | | | Merge branch 'master' of https://github.com/friendica/red | marijus | 2014-02-04 | 12 | -1161/+1270 |
| |\ \ \ \ | | |/ / | |/| | | |||||
| | * | | | Merge pull request #301 from tobiasd/20140204 | tobiasd | 2014-02-03 | 2 | -1134/+1188 |
| | |\ \ \ | | |/ / | |/| | | DE: update to the strings | ||||
| | | * | | DE: update to the strings | Tobias Diekershoff | 2014-02-04 | 2 | -1134/+1188 |
| | |/ / | |||||
| | * | | photo tagging somewhat working - but can't remove photo tags until we update ↵ | friendica | 2014-02-03 | 2 | -7/+27 |
| | | | | | | | | | | | | | tagrm | ||||
| | * | | some tagging fixes - including old bugs which were never reported | friendica | 2014-02-03 | 2 | -6/+6 |
| | | | | |||||
| | * | | transmit, receive, and parse bookmarks | friendica | 2014-02-03 | 4 | -10/+39 |
| | | | | |||||
| | * | | accept new connection broke yesterday | friendica | 2014-02-03 | 4 | -4/+10 |
| | | | | |||||
| * | | | Merge branch 'master' of https://github.com/friendica/red | marijus | 2014-02-03 | 2 | -37/+1 |
| |\| | | |||||
| | * | | code cleanup - remove some unused functions | friendica | 2014-02-03 | 2 | -37/+1 |
| | | | | |||||
| * | | | Merge branch 'master' of https://github.com/friendica/red | marijus | 2014-02-03 | 19 | -95/+221 |
| |\| | | |||||
| | * | | The problem with a lot of packages is that it's easier to re-write them than ↵ | friendica | 2014-02-02 | 2 | -4/+39 |
| | | | | | | | | | | | | | to re-use them. | ||||
| | * | | more wordsmithing | friendica | 2014-02-02 | 1 | -1/+1 |
| | | | | |||||
| | * | | changed order of the privacy macros so that the dangerous settings come last ↵ | friendica | 2014-02-02 | 1 | -1/+1 |
| | | | | | | | | | | | | | and the preferred settings come first | ||||
| | * | | don't load any configs from DB if installing - especially in style.pcss | friendica | 2014-02-02 | 3 | -6/+11 |
| | | | | |||||
| | * | | wordsmithing | friendica | 2014-02-02 | 1 | -4/+4 |
| | | | | |||||
| | * | | don't draw attention to advanced permissions and their corresponding ↵ | friendica | 2014-02-02 | 6 | -24/+62 |
| | | | | | | | | | | | | | complexity and clearly mark the simple permissions which people are encouraged to use. | ||||
| | * | | Merge pull request #300 from tazmandevil/master | friendica | 2014-02-02 | 2 | -3/+43 |
| | |\ \ | | | | | | | | | added Thomas' additional navbar colours from APW to redbasic | ||||
| | | * | | added Thomas' additional navbar colours from APW to redbasic | Tazman DeVille | 2014-02-03 | 2 | -3/+43 |
| | |/ / | |||||
| | * | | minor text change "can" -> "may" | friendica | 2014-02-02 | 1 | -2/+2 |
| | | | | |||||
| | * | | Add switch to allow menus to be used as bookmark collections | friendica | 2014-02-02 | 3 | -2/+6 |
| | | | | |||||
| | * | | remove the text "requires compatible chat plugin" | friendica | 2014-02-02 | 1 | -1/+1 |
| | | | | |||||
| | * | | make chat honour the pause key (but we still need to ping the server to ↵ | friendica | 2014-02-02 | 3 | -51/+55 |
| | | | | | | | | | | | | | maintain the in_room status), also the recent change to pull css out of the template file used classes instead of ids so none of the styles were sticking | ||||
| * | | | Merge branch 'master' of https://github.com/friendica/red | marijus | 2014-02-02 | 3 | -10/+21 |
| |\| | | |||||
| | * | | better check for setup module | friendica | 2014-02-02 | 1 | -1/+1 |
| | | | | |||||
| | * | | Merge https://github.com/friendica/red into zpull | friendica | 2014-02-02 | 4 | -20/+44 |
| | |\ \ | |||||
| | * | | | some windows fixes | friendica | 2014-02-02 | 3 | -10/+21 |
| | | | | | |||||
| * | | | | Merge branch 'master' of https://github.com/friendica/red | marijus | 2014-02-02 | 1 | -10/+8 |
| |\ \ \ \ | | |/ / | |/| | | |||||
| | * | | | Merge pull request #299 from toclimb/smilies-fix | friendica | 2014-02-02 | 1 | -10/+8 |
| | |\ \ \ | | | | | | | | | | | More efficient smilie replacing (see pull request #291) | ||||
| | | * | | | More efficient smilie replacing | toclimb | 2014-02-02 | 1 | -10/+8 |
| | | |/ / | |||||
| * | | | | Merge branch 'master' of https://github.com/friendica/red | marijus | 2014-02-02 | 3 | -10/+36 |
| |\| | | | |||||
| | * | | | Merge pull request #297 from tazmandevil/master | Thomas Willingham | 2014-02-02 | 1 | -1/+1 |
| | |\ \ \ | | | | | | | | | | | link hover colour remains user set link_colour (w/o change default,Mike) | ||||
| | | * | | | link hover colour remains user set link_colour (w/o change default, | Tazman DeVille | 2014-02-02 | 1 | -1/+1 |
| | | |/ / | | | | | | | | | | | | | Mike) | ||||
| | * / / | Move CSS out of chat template | Thomas Willingham | 2014-02-02 | 2 | -9/+35 |
| | |/ / | |||||
| * | | | Merge branch 'master' of https://github.com/friendica/red | marijus | 2014-02-02 | 13 | -24/+87 |
| |\| | | |||||
| | * | | add links to change chat status and leave room | friendica | 2014-02-02 | 4 | -16/+36 |
| | | | | |||||
 |
index : volse-hubzilla.git | |
| Volse Hubzilla -- soft fork of main Hubzilla core for Volse | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |