aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-10-093-335/+338
|\ | | | | | | | | | | Conflicts: mod/uexport.php view/tpl/uexport.tpl
| * Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-10-092-2/+27
| |\
| | * Redesigned the export page. Please fix my English if I made some mistakes.jeroenpraat2015-10-092-11/+19
| | |
| | * Merge pull request #397 from anaqreon/uexportredmatrix2015-10-082-4/+1
| | |\ | | | | | | | | There is no mod/import_items tool in RedMatrix
| | | * There is no mod/import_items tool in RedMatrixAndrew Manning2015-10-072-4/+1
| | |/
| | * Merge pull request #395 from anaqreon/uexportredmatrix2015-10-082-2/+22
| | |\ | | | | | | | | Add message about exporting by year/month to uexport
| | | * Forgot the year and month url partAndrew Manning2015-10-061-0/+6
| | | |
| | | * Add message about exporting by year/month to uexportAndrew Manning2015-10-062-2/+16
| | | |
| * | | string updateredmatrix2015-10-092-3/+3
| |/ /
* | | Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-10-061-1/+1
|\| |
| * | Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-10-062-25/+25
| |\|
| | * Merge branch 'master' of https://github.com/redmatrix/redmatrixjeroenpraat2015-10-052-6/+6
| | |\
| | * | Final Spanish strings for Redmatrixjeroenpraat2015-10-052-25/+25
| | | |
| * | | version updateredmatrix2015-10-061-1/+1
| | |/ | |/|
* | | Merge https://github.com/redmatrix/hubzilla into pending_mergeredmatrix2015-10-068-78/+131
|\ \ \
| * | | Updated Spanish stringsjeroenpraat2015-10-054-54/+54
| | | |
| * | | bring our bbcode tools to private mailMario Vavti2015-10-054-24/+77
| | | |
* | | | functions to update urls in items when doing migrationsredmatrix2015-10-061-0/+44
|/ / /
* | | Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-10-042-6/+6
|\| |
| * | version and strings updateredmatrix2015-10-042-6/+6
| |/
* | do not show delete conversation in single message viewMario Vavti2015-10-041-0/+2
| |
* | bring single message view to inbox/outbox viewMario Vavti2015-10-043-3/+9
| |
* | add anchors to messages and linksMario Vavti2015-10-042-1/+2
| |
* | remove check mail - it just reloads the page. we get a notification in the ↵Mario Vavti2015-10-042-7/+0
| | | | | | | | panel if we get new mail
* | cleanup some unused variablesMario Vavti2015-10-041-12/+0
| |
* | private mail: if receiver is not in abook provide only his webbie to the formMario Vavti2015-10-041-29/+14
| |
* | Red:Notify > Hubzilla:Notifyjeroenpraat2015-10-031-9/+9
| |
* | Updated Spanish and Dutch language stringsjeroenpraat2015-10-038-7568/+7735
| |
* | get rid of the unnecessary blank space after mail recipient completionredmatrix2015-10-023-2/+36
| |
* | private mail: $preid should be abook_xchan not abook_idMario Vavti2015-10-021-4/+4
| |
* | Merge branch 'master' of https://github.com/redmatrix/hubzillaMario Vavti2015-10-022-382/+400
|\ \
| * \ Merge https://github.com/redmatrix/hubzilla into pending_mergeredmatrix2015-10-022-20/+42
| |\ \
| * | | need full path to deliver_hooks.phpredmatrix2015-10-021-1/+1
| | | |
| * | | string updateredmatrix2015-10-021-381/+399
| | | |
* | | | private mail compositor changesMario Vavti2015-10-026-97/+74
| |/ / |/| |
* | | whitespaceMario Vavti2015-10-021-3/+0
| | |
* | | move mail item buttons/menu to dropdownMario Vavti2015-10-021-7/+25
| | |
* | | private mail template and css fixesMario Vavti2015-10-022-14/+21
|/ /
* | issue with resetting post perms to default audience - not sticking.0.10redmatrix2015-10-011-6/+17
| |
* | one more changeredmatrix2015-10-012-0/+3
| |
* | notification changes to support testdriveredmatrix2015-10-012-1/+5
| |
* | Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-10-012-5/+5
|\|
| * allow additional uses for xtagsredmatrix2015-10-012-5/+5
| |
* | Merge pull request #66 from HaakonME/masterredmatrix2015-10-0218-7716/+8321
|\ \ | | | | | | Updated Norwegian strings for Hubzilla , optional OpenShift deploy and cron
| * | Small fix to deployHaakon Meland Eriksen2015-10-011-1/+1
| | |
| * | Small fix to deployHaakon Meland Eriksen2015-10-011-1/+1
| | |
| * | Changed deploy script - removed hot_deploy and changed poller to every 10 ↵Haakon Meland Eriksen2015-10-011-7/+7
| | | | | | | | | | | | minutes rather than 5 minutes.
| * | Updated Norwegian strings for HubzillaHaakon Meland Eriksen2015-10-011-1502/+1560
| | |
| * | Updated Norwegian string for HubzillaHaakon Meland Eriksen2015-10-011-6214/+6500
| | |
| * | Merge remote-tracking branch 'upstream/master'Haakon Meland Eriksen2015-10-0113-21033/+22308
| |\ \
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-09 00:32:57 +0000