aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* translate already imported system appsredmatrix2016-06-151-0/+2
* add new connection to default group when auto-acceptedredmatrix2016-06-152-1/+11
* 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
| |\
| | * 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 th...redmatrix2016-06-142-8/+94
|/ /
* | 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
|\|
| * 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
| * 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 functio...redmatrix2016-06-1324-145/+172
| |/ |/|
* | Merge pull request #417 from anaqreon/wikihubzilla2016-06-131-0/+10
|\|
| * 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 JavaScri...Andrew Manning2016-06-122-16/+4
* | | Merge pull request #416 from anaqreon/embedphotoshubzilla2016-06-135-0/+310
|\ \ \ | |_|/ |/| |
| * | 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 JavaScri...Andrew Manning2016-06-122-16/+4
| |/ |/|
* | 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 to...redmatrix2016-06-111-11/+23
|/ / /
* | | 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
|\ \
| * \ Merge remote-tracking branch 'upstream/dev' into wikiAndrew Manning2016-06-095-21/+21
| |\ \
| * | | Revised permissions checks across API and enabled collaborative editing using...Andrew Manning2016-06-082-81/+71
| * | | 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 re...Andrew Manning2016-06-053-7/+32
| * | | | | Merge remote-tracking branch 'upstream/dev' into wikiAndrew Manning2016-06-057-21/+27
| |\ \ \ \ \
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-14 17:45:15 +0000