aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* minor cleanupredmatrix2015-07-291-14/+1
|
* Merge branch 'vobject'redmatrix2015-07-291-23/+83
|\ | | | | | | | | Conflicts: include/event.php
| * convert ics import to sabre/vobjectredmatrix2015-07-291-29/+42
| |
| * initial work on using sabre as a vcalendar parserredmatrix2015-07-281-1/+50
| |
* | add connection filter to non-zot postsredmatrix2015-07-292-0/+8
| |
* | PRIVACY: imported eventsredmatrix2015-07-292-1/+2
|/
* make superblock block a channel if it's an owner as well as the current ↵redmatrix2015-07-283-3/+3
| | | | author; add @hostname to event hashes to make their use in vcalendar more RFC compliant
* align buttons on event calendarredmatrix2015-07-271-6/+5
|
* logic issue in connection filterredmatrix2015-07-272-5/+4
|
* crude but more or less functional event import from thunderbird ics filesredmatrix2015-07-263-8/+54
|
* backend code for importing events from "simple" ics calendar files.redmatrix2015-07-261-0/+65
|
* Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-07-264-3171/+3325
|\
| * comment out some popover infos - we provide enough visual feedback nowMario Vavti2015-07-261-15/+15
| |
| * Provide connection status if status is "a-normal"Mario Vavti2015-07-262-0/+13
| |
| * Merge pull request #378 from solstag/ptbrupdategit-marijus2015-07-252-3156/+3297
| |\ | | | | | | update pt-br strings
| | * update pt-br stringsAlexandre Hannud Abdo2015-07-242-3156/+3297
| |/
* / revision and string updateredmatrix2015-07-262-30/+34
|/
* event privacy issueredmatrix2015-07-231-2/+1
|
* Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-07-231-1/+1
|\
| * Merge pull request #377 from zzottel/masterredmatrix2015-07-221-1/+1
| |\ | | | | | | make content filter by language work for excludes
| | * make content filter by language work for excludeszottel2015-07-221-1/+1
| |/
* / patch to allow theme based widgetsredmatrix2015-07-235-4/+8
|/
* ics calendar export - commas need to be escapedredmatrix2015-07-212-2/+2
|
* provide content-disposition for exported ics fileredmatrix2015-07-201-0/+1
|
* Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-07-2018-11/+16
|\
| * Fixes regarding the new default profile photo size. The default profile ↵Mario Vavti2015-07-2017-9/+9
| | | | | | | | photos are just renamed. People which provided the originals are invited to reproduce them in the new 300 by 300 px format.
| * show icons instead of disabled checkboxesMario Vavti2015-07-201-2/+7
| |
* | there is no stricmp() in php, use strcasecmp() - also only detect language ↵redmatrix2015-07-201-3/+6
| | | | | | | | if we plan to use it.
* | indicate where progress has been maderedmatrix2015-07-202-16/+20
|/
* allow per-connection content filter to specify a detected language to ↵redmatrix2015-07-202-1/+7
| | | | include/exclude (in addition to text, tags, and regexes)
* string updateredmatrix2015-07-192-986/+926
|
* Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-07-164-355/+406
|\
| * fix missing div and a regression introduced in ↵Mario Vavti2015-07-162-50/+37
| | | | | | | | ec23a94b6d7f6db1e1d34275b8143cbc947db802 which broke tag removal for photos
| * Merge pull request #376 from tuscanhobbit/masterPaolo T2015-07-162-305/+369
| |\ | | | | | | Updated Italian strings
| | * Updated Italian stringsPaolo Tacconi2015-07-162-305/+369
| | |
* | | provide a way to export a single year of items (to potentially keep from ↵redmatrix2015-07-163-3/+40
|/ / | | | | | | exhausting resources either on export or import)
* | allow plugins to provide module handlers for arbitrary modules that haven't ↵redmatrix2015-07-152-0/+13
| | | | | | | | been installed on the system.
* | fix for empty recip array resulting from a mangled xchanredmatrix2015-07-151-5/+8
| |
* | clone sync fixes across red/hzredmatrix2015-07-151-2/+7
| |
* | Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-07-159-15/+19
|\ \
| * \ Merge pull request #375 from zzottel/masterredmatrix2015-07-166-6/+6
| |\ \ | | | | | | | | change sh to bash in shebang to make scripts work
| | * | also change the update_ scriptszottel2015-07-153-3/+3
| | | |
| | * | change sh to bash in shebang to make scripts workzottel2015-07-153-3/+3
| |/ /
| * | provide info text for automatic permissionsMario Vavti2015-07-151-1/+1
| | |
| * | whitespaceMario Vavti2015-07-151-4/+0
| | |
| * | show inherited state in Connection Default PermissionsMario Vavti2015-07-153-7/+15
| | |
* | | revision updateredmatrix2015-07-151-1/+1
|/ /
* | fix import of group membersredmatrix2015-07-141-1/+1
| |
* | stream_perms_xchans() set to empty quoted string when no results rather than ↵redmatrix2015-07-141-0/+6
| | | | | | | | return an empty string
* | Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-07-1410-518/+331
|\ \