aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Missing space in Spanish translationAndrew Manning2016-06-131-1/+1
|
* Missing onclick attributes in German translationAndrew Manning2016-06-131-4/+4
|
* Move Spanish context help translation from es to es-es and make es a symlink ↵Andrew Manning2016-06-1316-1/+1
| | | | to es-es
* Merge remote-tracking branch 'upstream/dev' into wikiAndrew Manning2016-06-135-0/+310
|\
| * Merge pull request #417 from anaqreon/wikihubzilla2016-06-131-0/+10
| |\ | | | | | | Wiki context help first draft
| * \ Merge pull request #416 from anaqreon/embedphotoshubzilla2016-06-135-0/+310
| |\ \ | | | | | | | | Add embed photos button with album browser to new post editor
| | * | 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-125-84/+271
| | | |
| | * | Merge remote-tracking branch 'upstream/dev' into embedphotosAndrew Manning2016-06-12371-12578/+14316
| | |\ \
| | * | | Stashing changes. Not a functional state.Andrew Manning2016-06-093-0/+124
| | | | |
* | | | | Add DE and ES-ES translations for wiki context helpAndrew Manning2016-06-132-0/+20
| |_|_|/ |/| | |
* | | | Context help for wiki interfaceAndrew Manning2016-06-121-0/+10
| | | |
* | | | Merge remote-tracking branch 'upstream/dev' into wikiAndrew Manning2016-06-121-12/+26
|\| | |
| * | | DB schema issue with importredmatrix2016-06-121-12/+26
| | | |
| * | | Apply purify_html to page content before preview and save to prevent ↵Andrew Manning2016-06-122-16/+4
| | |/ | |/| | | | | | | JavaScript code injection.
* / | Apply purify_html to page content before preview and save to prevent ↵Andrew Manning2016-06-122-16/+4
|/ / | | | | | | JavaScript code injection.
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergeredmatrix2016-06-116-9051/+9048
|\ \
| * | 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 branch '1.8RC' of https://github.com/redmatrix/hubzilla into 1.8RCjeroenpraat2016-06-110-0/+0
| |\ \
| | * | iconfig sharing not set correctlyredmatrix2016-06-101-1/+1
| | | |
* | | | remove debuggingredmatrix2016-06-111-1/+0
| | | |
* | | | Work supporting issue #411, add an optional priority (int) as a second arg ↵redmatrix2016-06-111-11/+23
|/ / / | | | | | | | | | | | | | | | to head_add_js to affect the load ordering, larger numbered priorities will be included after lower numbered ones. Default priority is 0.Note that we treat main.js differently and always add main.js to the page last, regardless of any other ordering.
* | | iconfig sharing not set correctlyredmatrix2016-06-101-1/+1
| | |
* | | move dev forwardredmatrix2016-06-101-1/+1
|/ /
* | changelog updateredmatrix2016-06-101-0/+2
| |
* | Merge pull request #410 from anaqreon/wikihubzilla2016-06-10353-18/+1685
|\ \ | | | | | | Wiki module: first iteration
| * \ Merge remote-tracking branch 'upstream/dev' into wikiAndrew Manning2016-06-095-21/+21
| |\ \
| * | | Revised permissions checks across API and enabled collaborative editing ↵Andrew Manning2016-06-082-81/+71
| | | | | | | | | | | | | | | | using the write_pages per-channel permission.
| * | | Merge remote-tracking branch 'upstream/dev' into wikiAndrew Manning2016-06-088-372/+449
| |\ \ \ | | | |/ | | |/|
| * | | Javascript only allows saving a page if the content has changed.Andrew Manning2016-06-071-2/+11
| | | |
| * | | Merge remote-tracking branch 'upstream/dev' into wikiAndrew Manning2016-06-0713-252/+315
| |\ \ \
| * | | | Hide page history viewer when viewing sandboxAndrew Manning2016-06-052-3/+6
| | | | |
| * | | | Remove debugging logger statementsAndrew Manning2016-06-052-4/+0
| | | | |
| * | | | Merge remote-tracking branch 'upstream/dev' into wikiAndrew Manning2016-06-055-5772/+5649
| |\ \ \ \
| * | | | | Custom commit message available. Improved history viewer and feedback from ↵Andrew Manning2016-06-053-7/+32
| | | | | | | | | | | | | | | | | | | | | | | | revert buttons.
| * | | | | Merge remote-tracking branch 'upstream/dev' into wikiAndrew Manning2016-06-057-21/+27
| |\ \ \ \ \
| * | | | | | Basic page reversion implemented. The revert button on the history view ↵Andrew Manning2016-06-054-3/+93
| | | | | | | | | | | | | | | | | | | | | | | | | | | | replaces the editor text but does not save the page.
| * | | | | | Page deletion implemented. Hide the delete button and disallow for Home page.Andrew Manning2016-06-043-8/+99
| | | | | | |
| * | | | | | Merge remote-tracking branch 'upstream/dev' into wikiAndrew Manning2016-06-041-3/+3
| |\ \ \ \ \ \
| * | | | | | | Wiki and page filenames are abstracted from their displayed names. Special ↵Andrew Manning2016-06-046-48/+62
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | characters do not seem to break things.
| * | | | | | | Created three distinct names for wiki and page that are suitable for URL, ↵Andrew Manning2016-06-042-20/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | HTML, and raw display. Implemented in new wiki POST activity only so far.
| * | | | | | | Merge remote-tracking branch 'upstream/dev' into wikiAndrew Manning2016-06-041844-458/+517
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge remote-tracking branch 'upstream/dev' into wikiAndrew Manning2016-06-02428-56247/+1158
| |\ \ \ \ \ \ \ \
| * | | | | | | | | Major corrections to access control and page construction.Andrew Manning2016-06-027-120/+135
| | | | | | | | | |
| * | | | | | | | | Created page history widget to dynamically fetch and display the git commit ↵Andrew Manning2016-05-305-10/+107
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | history for wiki pages.
| * | | | | | | | | Merge remote-tracking branch 'upstream/dev' into wikiAndrew Manning2016-05-301-1/+1
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | Replaced wiki item record object field with ActivityStreams information. ↵Andrew Manning2016-05-304-72/+53
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Wiki git repo path is stored in iconfig instead.
| * | | | | | | | | | Merge remote-tracking branch 'upstream/dev' into wikiAndrew Manning2016-05-294-4/+6
| |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Fixed bug in access control. Hide new wiki/page buttons if not channel owner.Andrew Manning2016-05-293-7/+3
| | | | | | | | | | | |