Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'upstream/dev' into wiki | Andrew Manning | 2016-06-25 | 4 | -10/+10 |
|\ | |||||
| * | 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. | ||||
* | | 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. | ||||
* | vcard spec changes | redmatrix | 2016-06-21 | 3 | -24/+30 |
| | |||||
* | Merge remote-tracking branch 'upstream/dev' into wiki | Andrew Manning | 2016-06-20 | 1 | -1/+1 |
|\ | |||||
| * | 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. | ||||
* | | 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 | 1 | -1/+6 |
|\| | |||||
| * | only use height: auto for week and day view | Mario Vavti | 2016-06-17 | 1 | -1/+6 |
| | | |||||
* | | 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 | ||||
* | Rename page feature added. Fixed bug in git commit function and other minor ↵ | Andrew Manning | 2016-06-15 | 1 | -1/+40 |
| | | | | fixes. | ||||
* | Move javascript functions back to jot-header.tpl | Andrew Manning | 2016-06-12 | 1 | -0/+83 |
| | |||||
* | Photo embed button with album browser works in new post editor. | Andrew Manning | 2016-06-12 | 2 | -84/+1 |
| | |||||
* | Merge remote-tracking branch 'upstream/dev' into embedphotos | Andrew Manning | 2016-06-12 | 4 | -0/+319 |
|\ | |||||
| * | 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 | 2 | -4/+4 |
| |\ | |||||
| * | | Hide page history viewer when viewing sandbox | Andrew Manning | 2016-06-05 | 1 | -2/+2 |
| | | | |||||
| * | | Custom commit message available. Improved history viewer and feedback from ↵ | Andrew Manning | 2016-06-05 | 2 | -6/+22 |
| | | | | | | | | | | | | revert buttons. | ||||
| * | | 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 | 2 | -69/+90 |
| |\ \ | |||||
| * \ \ | Merge remote-tracking branch 'upstream/dev' into wiki | Andrew Manning | 2016-06-02 | 4 | -11/+19 |
| |\ \ \ | |||||
| * | | | | 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 | 1 | -0/+6 |
| | | | | | | | | | | | | | | | | | | | | 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 |
| | | | | | |||||
| * | | | | Wiki page list links work. File content is not yet loaded into the editor. ↵ | Andrew Manning | 2016-05-28 | 2 | -5/+6 |
| | | | | | | | | | | | | | | | | | | | | Removed some logger calls. | ||||
| * | | | | Wiki page list is fetched and the page widget is updated | Andrew Manning | 2016-05-28 | 2 | -1/+18 |
| | | | | | |||||
| * | | | | Add new page to wiki and redirect to editor page. | Andrew Manning | 2016-05-27 | 1 | -0/+19 |
| | | | | | |||||
| * | | | | Wiki deletion works | Andrew Manning | 2016-05-27 | 1 | -0/+2 |
| | | | | | |||||
| * | | | | Merge remote-tracking branch 'upstream/dev' into wiki | Andrew Manning | 2016-05-27 | 3 | -6/+2 |
| |\ \ \ \ | |||||
| * | | | | | Delete wiki (in progress) | Andrew Manning | 2016-05-24 | 2 | -3/+24 |
| | | | | | | |||||
| * | | | | | List of wikis populates with links according to observer permissions. | Andrew Manning | 2016-05-21 | 2 | -7/+4 |
| | | | | | | |||||
| * | | | | | Successful new wiki git repo and item table record | Andrew Manning | 2016-05-21 | 1 | -17/+4 |
| | | | | | | |||||
| * | | | | | Forgot some templates | Andrew Manning | 2016-05-21 | 2 | -0/+21 |
| | | | | | | |||||
| * | | | | | Trying to fix wiki branch starting fresh from dev | Andrew Manning | 2016-05-21 | 1 | -0/+114 |
| | | | | | | |||||
* | | | | | | Stashing changes. Not a functional state. | Andrew Manning | 2016-06-09 | 2 | -0/+112 |
| |_|_|_|/ |/| | | | |