Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-10-09 | 2 | -2/+27 | |
| |\ \ | ||||||
| | * | | Redesigned the export page. Please fix my English if I made some mistakes. | jeroenpraat | 2015-10-09 | 2 | -11/+19 | |
| | | | | ||||||
| | * | | Merge pull request #397 from anaqreon/uexport | redmatrix | 2015-10-08 | 2 | -4/+1 | |
| | |\ \ | | | | | | | | | | | There is no mod/import_items tool in RedMatrix | |||||
| | | * | | There is no mod/import_items tool in RedMatrix | Andrew Manning | 2015-10-07 | 2 | -4/+1 | |
| | |/ / | ||||||
| | * | | Merge pull request #395 from anaqreon/uexport | redmatrix | 2015-10-08 | 2 | -2/+22 | |
| | |\ \ | | | | | | | | | | | Add message about exporting by year/month to uexport | |||||
| | | * | | Forgot the year and month url part | Andrew Manning | 2015-10-06 | 1 | -0/+6 | |
| | | | | | ||||||
| | | * | | Add message about exporting by year/month to uexport | Andrew Manning | 2015-10-06 | 2 | -2/+16 | |
| | | | | | ||||||
| * | | | | string update | redmatrix | 2015-10-09 | 2 | -3/+3 | |
| |/ / / | ||||||
* | | | | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-10-06 | 1 | -1/+1 | |
|\| | | | ||||||
| * | | | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-10-06 | 2 | -25/+25 | |
| |\| | | ||||||
| | * | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | jeroenpraat | 2015-10-05 | 2 | -6/+6 | |
| | |\ \ | ||||||
| | * | | | Final Spanish strings for Redmatrix | jeroenpraat | 2015-10-05 | 2 | -25/+25 | |
| | | | | | ||||||
| * | | | | version update | redmatrix | 2015-10-06 | 1 | -1/+1 | |
| | |/ / | |/| | | ||||||
* | | | | Merge https://github.com/redmatrix/hubzilla into pending_merge | redmatrix | 2015-10-06 | 8 | -78/+131 | |
|\ \ \ \ | ||||||
| * | | | | Updated Spanish strings | jeroenpraat | 2015-10-05 | 4 | -54/+54 | |
| | | | | | ||||||
| * | | | | bring our bbcode tools to private mail | Mario Vavti | 2015-10-05 | 4 | -24/+77 | |
| | | | | | ||||||
* | | | | | functions to update urls in items when doing migrations | redmatrix | 2015-10-06 | 1 | -0/+44 | |
|/ / / / | ||||||
* | | | | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-10-04 | 2 | -6/+6 | |
|\| | | | ||||||
| * | | | version and strings update | redmatrix | 2015-10-04 | 2 | -6/+6 | |
| |/ / | ||||||
* | | | do not show delete conversation in single message view | Mario Vavti | 2015-10-04 | 1 | -0/+2 | |
| | | | ||||||
* | | | bring single message view to inbox/outbox view | Mario Vavti | 2015-10-04 | 3 | -3/+9 | |
| | | | ||||||
* | | | add anchors to messages and links | Mario Vavti | 2015-10-04 | 2 | -1/+2 | |
| | | | ||||||
* | | | remove check mail - it just reloads the page. we get a notification in the ↵ | Mario Vavti | 2015-10-04 | 2 | -7/+0 | |
| | | | | | | | | | | | | panel if we get new mail | |||||
* | | | cleanup some unused variables | Mario Vavti | 2015-10-04 | 1 | -12/+0 | |
| | | | ||||||
* | | | private mail: if receiver is not in abook provide only his webbie to the form | Mario Vavti | 2015-10-04 | 1 | -29/+14 | |
| | | | ||||||
* | | | Red:Notify > Hubzilla:Notify | jeroenpraat | 2015-10-03 | 1 | -9/+9 | |
| | | | ||||||
* | | | Updated Spanish and Dutch language strings | jeroenpraat | 2015-10-03 | 8 | -7568/+7735 | |
| | | | ||||||
* | | | get rid of the unnecessary blank space after mail recipient completion | redmatrix | 2015-10-02 | 3 | -2/+36 | |
| | | | ||||||
* | | | private mail: $preid should be abook_xchan not abook_id | Mario Vavti | 2015-10-02 | 1 | -4/+4 | |
| | | | ||||||
* | | | Merge branch 'master' of https://github.com/redmatrix/hubzilla | Mario Vavti | 2015-10-02 | 2 | -382/+400 | |
|\ \ \ | ||||||
| * \ \ | Merge https://github.com/redmatrix/hubzilla into pending_merge | redmatrix | 2015-10-02 | 2 | -20/+42 | |
| |\ \ \ | ||||||
| * | | | | need full path to deliver_hooks.php | redmatrix | 2015-10-02 | 1 | -1/+1 | |
| | | | | | ||||||
| * | | | | string update | redmatrix | 2015-10-02 | 1 | -381/+399 | |
| | | | | | ||||||
* | | | | | private mail compositor changes | Mario Vavti | 2015-10-02 | 6 | -97/+74 | |
| |/ / / |/| | | | ||||||
* | | | | whitespace | Mario Vavti | 2015-10-02 | 1 | -3/+0 | |
| | | | | ||||||
* | | | | move mail item buttons/menu to dropdown | Mario Vavti | 2015-10-02 | 1 | -7/+25 | |
| | | | | ||||||
* | | | | private mail template and css fixes | Mario Vavti | 2015-10-02 | 2 | -14/+21 | |
|/ / / | ||||||
* | | | issue with resetting post perms to default audience - not sticking.0.10 | redmatrix | 2015-10-01 | 1 | -6/+17 | |
| | | | ||||||
* | | | one more change | redmatrix | 2015-10-01 | 2 | -0/+3 | |
| | | | ||||||
* | | | notification changes to support testdrive | redmatrix | 2015-10-01 | 2 | -1/+5 | |
| | | | ||||||
* | | | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-10-01 | 2 | -5/+5 | |
|\| | | ||||||
| * | | allow additional uses for xtags | redmatrix | 2015-10-01 | 2 | -5/+5 | |
| | | | ||||||
* | | | Merge pull request #66 from HaakonME/master | redmatrix | 2015-10-02 | 18 | -7716/+8321 | |
|\ \ \ | | | | | | | | | Updated Norwegian strings for Hubzilla , optional OpenShift deploy and cron | |||||
| * | | | Small fix to deploy | Haakon Meland Eriksen | 2015-10-01 | 1 | -1/+1 | |
| | | | | ||||||
| * | | | Small fix to deploy | Haakon Meland Eriksen | 2015-10-01 | 1 | -1/+1 | |
| | | | | ||||||
| * | | | Changed deploy script - removed hot_deploy and changed poller to every 10 ↵ | Haakon Meland Eriksen | 2015-10-01 | 1 | -7/+7 | |
| | | | | | | | | | | | | | | | | minutes rather than 5 minutes. | |||||
| * | | | Updated Norwegian strings for Hubzilla | Haakon Meland Eriksen | 2015-10-01 | 1 | -1502/+1560 | |
| | | | | ||||||
| * | | | Updated Norwegian string for Hubzilla | Haakon Meland Eriksen | 2015-10-01 | 1 | -6214/+6500 | |
| | | | | ||||||
| * | | | Merge remote-tracking branch 'upstream/master' | Haakon Meland Eriksen | 2015-10-01 | 13 | -21033/+22308 | |
| |\ \ \ | ||||||
| * \ \ \ | Merge remote-tracking branch 'upstream/master' | Haakon Meland Eriksen | 2015-09-30 | 84 | -3019/+137693 | |
| |\ \ \ \ |