aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'dev' into sabre32Mario Vavti2016-06-162-0/+40
|\
| * show month view in full height in fullscreen viewMario Vavti2016-06-162-0/+40
| |
* | mrge branch 'dev' into sabre32Mario Vavti2016-06-162-0/+8
|\|
| * fix scrollbarsMario Vavti2016-06-162-0/+8
| |
* | Merge branch 'dev' into sabre32Mario Vavti2016-06-169-536/+1491
|\|
| * update 3rd party lib fullcalendar to version 2.7.3Mario Vavti2016-06-169-536/+1491
| |
* | Merge branch 'dev' into sabre32Mario Vavti2016-06-1660-17/+23584
|\|
| * custom request methods for curlredmatrix2016-06-151-3/+13
| |
| * provide a default for undefined languagesredmatrix2016-06-151-0/+1
| |
| * ignore case in language names and add 'js' as an alias for 'javascript'redmatrix2016-06-152-4/+6
| |
| * improve readability of commentsredmatrix2016-06-151-1/+1
| |
| * Merge pull request #422 from anaqreon/wikihubzilla2016-06-163-14/+136
| |\ | | | | | | Wiki rename page feature added. Bug fixes related to git commits.
| | * Merge remote-tracking branch 'upstream/dev' into wikiAndrew Manning2016-06-157-10/+162
| | |\
| | * | Rename page feature added. Fixed bug in git commit function and other minor ↵Andrew Manning2016-06-153-14/+136
| | | | | | | | | | | | | | | | fixes.
| * | | This was the reason for the large line widths - an extra linefeed after each ↵redmatrix2016-06-152-4/+1
| | | | | | | | | | | | | | | | li element
| * | | provide syntax based [colour] highlighting on code blocks for popular ↵redmatrix2016-06-1555-0/+23433
| | |/ | |/| | | | | | | 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.
| * | translate already imported system appsredmatrix2016-06-151-0/+2
| | |
* | | Merge branch 'dev' into sabre32Mario Vavti2016-06-152-1/+11
|\| |
| * | add new connection to default group when auto-acceptedredmatrix2016-06-152-1/+11
| | |
* | | 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
| | | |