aboutsummaryrefslogtreecommitdiffstats
path: root/view
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | | | | | | | Merge branch 'dev' into sabre32Mario Vavti2016-06-162-1/+41
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | css fixMario Vavti2016-06-141-0/+1
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | css fixesMario Vavti2016-06-131-1/+4
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Merge branch 'dev' into sabre32Mario Vavti2016-06-133-0/+118
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'dev' into sabre32Mario Vavti2016-06-116-9051/+9048
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'dev' into sabre32Mario Vavti2016-06-106-1/+331
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'dev' into sabre32Mario Vavti2016-06-101-16/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | more style workMario Vavti2016-06-091-1/+11
| | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | Replace homemade table of content generator with existing jQuery plugin. Now ↵Andrew Manning2016-06-301-0/+2
| |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | toc is linked to document headings.
* | | | | | | | | | | | | | | | | | Merge pull request #438 from anaqreon/wikihubzilla2016-06-261-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 Manning2016-06-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | page in the current wiki
| * | | | | | | | | | | | | | | | | | Insert image links wherever cursor is in the editorAndrew Manning2016-06-251-2/+2
| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Merge remote-tracking branch 'upstream/dev' into wikiAndrew Manning2016-06-254-10/+10
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Post generation about new wiki is optional, default is NOT to post. Fixed ↵Andrew Manning2016-06-251-1/+130
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug in wiki creation. Added embed image dialog and album browser.
* | | | | | | | | | | | | | | | | | fix help linkTreer2016-06-261-1/+1
| |/ / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | add url permalink mf2 markupBen Roberts2016-06-241-1/+1
| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | p-author missing from embedded h-card in itemsBen Roberts2016-06-231-1/+1
| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | make dropdown-caret invoke the dropdownredmatrix2016-06-231-1/+1
| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergeredmatrix2016-06-231-6/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | microformats 2 for postsBen Roberts2016-06-221-6/+6
| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | code cleanup for profile_photosredmatrix2016-06-231-1/+1
|/ / / / / / / / / / / / / / / /
* / / / / / / / / / / / / / / / use the normal html escape for '@' in addresses rather than the high-plane ↵redmatrix2016-06-221-1/+1
|/ / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | unicode variant. This makes it copy-able, but not easily scrape-able.
* | | | | | | | | | | | | | / vcard spec changesredmatrix2016-06-213-24/+30
| |_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | Merge pull request #429 from anaqreon/wikihubzilla2016-06-212-14/+80
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | Wiki page revision comparison viewer
| * | | | | | | | | | | | | Merge remote-tracking branch 'upstream/dev' into wikiAndrew Manning2016-06-2011-2/+21514
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | |
| * | | | | | | | | | | | | Do not change active page commit until user reverts the pageAndrew Manning2016-06-201-1/+2
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Merge remote-tracking branch 'upstream/dev' into wikiAndrew Manning2016-06-173-3/+8
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|/ / / | | |/| | | | | | | | | | |
| * | | | | | | | | | | | | Wiki page revision comparison tool with diff displayed in modal dialog. ↵Andrew Manning2016-06-172-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 devMario Vavti2016-06-2037-86783/+61544
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | hebrew hstrings.php was emptyredmatrix2016-06-181-0/+2317
| | | | | | | | | | | | |
| * | | | | | | | | | | | hebrew updateredmatrix2016-06-183-3548/+1311
| | | | | | | | | | | | |
| * | | | | | | | | | | | All languages up to date as far as they are updated. Added Hebrew (I saw no ↵jeroenpraat2016-06-1544-81254/+77509
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | RTL on my browser, but maybe that's a locale setting or else it's not yet implemented in HZ). Removed Esperanto and Czech (they where old ones from Friendica and are not on Transifex (yet)).
| * | | | | | | | | | | | Update DE translation stringsphellmes2016-06-152-5529/+5467
| | |_|_|_|_|/ / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | experimental rtl support; this will probably require a fair bit of work.redmatrix2016-06-191-1/+1
| |_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | |
* | | | | | | | | | | hebrew hstrings.php was emptyredmatrix2016-06-181-0/+2317
| | | | | | | | | | |
* | | | | | | | | | | hebrew translationroot2016-06-189-0/+19195
| |_|_|_|_|_|_|_|_|/ |/| | | | | | | | |
* | | | | | | | | | the text link to a thing will take you to the local thing page, both as a ↵redmatrix2016-06-171-1/+1
| |_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | link for editing and as a destination in case there is no thing photo. If there's a photo, the photo link will take you to the thing URL.
* | | | | | | | | only use height: auto for week and day viewMario Vavti2016-06-173-3/+8
| |/ / / / / / / |/| | | | | | |
* | | | | | | | show month view in full height in fullscreen viewMario Vavti2016-06-162-0/+40
| |_|_|_|_|_|/ |/| | | | | |
* | | | | | | fix scrollbarsMario Vavti2016-06-162-0/+8
| |_|_|_|_|/ |/| | | | |
* | | | | | Merge pull request #422 from anaqreon/wikihubzilla2016-06-161-1/+40
|\ \ \ \ \ \ | | | | | | | | | | | | | | Wiki rename page feature added. Bug fixes related to git commits.
| * | | | | | Rename page feature added. Fixed bug in git commit function and other minor ↵Andrew Manning2016-06-151-1/+40
| | |_|_|_|/ | |/| | | | | | | | | | | | | | | | fixes.
* / | | | | provide syntax based [colour] highlighting on code blocks for popular ↵redmatrix2016-06-151-0/+1
|/ / / / / | | | | | | | | | | | | | | | languages. I'm not happy with the line height on the list elements but couldn't see where this was defaulted. This uses the syntax [code=xxx]some code snippet[/code], where xxx represents a code/language style - with about 18 builtins.
* | | | | Move javascript functions back to jot-header.tplAndrew Manning2016-06-122-84/+83
| | | | |
* | | | | Photo embed button with album browser works in new post editor.Andrew Manning2016-06-124-84/+91
| | | | |
* | | | | Merge remote-tracking branch 'upstream/dev' into embedphotosAndrew Manning2016-06-1212-9060/+9371
|\| | | |
| * | | | css fixesMario Vavti2016-06-112-10/+1
| | | | |
| * | | | es_ES and NL string for 1.8RC. Hopefully I'm doing it right.jeroenpraat2016-06-114-9041/+9047
| | |_|/ | |/| |
| * | | Merge remote-tracking branch 'upstream/dev' into wikiAndrew Manning2016-06-091-16/+0
| |\ \ \ | | | |/ | | |/|
| | * | remove the automatic ajax page load on pgdn key; it can load content much ↵redmatrix2016-06-091-16/+0
| | |/ | | | | | | | | | faster than you can page and potentially lead to memory exhaustion.