aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| | | | | | | * | | | | | | | | | | | | | | 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 continue See merge request hubzilla/core!1597
| | * | | | | | | | | | | | | | | | | | | | required php version not available but allowed to continuezotlabs2019-04-181-1/+1
| | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | Merge branch 'dev' into 'dev'Mario2019-04-191-30/+13
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Precise cache related headers processing; remove duplicated code and optimization See merge request hubzilla/core!1596
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'homeinstall_certbot' into 'dev'Mario2019-04-193-374/+114
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Letsencrypt: replaced dehydrated by certbot. Backup: replaced rsnaphsot by... See merge request hubzilla/core!1592
| | * | | | | | | | | | | | | | | | | | | | | Letsencrypt: replaced dehydrated by certbot. Backup: replaced rsnaphsot by ↵OJ Random2019-04-153-374/+114
| | | |_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | rsync. Readme: changed install instructions.
| * | | | | | | | | | | | | | | | | | | | | Merge branch 'dev' into 'dev'Max Kostikov2019-04-182-2/+7
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | / / / / / / / / | | |_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | add attachments to zot6 event objects, add zot6 to federated transports (webfinger) See merge request hubzilla/core!1593
| | * | | | | | | | | | | | | | | | | | | 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 ↵zotlabs2019-04-152-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (webfinger)
| | | | | | | | | | * | | | | | | | | | calendar merge initial commitMario Vavti2019-04-197-49/+990
| | |_|_|_|_|_|_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Merge branch 'dev' into 'dev'Max Kostikov2019-04-161-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix file path with filesystem storage See merge request hubzilla/core!1595
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'dev' into 'dev'Max Kostikov2019-04-161-11/+5
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use base image content instead of os_path; fix base images stats See merge request hubzilla/core!1594
| * | | | | | | | | | | | | | | | | | | Merge branch 'dev' into 'dev'Mario2019-04-151-37/+58
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extending GitLab CI/CD. See merge request hubzilla/core!1589
| | * | | | | | | | | | | | | | | | | | | Extending GitLab CI/CD.Klaus Weidenbach2019-04-131-37/+58
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add PHP7.3 image and .gitlab-ci.yml restructuring. Use YAML Anchors for job templates. Add more DB/PHP version combinations.
| | | | | | | | | | | | | | | | | | | * | 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' feature See merge request kostikov/core!1
| | | | | | | | | | | | | | | * | Add 'reply on comment' featureMax Kostikov2019-04-291-0/+8
| | | | | | | | | | | | | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (cherry picked from commit 80ca2023aa67ef7c0c43414acaf135e5748044b2)
| | | | | | | | | | | | | | * | Update main.jsMax Kostikov2019-04-291-3/+2
| | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | * | Add 'reply to comment' processingMax Kostikov2019-04-291-0/+13
| | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | * | Add 'reply to comment' buttonMax Kostikov2019-04-291-0/+5
| | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | * | Add initial threaded comments supportMax Kostikov2019-04-291-6/+10
| | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | * | Add variables for threaded comments supportMax Kostikov2019-04-291-5/+5
| | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | * | Add initial threaded comment supportMax Kostikov2019-04-291-2/+5
| | | | | | | | | | | | | |/ /
| | | | | | | | | | | | | * / Use goaway() base functionMax Kostikov2019-04-271-2/+1
| | | | | | | | | | | | |/ /
| | | | | | | | | | | | * | Optimize cached photos processingMax Kostikov2019-04-241-11/+13
| | | | | | | | | | | | | |
| | | | | | | | | | | | * | Add modified date in Etag hash calculationMax Kostikov2019-04-241-3/+8
| | | | | | | | | | | |/ /
| | | | | | | | | | | * / Add anti SEO link properties in directory listingMax Kostikov2019-04-191-1/+1
| | | | | | | | | | |/ /
| | | | | | | | | | * / Update cdav_calendar.tplMax Kostikov2019-04-191-2/+2
| | | | | | | | | |/ /
| | | | | | | | | * / Add translation to update buttonMax Kostikov2019-04-191-0/+1
| | | | | | | | |/ /
| | | | | | | | * / Add translation to update buttonMax Kostikov2019-04-191-1/+1
| | | | | | | |/ /
| | | | | | | * | Add remove profile photo buttonMax Kostikov2019-04-191-4/+30
| | | | | | | | |
| | | | | | | * | Add remove profile photo buttonMax Kostikov2019-04-191-2/+3
| | | | | | |/ /
| | | | | | * | Update Photo.phpMax Kostikov2019-04-181-1/+1
| | | | | | | |
| | | | | | * | Update Photo.phpMax Kostikov2019-04-181-2/+4
| | | | | | | |
| | | | | | * | Implement ETag: header support for cache controlMax Kostikov2019-04-181-15/+14
| | | | | | | |
| | | | | | * | Add 'must-revalidate' to Cache-control header for profile photosMax Kostikov2019-04-171-1/+4
| | | | | | | |