Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | | | | | | | | | dbunit does not work wirh phpunit v 8.1.3 - try 7.5.9 | Mario Vavti | 2019-04-25 | 2 | -3/+3 | |
* | | | | | | | | | | | | | | fix test | Mario Vavti | 2019-04-25 | 1 | -2/+2 | |
* | | | | | | | | | | | | | | update composer libs | Mario Vavti | 2019-04-25 | 102 | -3985/+3125 | |
| |_|_|_|_|_|/ / / / / / / |/| | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | Merge branch 'dev' into 'dev' | Mario | 2019-04-24 | 1 | -14/+21 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
* | | | | | | | | | | | | | | calendar merge: bring back event categories | Mario Vavti | 2019-04-24 | 4 | -33/+52 | |
* | | | | | | | | | | | | | | Merge branch 'update-docs' into 'dev' | Max Kostikov | 2019-04-22 | 1 | -105/+164 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | Tidy up various bits of documentation | Daniel Lowe | 2019-04-22 | 1 | -87/+163 | |
| * | | | | | | | | | | | | | | Remove section on techlevels | Daniel Lowe | 2019-04-22 | 1 | -18/+1 | |
* | | | | | | | | | | | | | | | Merge branch 'fix-infinite-loop' into 'dev' | Max Kostikov | 2019-04-22 | 1 | -12/+6 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | Fix infinite loop using postgres as backend | Daniel Lowe | 2019-04-21 | 1 | -12/+6 | |
|/ / / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | Merge branch 'calendar_merge' into 'dev' | Max Kostikov | 2019-04-20 | 10 | -52/+872 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ | resolve merge conflict | Mario Vavti | 2019-04-20 | 3 | -2/+3 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | Merge branch 'dev' into 'dev' | Max Kostikov | 2019-04-19 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
* \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'dev' into 'dev' | Max Kostikov | 2019-04-19 | 1 | -2/+2 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
* \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'dev' into 'dev' | Max Kostikov | 2019-04-19 | 1 | -0/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
* \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'dev' into 'dev' | Max Kostikov | 2019-04-19 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'dev' into calendar_merge | Mario Vavti | 2019-04-19 | 2 | -6/+33 | |
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | Merge branch 'dev' into 'dev' | Mario | 2019-04-19 | 2 | -6/+33 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | | | | * | | | | | | | | | | | | | | provide location and description information | Mario Vavti | 2019-04-19 | 2 | -6/+13 | |
| | | | | | * | | | | | | | | | | | | | | provide link to source and some cleanup | Mario Vavti | 2019-04-19 | 5 | -145/+17 | |
| | | | | | * | | | | | | | | | | | | | | Merge branch 'dev' into calendar_merge | Mario Vavti | 2019-04-19 | 7 | -407/+135 | |
| | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | | Merge branch 'dev' into 'dev' | Mario | 2019-04-19 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | required php version not available but allowed to continue | zotlabs | 2019-04-18 | 1 | -1/+1 | |
* | | | | | | | | | | | | | | | | | | | | Merge branch 'dev' into 'dev' | Mario | 2019-04-19 | 1 | -30/+13 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
* \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'homeinstall_certbot' into 'dev' | Mario | 2019-04-19 | 3 | -374/+114 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | Letsencrypt: replaced dehydrated by certbot. Backup: replaced rsnaphsot by rs... | OJ Random | 2019-04-15 | 3 | -374/+114 | |
| | |_|_|_|_|_|_|_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | | Merge branch 'dev' into 'dev' | Max Kostikov | 2019-04-18 | 2 | -2/+7 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | / / / / / / / | |_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | Merge branch 'dev' of https://framagit.org/hubzilla/core into dev | zotlabs | 2019-04-15 | 156 | -14399/+42049 | |
| |\| | | | | | | | | | | | | | | | | | | |_|_|_|_|_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | add attachments to zot6 event objects, add zot6 to federated transports (webf... | zotlabs | 2019-04-15 | 2 | -2/+7 | |
| | | | | | | | | * | | | | | | | | | calendar merge initial commit | Mario Vavti | 2019-04-19 | 7 | -49/+990 | |
| |_|_|_|_|_|_|_|/ / / / / / / / / |/| | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | Merge branch 'dev' into 'dev' | Max Kostikov | 2019-04-16 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
* \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'dev' into 'dev' | Max Kostikov | 2019-04-16 | 1 | -11/+5 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | Merge branch 'dev' into 'dev' | Mario | 2019-04-15 | 1 | -37/+58 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | Extending GitLab CI/CD. | Klaus Weidenbach | 2019-04-13 | 1 | -37/+58 | |
| | | | | | | | | | | | | | | | | | * | Add check if threads are enabled globally | Max Kostikov | 2019-05-02 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | |/ | ||||||
| | | | | | | | | | | | | | | | | * | Check if 'reply on comment' enabled for this profile | Max Kostikov | 2019-05-02 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | |/ | ||||||
| | | | | | | | | | | | | | | | * | Add Zap threads support | Max Kostikov | 2019-05-02 | 1 | -0/+1 | |
| | | | | | | | | | | | | | | |/ | ||||||
| | | | | | | | | | | | | | | * | Add threaded comments support | Max Kostikov | 2019-05-01 | 1 | -4/+11 | |
| | | | | | | | | | | | | | |/ | ||||||
| | | | | | | | | | | | | | * | Fix missprint | Max Kostikov | 2019-05-01 | 1 | -1/+1 | |
| | | | | | | | | | | | | | * | Preserve parent_mid with threaded comments | Max Kostikov | 2019-05-01 | 1 | -4/+1 | |
| | | | | | | | | | | | | | * | Use thr_parent for comment replies | Max Kostikov | 2019-05-01 | 1 | -6/+6 | |
| | | | | | | | | | | | | | * | Revert code to use thr_parent for comment replies | Max Kostikov | 2019-05-01 | 1 | -1/+1 | |
| | | | | | | | | | | | | |/ | ||||||
| | | | | | | | | | | | | * | Add 'reply on comment' code | Max Kostikov | 2019-05-01 | 1 | -0/+10 | |
| | | | | | | | | | | | | * | Move JS to main module | Max Kostikov | 2019-05-01 | 1 | -13/+1 | |
| | | | | | | | | | | | | * | Remove 'doreply' JS function | Max Kostikov | 2019-04-30 | 1 | -9/+1 | |
| | | | | | | | | | | | | * | Add JS 'doreply' function | Max Kostikov | 2019-04-30 | 1 | -0/+12 | |
| | | | | | | | | | | | | * | Add "reply to" hint to submit button | Max Kostikov | 2019-04-30 | 1 | -1/+1 | |
| | | | | | | | | | | | | * | Fix add multiple icons on 'Submit' button when reply on comment | Max Kostikov | 2019-04-30 | 1 | -1/+1 | |
| | | | | | | | | | | | | * | Add displaying support for threaded comments | Max Kostikov | 2019-04-30 | 1 | -1/+1 | |
| | | | | | | | | | | | | * | Merge branch 'cherry-pick-80ca2023' into 'dev' | Max Kostikov | 2019-04-29 | 1 | -0/+8 | |
| | | | | | | | | | | | | |\ |