aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | | | | | | Merge branch 'dev' into 'dev'Mario2019-04-241-14/+21
|\ \ \ \ \ \ \ \ \ \ \ \ \
* | | | | | | | | | | | | | calendar merge: bring back event categoriesMario Vavti2019-04-244-33/+52
* | | | | | | | | | | | | | Merge branch 'update-docs' into 'dev'Max Kostikov2019-04-221-105/+164
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Tidy up various bits of documentationDaniel Lowe2019-04-221-87/+163
| * | | | | | | | | | | | | | Remove section on techlevelsDaniel Lowe2019-04-221-18/+1
* | | | | | | | | | | | | | | Merge branch 'fix-infinite-loop' into 'dev'Max Kostikov2019-04-221-12/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Fix infinite loop using postgres as backendDaniel Lowe2019-04-211-12/+6
|/ / / / / / / / / / / / / /
* | | | | | | | | | | | | | Merge branch 'calendar_merge' into 'dev'Max Kostikov2019-04-2010-52/+872
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ resolve merge conflictMario Vavti2019-04-203-2/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge branch 'dev' into 'dev'Max Kostikov2019-04-191-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'dev' into 'dev'Max Kostikov2019-04-191-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'dev' into 'dev'Max Kostikov2019-04-191-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'dev' into 'dev'Max Kostikov2019-04-191-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'dev' into calendar_mergeMario Vavti2019-04-192-6/+33
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | Merge branch 'dev' into 'dev'Mario2019-04-192-6/+33
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | | * | | | | | | | | | | | | | provide location and description informationMario Vavti2019-04-192-6/+13
| | | | | | * | | | | | | | | | | | | | provide link to source and some cleanupMario Vavti2019-04-195-145/+17
| | | | | | * | | | | | | | | | | | | | Merge branch 'dev' into calendar_mergeMario Vavti2019-04-197-407/+135
| | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | Merge branch 'dev' into 'dev'Mario2019-04-191-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | required php version not available but allowed to continuezotlabs2019-04-181-1/+1
* | | | | | | | | | | | | | | | | | | | Merge branch 'dev' into 'dev'Mario2019-04-191-30/+13
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'homeinstall_certbot' into 'dev'Mario2019-04-193-374/+114
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | Letsencrypt: replaced dehydrated by certbot. Backup: replaced rsnaphsot by rs...OJ Random2019-04-153-374/+114
| | |_|_|_|_|_|_|_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | Merge branch 'dev' into 'dev'Max Kostikov2019-04-182-2/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | / / / / / / / | |_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / |/| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Merge branch 'dev' of https://framagit.org/hubzilla/core into devzotlabs2019-04-15156-14399/+42049
| |\| | | | | | | | | | | | | | | | | | | |_|_|_|_|_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | add attachments to zot6 event objects, add zot6 to federated transports (webf...zotlabs2019-04-152-2/+7
| | | | | | | | | * | | | | | | | | calendar merge initial commitMario Vavti2019-04-197-49/+990
| |_|_|_|_|_|_|_|/ / / / / / / / / |/| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge branch 'dev' into 'dev'Max Kostikov2019-04-161-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'dev' into 'dev'Max Kostikov2019-04-161-11/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | Merge branch 'dev' into 'dev'Mario2019-04-151-37/+58
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | Extending GitLab CI/CD.Klaus Weidenbach2019-04-131-37/+58
| | | | | | | | | | | | | | | | | | * Add check if threads are enabled globallyMax Kostikov2019-05-021-1/+1
| | | | | | | | | | | | | | | | | |/
| | | | | | | | | | | | | | | | | * Check if 'reply on comment' enabled for this profileMax Kostikov2019-05-021-1/+1
| | | | | | | | | | | | | | | | |/
| | | | | | | | | | | | | | | | * Add Zap threads supportMax Kostikov2019-05-021-0/+1
| | | | | | | | | | | | | | | |/
| | | | | | | | | | | | | | | * Add threaded comments supportMax Kostikov2019-05-011-4/+11
| | | | | | | | | | | | | | |/
| | | | | | | | | | | | | | * Fix missprintMax Kostikov2019-05-011-1/+1
| | | | | | | | | | | | | | * Preserve parent_mid with threaded commentsMax Kostikov2019-05-011-4/+1
| | | | | | | | | | | | | | * Use thr_parent for comment repliesMax Kostikov2019-05-011-6/+6
| | | | | | | | | | | | | | * Revert code to use thr_parent for comment repliesMax Kostikov2019-05-011-1/+1
| | | | | | | | | | | | | |/
| | | | | | | | | | | | | * Add 'reply on comment' codeMax Kostikov2019-05-011-0/+10
| | | | | | | | | | | | | * Move JS to main moduleMax Kostikov2019-05-011-13/+1
| | | | | | | | | | | | | * Remove 'doreply' JS functionMax Kostikov2019-04-301-9/+1
| | | | | | | | | | | | | * Add JS 'doreply' functionMax Kostikov2019-04-301-0/+12
| | | | | | | | | | | | | * Add "reply to" hint to submit buttonMax Kostikov2019-04-301-1/+1
| | | | | | | | | | | | | * Fix add multiple icons on 'Submit' button when reply on commentMax Kostikov2019-04-301-1/+1
| | | | | | | | | | | | | * Add displaying support for threaded commentsMax Kostikov2019-04-301-1/+1
| | | | | | | | | | | | | * Merge branch 'cherry-pick-80ca2023' into 'dev'Max Kostikov2019-04-291-0/+8
| | | | | | | | | | | | | |\
| | | | | | | | | | | | | | * Add 'reply on comment' featureMax Kostikov2019-04-291-0/+8
| | | | | | | | | | | | | |/
| | | | | | | | | | | | | * Update main.jsMax Kostikov2019-04-291-3/+2
| | | | | | | | | | | | | * Add 'reply to comment' processingMax Kostikov2019-04-291-0/+13