Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | | | | | | | | | Added hot_deploy to deploy script - fixed echo | Haakon Meland Eriksen | 2015-09-18 | 1 | -1/+1 | |
| * | | | | | | | | | | | | | Merge remote-tracking branch 'upstream/master' | Haakon Meland Eriksen | 2015-09-18 | 75 | -761/+964 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | Added hot_deploy to deploy script | Haakon Meland Eriksen | 2015-09-18 | 1 | -0/+16 | |
| * | | | | | | | | | | | | | | Merge remote-tracking branch 'upstream/master' | Haakon Meland Eriksen | 2015-09-11 | 64 | -833/+1535 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | Removed old poller | Haakon Meland Eriksen | 2015-09-04 | 1 | -10/+0 | |
| * | | | | | | | | | | | | | | | Updating OpenShift deploy script | Haakon Meland Eriksen | 2015-09-04 | 1 | -0/+24 | |
| * | | | | | | | | | | | | | | | Merge remote-tracking branch 'upstream/master' | Haakon Meland Eriksen | 2015-09-03 | 34 | -708/+1358 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge remote-tracking branch 'upstream/master' | Haakon Meland Eriksen | 2015-09-01 | 16 | -0/+0 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | Fix filename | Haakon Meland Eriksen | 2015-09-01 | 1 | -2/+1 | |
| * | | | | | | | | | | | | | | | | | Fixed deploy script | Haakon Meland Eriksen | 2015-09-01 | 1 | -8/+37 | |
| * | | | | | | | | | | | | | | | | | Merge remote-tracking branch 'upstream/master' | Haakon Meland Eriksen | 2015-09-01 | 1 | -2/+3 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | Added openshift-hubzilla-deploy to .openshift/action_hooks/deploy | Haakon Meland Eriksen | 2015-09-01 | 1 | -0/+110 | |
| * | | | | | | | | | | | | | | | | | | Merge remote-tracking branch 'upstream/master' | Haakon Meland Eriksen | 2015-09-01 | 47 | -663/+722 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge remote-tracking branch 'upstream/master' | Haakon Meland Eriksen | 2015-08-27 | 23 | -1165/+1188 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge remote-tracking branch 'upstream/master' | Haakon Meland Eriksen | 2015-08-23 | 33 | -238/+532 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge remote-tracking branch 'upstream/master' | Haakon Meland Eriksen | 2015-08-19 | 45 | -11403/+20389 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge remote-tracking branch 'upstream/master' | Haakon Meland Eriksen | 2015-08-06 | 13 | -117/+114 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | Hubzilla addons added | Haakon Meland Eriksen | 2015-08-03 | 1 | -0/+5 | |
| * | | | | | | | | | | | | | | | | | | | | | | | Merge remote-tracking branch 'upstream/master' | Haakon Meland Eriksen | 2015-08-03 | 19 | -3273/+209 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge remote-tracking branch 'upstream/master' | Haakon Meland Eriksen | 2015-07-29 | 97 | -1293/+1407 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge remote-tracking branch 'upstream/master' | Haakon Meland Eriksen | 2015-07-08 | 2 | -2/+2 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge remote-tracking branch 'upstream/master' | Haakon Meland Eriksen | 2015-07-07 | 11 | -9/+206 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | Added cron script to exexute poller every 5 minutes | Haakon Meland Eriksen | 2015-07-05 | 1 | -0/+10 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge remote-tracking branch 'openshift/master' | Haakon Meland Eriksen | 2015-07-05 | 14 | -0/+78 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | Creating template | Template builder | 2015-07-05 | 15 | -0/+352 | |
| | / / / / / / / / / / / / / / / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-10-01 | 3 | -3/+3 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | / / | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | update cert authorities | redmatrix | 2015-10-01 | 3 | -3/+3 | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge pull request #65 from tuscanhobbit/master | Wave | 2015-10-01 | 2 | -17/+17 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | More updates on Italian translation from transifex | Paolo Tacconi | 2015-10-01 | 2 | -17/+17 | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge pull request #64 from tuscanhobbit/master | Wave | 2015-10-01 | 2 | -7589/+7886 | |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | First Hubzilla Italian localization | Paolo Tacconi | 2015-10-01 | 2 | -7589/+7886 | |
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | | | | | | | | this is an even better fix for issue #61 | redmatrix | 2015-09-30 | 1 | -8/+4 | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | issue #61 - provide un-useable icons as placeholders for location setting opt... | redmatrix | 2015-09-30 | 1 | -1/+5 | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | issue #63 - missing table fields in db query | redmatrix | 2015-09-30 | 1 | -2/+2 | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | update the opensearch template | redmatrix | 2015-09-30 | 1 | -4/+4 | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | add delivery reports to mail (not backported to redmatrix) | redmatrix | 2015-09-30 | 4 | -7/+65 | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-09-30 | 4 | -5978/+6384 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | document the issue with cloned delivery to self vs normal delivery to self | redmatrix | 2015-09-30 | 1 | -2/+13 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-09-30 | 2 | -1863/+1872 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge pull request #394 from zzottel/master | zzottel | 2015-09-30 | 2 | -1863/+1872 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | update German strings | zottel | 2015-09-30 | 2 | -1863/+1872 | |
| | |/ / / / / / / / / / / / / / / / / / / / / / / / / | ||||||
| * / / / / / / / / / / / / / / / / / / / / / / / / / | undo self-deliver check | redmatrix | 2015-09-30 | 2 | -6/+7 | |
| |/ / / / / / / / / / / / / / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | | | | | | | | | | | | | undo self deliver check | redmatrix | 2015-09-30 | 1 | -5/+6 | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | Merge pull request #62 from zzottel/master | zzottel | 2015-09-30 | 2 | -7447/+7960 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | update German strings | zottel | 2015-09-30 | 2 | -7447/+7960 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | Merge remote-tracking branch 'upstream/master' | zottel | 2015-09-30 | 7 | -7484/+7880 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | | | | | | | | another error from the db logs | redmatrix | 2015-09-29 | 1 | -1/+1 | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | wrong table column names | redmatrix | 2015-09-29 | 2 | -2/+2 | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | queue cleanup, and report issues | redmatrix | 2015-09-29 | 2 | -5/+32 | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | more work on the notifier | redmatrix | 2015-09-29 | 2 | -2/+18 |