Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| | | | | | | * | | | | | | | | | | | | | | | 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 See merge request hubzilla/core!1597 | |||||
| | * | | | | | | | | | | | | | | | | | | | | 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 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Precise cache related headers processing; remove duplicated code and optimization See merge request hubzilla/core!1596 | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'homeinstall_certbot' into 'dev' | Mario | 2019-04-19 | 3 | -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 Random | 2019-04-15 | 3 | -374/+114 | |
| | | |_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | rsync. Readme: changed install instructions. | |||||
| * | | | | | | | | | | | | | | | | | | | | | Merge branch 'dev' into 'dev' | Max Kostikov | 2019-04-18 | 2 | -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 dev | zotlabs | 2019-04-15 | 156 | -14399/+42049 | |
| | |\| | | | | | | | | | | | | | | | | | | | | |_|_|_|_|_|_|_|_|_|/ / / / / / / / | | |/| | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | | | | add attachments to zot6 event objects, add zot6 to federated transports ↵ | zotlabs | 2019-04-15 | 2 | -2/+7 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (webfinger) | |||||
| | | | | | | | | | * | | | | | | | | | | 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 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix file path with filesystem storage See merge request hubzilla/core!1595 | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'dev' into 'dev' | Max Kostikov | 2019-04-16 | 1 | -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' | Mario | 2019-04-15 | 1 | -37/+58 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extending GitLab CI/CD. See merge request hubzilla/core!1589 | |||||
| | * | | | | | | | | | | | | | | | | | | | Extending GitLab CI/CD. | Klaus Weidenbach | 2019-04-13 | 1 | -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 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 | |
| | | | | | | | | | | | | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add 'reply on comment' feature See merge request kostikov/core!1 | |||||
| | | | | | | | | | | | | | | * | | Add 'reply on comment' feature | Max Kostikov | 2019-04-29 | 1 | -0/+8 | |
| | | | | | | | | | | | | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (cherry picked from commit 80ca2023aa67ef7c0c43414acaf135e5748044b2) | |||||
| | | | | | | | | | | | | | * | | Update main.js | Max Kostikov | 2019-04-29 | 1 | -3/+2 | |
| | | | | | | | | | | | | | | | | ||||||
| | | | | | | | | | | | | | * | | Add 'reply to comment' processing | Max Kostikov | 2019-04-29 | 1 | -0/+13 | |
| | | | | | | | | | | | | | | | | ||||||
| | | | | | | | | | | | | | * | | Add 'reply to comment' button | Max Kostikov | 2019-04-29 | 1 | -0/+5 | |
| | | | | | | | | | | | | | | | | ||||||
| | | | | | | | | | | | | | * | | Add initial threaded comments support | Max Kostikov | 2019-04-29 | 1 | -6/+10 | |
| | | | | | | | | | | | | | | | | ||||||
| | | | | | | | | | | | | | * | | Add variables for threaded comments support | Max Kostikov | 2019-04-29 | 1 | -5/+5 | |
| | | | | | | | | | | | | | | | | ||||||
| | | | | | | | | | | | | | * | | Add initial threaded comment support | Max Kostikov | 2019-04-29 | 1 | -2/+5 | |
| | | | | | | | | | | | | |/ / | ||||||
| | | | | | | | | | | | | * / | Use goaway() base function | Max Kostikov | 2019-04-27 | 1 | -2/+1 | |
| | | | | | | | | | | | |/ / | ||||||
| | | | | | | | | | | | * | | Optimize cached photos processing | Max Kostikov | 2019-04-24 | 1 | -11/+13 | |
| | | | | | | | | | | | | | | ||||||
| | | | | | | | | | | | * | | Add modified date in Etag hash calculation | Max Kostikov | 2019-04-24 | 1 | -3/+8 | |
| | | | | | | | | | | |/ / | ||||||
| | | | | | | | | | | * / | Add anti SEO link properties in directory listing | Max Kostikov | 2019-04-19 | 1 | -1/+1 | |
| | | | | | | | | | |/ / | ||||||
| | | | | | | | | | * / | Update cdav_calendar.tpl | Max Kostikov | 2019-04-19 | 1 | -2/+2 | |
| | | | | | | | | |/ / | ||||||
| | | | | | | | | * / | Add translation to update button | Max Kostikov | 2019-04-19 | 1 | -0/+1 | |
| | | | | | | | |/ / | ||||||
| | | | | | | | * / | Add translation to update button | Max Kostikov | 2019-04-19 | 1 | -1/+1 | |
| | | | | | | |/ / | ||||||
| | | | | | | * | | Add remove profile photo button | Max Kostikov | 2019-04-19 | 1 | -4/+30 | |
| | | | | | | | | | ||||||
| | | | | | | * | | Add remove profile photo button | Max Kostikov | 2019-04-19 | 1 | -2/+3 | |
| | | | | | |/ / | ||||||
| | | | | | * | | Update Photo.php | Max Kostikov | 2019-04-18 | 1 | -1/+1 | |
| | | | | | | | | ||||||
| | | | | | * | | Update Photo.php | Max Kostikov | 2019-04-18 | 1 | -2/+4 | |
| | | | | | | | | ||||||
| | | | | | * | | Implement ETag: header support for cache control | Max Kostikov | 2019-04-18 | 1 | -15/+14 | |
| | | | | | | | | ||||||
| | | | | | * | | Add 'must-revalidate' to Cache-control header for profile photos | Max Kostikov | 2019-04-17 | 1 | -1/+4 | |
| | | | | | | | |