Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Revert "update composer libs" | Mario | 2019-04-25 | 102 | -3125/+3985 |
| | | | This reverts commit e779335d060b3a51d6a144d23af4097ae6801473 | ||||
* | Revert "fix test" | Mario | 2019-04-25 | 1 | -2/+2 |
| | | | This reverts commit c5fca0a1e784130b0e6f7aeee0bc36999f120bbf | ||||
* | Revert "dbunit does not work wirh phpunit v 8.1.3 - try 7.5.9" | Mario | 2019-04-25 | 2 | -3/+3 |
| | | | This reverts commit 8401e9c2b4bca3bf19eb7590f827b7169f4647d9 | ||||
* | 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 |
|\ | | | | | | | | | Add modification date in Etag hash calculation and optimize cached photos processing See merge request hubzilla/core!1607 | ||||
| * | 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 |
| | | |||||
* | | 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 |
|\ \ | | | | | | | | | | | | | Update docs See merge request hubzilla/core!1606 | ||||
| * | | 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 See merge request hubzilla/core!1605 | ||||
| * | | Fix infinite loop using postgres as backend | Daniel Lowe | 2019-04-21 | 1 | -12/+6 |
|/ / | | | | | | | | | | | unescapebin is handed a string in some cases, and it causes an infinite loop when it does. This ensures that the argument is a resource before loading its contents. | ||||
* | | Merge branch 'calendar_merge' into 'dev' | Max Kostikov | 2019-04-20 | 10 | -52/+872 |
|\ \ | | | | | | | | | | | | | calendar merge - initial checkin See merge request hubzilla/core!1599 | ||||
| * \ | resolve merge conflict | Mario Vavti | 2019-04-20 | 3 | -2/+3 |
| |\ \ | |/ / |/| | | |||||
* | | | Merge branch 'dev' into 'dev' | Max Kostikov | 2019-04-19 | 1 | -1/+1 |
|\ \ \ | | |/ | |/| | | | | | | | Add anti SEO link properties in directory listing See merge request hubzilla/core!1603 | ||||
| * | | Add anti SEO link properties in directory listing | Max Kostikov | 2019-04-19 | 1 | -1/+1 |
| | | | |||||
* | | | Merge branch 'dev' into 'dev' | Max Kostikov | 2019-04-19 | 1 | -2/+2 |
|\| | | | | | | | | | | | | | | Fix update button in cdav_calendar.tpl See merge request hubzilla/core!1602 | ||||
| * | | Update cdav_calendar.tpl | Max Kostikov | 2019-04-19 | 1 | -2/+2 |
| | | | |||||
* | | | Merge branch 'dev' into 'dev' | Max Kostikov | 2019-04-19 | 1 | -0/+1 |
|\| | | | | | | | | | | | | | | Add translation to calendar event update button See merge request hubzilla/core!1601 | ||||
| * | | Add translation to update button | Max Kostikov | 2019-04-19 | 1 | -0/+1 |
| | | | |||||
* | | | Merge branch 'dev' into 'dev' | Max Kostikov | 2019-04-19 | 1 | -1/+1 |
|\| | | | | | | | | | | | | | | Fix translation to update button See merge request hubzilla/core!1600 | ||||
| * | | Add translation to update button | 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 |
|\| | | | | | | | | | | | | | | Add remove profile photo button See merge request hubzilla/core!1598 | ||||
| * | | 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 |
| | | | |||||
| | * | 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 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 | ||||
| * | | | 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 |
| | | | | |||||
| * | | | Precise 'Modified:' header processing if no profile photo added; remove ↵ | Max Kostikov | 2019-04-17 | 1 | -29/+8 |
| | | | | | | | | | | | | | | | | duplicated code | ||||
* | | | | 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 | ||||
| * | | | Fix file path with filesystem storage | Max Kostikov | 2019-04-16 | 1 | -1/+1 |
| | | | | |||||
* | | | | 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 | ||||
| * | | Use base image content instead of os_path; fix base images stats | Max Kostikov | 2019-04-16 | 1 | -11/+5 |
| | | |