aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'dev' into sabre32Mario Vavti2016-06-156-10/+160
|\
| * Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergeredmatrix2016-06-142-1/+11
| |\
| | * Merge pull request #419 from anaqreon/wikihubzilla2016-06-152-1/+11
| | |\ | | | | | | | | Wiki context help translations IT and ES-ES
| | | * Fix Spanish wiki translationAndrew Manning2016-06-141-1/+1
| | | |
| | | * Merge remote-tracking branch 'upstream/dev' into wikiAndrew Manning2016-06-1426-157/+202
| | | |\ | | | |/ | | |/|
| | | * Add Italian wiki context help translationAndrew Manning2016-06-141-0/+10
| | | |
| * | | support cookie auth in Sabre DAVredmatrix2016-06-142-1/+55
| | | |
| * | | readme for the module directory, also provide an undocumented way to reset ↵redmatrix2016-06-142-8/+94
| |/ / | | | | | | | | | the timestamp on connection photos to force a refresh without messing with the database directly.
* | | css fixMario Vavti2016-06-141-0/+1
| | |
* | | Merge branch 'dev' into sabre32Mario Vavti2016-06-1443-158/+223
|\| |
| * | some work to provide propagation and honouring of the item_notshown flag.redmatrix2016-06-133-10/+25
| | |
| * | missing iconfig conversionredmatrix2016-06-131-3/+6
| | |
| * | Merge pull request #418 from anaqreon/wikihubzilla2016-06-1417-1/+21
| |\| | | | | | | Wiki context help translations DE and ES-ES
| | * 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
| | |\
| | * | Add DE and ES-ES translations for wiki context helpAndrew Manning2016-06-132-0/+20
| | | |
| * | | deprecate the item_id table - replace with iconfig. A possibly useful ↵redmatrix2016-06-1324-145/+172
| | |/ | |/| | | | | | | function in the iconfig class would be a search which takes a service id and type and uid, matches against an item and returns the iid. That could save a bit of code duplication.
* | | css fixesMario Vavti2016-06-131-1/+4
| | |
* | | Merge branch 'dev' into sabre32Mario Vavti2016-06-1310-39/+372
|\| |
| * | Merge pull request #417 from anaqreon/wikihubzilla2016-06-131-0/+10
| |\| | | | | | | Wiki context help first draft
| | * Context help for wiki interfaceAndrew Manning2016-06-121-0/+10
| | |
| | * Merge remote-tracking branch 'upstream/dev' into wikiAndrew Manning2016-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.
| * | | 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
| | | |
| * | | 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.
| * | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergeredmatrix2016-06-116-9051/+9048
| |\ \
| * | | 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.
* | | | Merge branch 'dev' into sabre32Mario Vavti2016-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
| | | |
* | | | Merge branch 'dev' into sabre32Mario Vavti2016-06-112-2/+2
|\| | |
| * | | iconfig sharing not set correctlyredmatrix2016-06-101-1/+1
| | | |
| * | | move dev forwardredmatrix2016-06-101-1/+1
| |/ /
* | | Merge branch 'dev' into sabre32Mario Vavti2016-06-10354-18/+1687
|\| |
| * | 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
| | | | |