| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| | * | Merge branch 'dev' into sabre32 | Mario Vavti | 2016-06-28 | 1 | -1/+7 | |
| | |\ | ||||||
| | | * | fix month view in fullscreen mode | Mario Vavti | 2016-06-28 | 1 | -1/+7 | |
| | | | | ||||||
| | * | | erge branch 'dev' into sabre32 | Mario Vavti | 2016-06-28 | 2 | -8/+0 | |
| | |\| | ||||||
| | | * | update fullcalendar to version 2.8.0 | Mario Vavti | 2016-06-28 | 2 | -8/+0 | |
| | | | | ||||||
| | * | | Merge branch 'dev' into sabre32 | Mario Vavti | 2016-06-28 | 1 | -0/+3 | |
| | |\| | ||||||
| | | * | add letsencrypt x3 intermediate cert and new cert file, improve UX of new ↵ | redmatrix | 2016-06-27 | 1 | -0/+3 | |
| | | | | | | | | | | | | | registrations | |||||
| | * | | Merge branch 'dev' into sabre32 | Mario Vavti | 2016-06-26 | 2 | -3/+132 | |
| | |\| | ||||||
| | * | | Merge branch 'dev' into sabre32 | Mario Vavti | 2016-06-24 | 3 | -4/+4 | |
| | |\ \ | ||||||
| | * \ \ | Merge branch 'dev' into sabre32 | Mario Vavti | 2016-06-23 | 2 | -7/+7 | |
| | |\ \ \ | ||||||
| | * \ \ \ | erge branch 'dev' into sabre32 | Mario Vavti | 2016-06-22 | 3 | -24/+30 | |
| | |\ \ \ \ | ||||||
| | * \ \ \ \ | Merge branch 'dev' into sabre32 | Mario Vavti | 2016-06-21 | 2 | -14/+80 | |
| | |\ \ \ \ \ | ||||||
| | * \ \ \ \ \ | Merge branch 'dev' into sabre32 | Mario Vavti | 2016-06-20 | 37 | -86783/+61544 | |
| | |\ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ | Merge branch 'dev' into sabre32 | Mario Vavti | 2016-06-20 | 1 | -1/+1 | |
| | |\ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | return something so we can make a conclusion | Mario Vavti | 2016-06-19 | 1 | -0/+5 | |
| | | | | | | | | | | ||||||
| | * | | | | | | | | Merge branch 'dev' into sabre32 | Mario Vavti | 2016-06-19 | 9 | -0/+21512 | |
| | |\ \ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ \ | Merge branch 'dev' into sabre32 | Mario Vavti | 2016-06-18 | 1 | -1/+1 | |
| | |\ \ \ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ \ \ | Merge branch 'dev' into sabre32 | Mario Vavti | 2016-06-17 | 3 | -3/+8 | |
| | |\ \ \ \ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ \ \ \ | Merge branch 'dev' into sabre32 | Mario Vavti | 2016-06-16 | 2 | -0/+40 | |
| | |\ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ \ \ \ \ | mrge branch 'dev' into sabre32 | Mario Vavti | 2016-06-16 | 2 | -0/+8 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'dev' into sabre32 | Mario Vavti | 2016-06-16 | 2 | -1/+41 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | | css fix | Mario Vavti | 2016-06-14 | 1 | -0/+1 | |
| | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | css fixes | Mario Vavti | 2016-06-13 | 1 | -1/+4 | |
| | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | Merge branch 'dev' into sabre32 | Mario Vavti | 2016-06-13 | 3 | -0/+118 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'dev' into sabre32 | Mario Vavti | 2016-06-11 | 6 | -9051/+9048 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'dev' into sabre32 | Mario Vavti | 2016-06-10 | 6 | -1/+331 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'dev' into sabre32 | Mario Vavti | 2016-06-10 | 1 | -16/+0 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | | | | | | more style work | Mario Vavti | 2016-06-09 | 1 | -1/+11 | |
| | | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | Replace homemade table of content generator with existing jQuery plugin. Now ↵ | Andrew Manning | 2016-06-30 | 1 | -0/+2 | |
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | toc is linked to document headings. | |||||
| * | | | | | | | | | | | | | | | | | | Merge pull request #438 from anaqreon/wiki | hubzilla | 2016-06-26 | 1 | -2/+131 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Wiki post generation option and image embed tool | |||||
| | * | | | | | | | | | | | | | | | | | | A page name wrapped in double brackets is converted into a link to another ↵ | Andrew Manning | 2016-06-25 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | page in the current wiki | |||||
| | * | | | | | | | | | | | | | | | | | | Insert image links wherever cursor is in the editor | Andrew Manning | 2016-06-25 | 1 | -2/+2 | |
| | | | | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | | | | Merge remote-tracking branch 'upstream/dev' into wiki | Andrew Manning | 2016-06-25 | 4 | -10/+10 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | | | | Post generation about new wiki is optional, default is NOT to post. Fixed ↵ | Andrew Manning | 2016-06-25 | 1 | -1/+130 | |
| | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug in wiki creation. Added embed image dialog and album browser. | |||||
| * | | | | | | | | | | | | | | | | | | fix help link | Treer | 2016-06-26 | 1 | -1/+1 | |
| | |/ / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | add url permalink mf2 markup | Ben Roberts | 2016-06-24 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | p-author missing from embedded h-card in items | Ben Roberts | 2016-06-23 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | make dropdown-caret invoke the dropdown | redmatrix | 2016-06-23 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | redmatrix | 2016-06-23 | 1 | -6/+6 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | | microformats 2 for posts | Ben Roberts | 2016-06-22 | 1 | -6/+6 | |
| | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | code cleanup for profile_photos | redmatrix | 2016-06-23 | 1 | -1/+1 | |
| |/ / / / / / / / / / / / / / / / | ||||||
| * / / / / / / / / / / / / / / / | use the normal html escape for '@' in addresses rather than the high-plane ↵ | redmatrix | 2016-06-22 | 1 | -1/+1 | |
| |/ / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | unicode variant. This makes it copy-able, but not easily scrape-able. | |||||
| * | | | | | | | | | | | | | / | vcard spec changes | redmatrix | 2016-06-21 | 3 | -24/+30 | |
| | |_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | Merge pull request #429 from anaqreon/wiki | hubzilla | 2016-06-21 | 2 | -14/+80 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | Wiki page revision comparison viewer | |||||
| | * | | | | | | | | | | | | | Merge remote-tracking branch 'upstream/dev' into wiki | Andrew Manning | 2016-06-20 | 11 | -2/+21514 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | Do not change active page commit until user reverts the page | Andrew Manning | 2016-06-20 | 1 | -1/+2 | |
| | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | Merge remote-tracking branch 'upstream/dev' into wiki | Andrew Manning | 2016-06-17 | 3 | -3/+8 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|/ / / | | |/| | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | Wiki page revision comparison tool with diff displayed in modal dialog. ↵ | Andrew Manning | 2016-06-17 | 2 | -14/+79 | |
| | | |_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Leverages Diff class from http://code.stephenmorley.org/php/diff-implementation with license CC0 1.0 universal http://creativecommons.org/publicdomain/zero/1.0/legalcode | |||||
| * | | | | | | | | | | | | | Merge branch 'master' into dev | Mario Vavti | 2016-06-20 | 37 | -86783/+61544 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / |/| | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | hebrew hstrings.php was empty | redmatrix | 2016-06-18 | 1 | -0/+2317 | |
| | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | hebrew update | redmatrix | 2016-06-18 | 3 | -3548/+1311 | |
| | | | | | | | | | | | | | | ||||||
 |
index : volse-hubzilla.git | |
| Volse Hubzilla -- soft fork of main Hubzilla core for Volse | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |