Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | | | | | | | | | | | 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 | |
| | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | All languages up to date as far as they are updated. Added Hebrew (I saw no ↵ | jeroenpraat | 2016-06-15 | 44 | -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 strings | phellmes | 2016-06-15 | 2 | -5529/+5467 | |
| | |_|_|_|_|/ / / / / / | |/| | | | | | | | | | | ||||||
* | | | | | | | | | | | | experimental rtl support; this will probably require a fair bit of work. | redmatrix | 2016-06-19 | 1 | -1/+1 | |
| |_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | ||||||
* | | | | | | | | | | | hebrew hstrings.php was empty | redmatrix | 2016-06-18 | 1 | -0/+2317 | |
| | | | | | | | | | | | ||||||
* | | | | | | | | | | | hebrew translation | root | 2016-06-18 | 9 | -0/+19195 | |
| |_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | ||||||
* | | | | | | | | | | the text link to a thing will take you to the local thing page, both as a ↵ | redmatrix | 2016-06-17 | 1 | -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 view | Mario Vavti | 2016-06-17 | 3 | -3/+8 | |
| |/ / / / / / / |/| | | | | | | | ||||||
* | | | | | | | | show month view in full height in fullscreen view | Mario Vavti | 2016-06-16 | 2 | -0/+40 | |
| |_|_|_|_|_|/ |/| | | | | | | ||||||
* | | | | | | | fix scrollbars | Mario Vavti | 2016-06-16 | 2 | -0/+8 | |
| |_|_|_|_|/ |/| | | | | | ||||||
* | | | | | | Merge pull request #422 from anaqreon/wiki | hubzilla | 2016-06-16 | 1 | -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 Manning | 2016-06-15 | 1 | -1/+40 | |
| | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | fixes. | |||||
* / | | | | | provide syntax based [colour] highlighting on code blocks for popular ↵ | redmatrix | 2016-06-15 | 1 | -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.tpl | Andrew Manning | 2016-06-12 | 2 | -84/+83 | |
| | | | | | ||||||
* | | | | | Photo embed button with album browser works in new post editor. | Andrew Manning | 2016-06-12 | 4 | -84/+91 | |
| | | | | | ||||||
* | | | | | Merge remote-tracking branch 'upstream/dev' into embedphotos | Andrew Manning | 2016-06-12 | 12 | -9060/+9371 | |
|\| | | | | ||||||
| * | | | | css fixes | Mario Vavti | 2016-06-11 | 2 | -10/+1 | |
| | | | | | ||||||
| * | | | | es_ES and NL string for 1.8RC. Hopefully I'm doing it right. | jeroenpraat | 2016-06-11 | 4 | -9041/+9047 | |
| | |_|/ | |/| | | ||||||
| * | | | Merge remote-tracking branch 'upstream/dev' into wiki | Andrew Manning | 2016-06-09 | 1 | -16/+0 | |
| |\ \ \ | | | |/ | | |/| | ||||||
| | * | | remove the automatic ajax page load on pgdn key; it can load content much ↵ | redmatrix | 2016-06-09 | 1 | -16/+0 | |
| | |/ | | | | | | | | | | faster than you can page and potentially lead to memory exhaustion. | |||||
| * | | Javascript only allows saving a page if the content has changed. | Andrew Manning | 2016-06-07 | 1 | -2/+11 | |
| | | | ||||||
| * | | Merge remote-tracking branch 'upstream/dev' into wiki | Andrew Manning | 2016-06-07 | 3 | -5/+5 | |
| |\| | ||||||
| * | | Hide page history viewer when viewing sandbox | Andrew Manning | 2016-06-05 | 1 | -2/+2 | |
| | | | ||||||
| * | | Merge remote-tracking branch 'upstream/dev' into wiki | Andrew Manning | 2016-06-05 | 4 | -5772/+5642 | |
| |\ \ | ||||||
| * | | | Custom commit message available. Improved history viewer and feedback from ↵ | Andrew Manning | 2016-06-05 | 2 | -6/+22 | |
| | | | | | | | | | | | | | | | | revert buttons. | |||||
| * | | | Merge remote-tracking branch 'upstream/dev' into wiki | Andrew Manning | 2016-06-05 | 1 | -0/+5 | |
| |\ \ \ | ||||||
| * | | | | Basic page reversion implemented. The revert button on the history view ↵ | Andrew Manning | 2016-06-05 | 2 | -2/+20 | |
| | | | | | | | | | | | | | | | | | | | | replaces the editor text but does not save the page. | |||||
| * | | | | Page deletion implemented. Hide the delete button and disallow for Home page. | Andrew Manning | 2016-06-04 | 1 | -4/+30 | |
| | | | | | ||||||
| * | | | | Wiki and page filenames are abstracted from their displayed names. Special ↵ | Andrew Manning | 2016-06-04 | 3 | -4/+4 | |
| | | | | | | | | | | | | | | | | | | | | characters do not seem to break things. | |||||
| * | | | | Merge remote-tracking branch 'upstream/dev' into wiki | Andrew Manning | 2016-06-04 | 3 | -69/+94 | |
| |\ \ \ \ | ||||||
| * \ \ \ \ | Merge remote-tracking branch 'upstream/dev' into wiki | Andrew Manning | 2016-06-02 | 6 | -22/+31 | |
| |\ \ \ \ \ | ||||||
| * | | | | | | Major corrections to access control and page construction. | Andrew Manning | 2016-06-02 | 1 | -0/+2 | |
| | | | | | | | ||||||
| * | | | | | | Created page history widget to dynamically fetch and display the git commit ↵ | Andrew Manning | 2016-05-30 | 2 | -1/+39 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | history for wiki pages. | |||||
| * | | | | | | Replaced wiki item record object field with ActivityStreams information. ↵ | Andrew Manning | 2016-05-30 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Wiki git repo path is stored in iconfig instead. | |||||
| * | | | | | | Fixed bug in access control. Hide new wiki/page buttons if not channel owner. | Andrew Manning | 2016-05-29 | 1 | -0/+2 | |
| | | | | | | | ||||||
| * | | | | | | Only show wiki delete control if channel owner | Andrew Manning | 2016-05-29 | 1 | -0/+2 | |
| | | | | | | | ||||||
| * | | | | | | Hacked Parsedown and Markdown to add class inline-code to <code> blocks for ↵ | Andrew Manning | 2016-05-29 | 2 | -0/+15 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | proper inline code rendering. Stopped using Parsedown even though Markdown is slower, hence extra delay when previewing pages. | |||||
| * | | | | | | Home page create with new wiki. URL redirects here when no page given. Fixed ↵ | Andrew Manning | 2016-05-29 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug with author in wiki item table record. | |||||
| * | | | | | | Wiki pages can be saved. | Andrew Manning | 2016-05-28 | 1 | -2/+21 | |
| | | | | | | | ||||||
| * | | | | | | Show page content by default. Hide page controls where appropriate. Fix ↵ | Andrew Manning | 2016-05-28 | 1 | -6/+8 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | sandbox text format. | |||||
| * | | | | | | Page content is loaded from the file on disk | Andrew Manning | 2016-05-28 | 1 | -1/+1 | |
| | | | | | | |