aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* hubloc confusion in magic authZot2019-04-256-28/+89
|
* update blueimp/jquery-file-uploadMario Vavti2019-04-257-26/+34
|
* add missing filesMario Vavti2019-04-252-0/+15
|
* update sabre/vobjectMario Vavti2019-04-2591-3752/+2831
|
* Revert "update composer libs"Mario2019-04-25102-3125/+3985
| | | This reverts commit e779335d060b3a51d6a144d23af4097ae6801473
* Revert "fix test"Mario2019-04-251-2/+2
| | | This reverts commit c5fca0a1e784130b0e6f7aeee0bc36999f120bbf
* Revert "dbunit does not work wirh phpunit v 8.1.3 - try 7.5.9"Mario2019-04-252-3/+3
| | | This reverts commit 8401e9c2b4bca3bf19eb7590f827b7169f4647d9
* dbunit does not work wirh phpunit v 8.1.3 - try 7.5.9Mario Vavti2019-04-252-3/+3
|
* fix testMario Vavti2019-04-251-2/+2
|
* update composer libsMario Vavti2019-04-25102-3985/+3125
|
* Merge branch 'dev' into 'dev'Mario2019-04-241-14/+21
|\ | | | | | | | | Add modification date in Etag hash calculation and optimize cached photos processing See merge request hubzilla/core!1607
| * Optimize cached photos processingMax Kostikov2019-04-241-11/+13
| |
| * Add modified date in Etag hash calculationMax Kostikov2019-04-241-3/+8
| |
* | calendar merge: bring back event categoriesMario Vavti2019-04-244-33/+52
| |
* | Merge branch 'update-docs' into 'dev'Max Kostikov2019-04-221-105/+164
|\ \ | | | | | | | | | | | | Update docs See merge request hubzilla/core!1606
| * | 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 backend See merge request hubzilla/core!1605
| * | Fix infinite loop using postgres as backendDaniel Lowe2019-04-211-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 Kostikov2019-04-2010-52/+872
|\ \ | | | | | | | | | | | | calendar merge - initial checkin See merge request hubzilla/core!1599
| * \ resolve merge conflictMario Vavti2019-04-203-2/+3
| |\ \ | |/ / |/| |
* | | Merge branch 'dev' into 'dev'Max Kostikov2019-04-191-1/+1
|\ \ \ | | |/ | |/| | | | | | | Add anti SEO link properties in directory listing See merge request hubzilla/core!1603
| * | Add anti SEO link properties in directory listingMax Kostikov2019-04-191-1/+1
| | |
* | | Merge branch 'dev' into 'dev'Max Kostikov2019-04-191-2/+2
|\| | | | | | | | | | | | | | Fix update button in cdav_calendar.tpl See merge request hubzilla/core!1602
| * | Update cdav_calendar.tplMax Kostikov2019-04-191-2/+2
| | |
* | | Merge branch 'dev' into 'dev'Max Kostikov2019-04-191-0/+1
|\| | | | | | | | | | | | | | Add translation to calendar event update button See merge request hubzilla/core!1601
| * | Add translation to update buttonMax Kostikov2019-04-191-0/+1
| | |
* | | Merge branch 'dev' into 'dev'Max Kostikov2019-04-191-1/+1
|\| | | | | | | | | | | | | | Fix translation to update button See merge request hubzilla/core!1600
| * | Add translation to update buttonMax 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
|\| | | | | | | | | | | | | | Add remove profile photo button See merge request hubzilla/core!1598
| * | Add remove profile photo buttonMax Kostikov2019-04-191-4/+30
| | |
| * | Add remove profile photo buttonMax Kostikov2019-04-191-2/+3
| | |
| | * 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 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
| * | | 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
| | | |
| * | | Precise 'Modified:' header processing if no profile photo added; remove ↵Max Kostikov2019-04-171-29/+8
| | | | | | | | | | | | | | | | duplicated code
* | | | 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
| |_|_|/ |/| | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-06 20:04:44 +0000