Commit Graph

24633 Commits

Author SHA1 Message Date
Mario
e937e8fff9 Merge branch 'dev' into 'dev'
Add modification date in Etag hash calculation and optimize cached photos processing

See merge request hubzilla/core!1607
2019-04-24 21:11:19 +02:00
Mario Vavti
f616b2d49a calendar merge: bring back event categories 2019-04-24 14:48:30 +02:00
Max Kostikov
fe84dae313 Optimize cached photos processing 2019-04-24 11:18:17 +02:00
Max Kostikov
9104933b18 Add modified date in Etag hash calculation 2019-04-24 11:13:17 +02:00
Max Kostikov
79654635d3 Merge branch 'update-docs' into 'dev'
Update docs

See merge request hubzilla/core!1606
2019-04-22 19:49:08 +02:00
Max Kostikov
f0edfca75c Merge branch 'fix-infinite-loop' into 'dev'
Fix infinite loop using postgres as backend

See merge request hubzilla/core!1605
2019-04-22 19:47:49 +02:00
Daniel Lowe
e845da2edc Tidy up various bits of documentation 2019-04-22 15:50:02 +00:00
Daniel Lowe
7a3050f2c0 Remove section on techlevels 2019-04-22 15:49:39 +00:00
Daniel Lowe
9a6531e2a2 Fix infinite loop using postgres as backend
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.
2019-04-21 11:14:17 +00:00
Max Kostikov
a6a17a85f3 Merge branch 'calendar_merge' into 'dev'
calendar merge - initial checkin

See merge request hubzilla/core!1599
2019-04-20 20:14:58 +02:00
Mario Vavti
9275fd16c2 resolve merge conflict 2019-04-20 10:23:11 +02:00
Max Kostikov
904ae05810 Merge branch 'dev' into 'dev'
Add anti SEO link properties in directory listing

See merge request hubzilla/core!1603
2019-04-19 23:19:38 +02:00
Max Kostikov
54f95389a8 Add anti SEO link properties in directory listing 2019-04-19 23:17:24 +02:00
Max Kostikov
a8fc70a5b9 Merge branch 'dev' into 'dev'
Fix update button in cdav_calendar.tpl

See merge request hubzilla/core!1602
2019-04-19 21:26:48 +02:00
Max Kostikov
c374072822 Update cdav_calendar.tpl 2019-04-19 21:22:42 +02:00
Max Kostikov
0212de68a4 Merge branch 'dev' into 'dev'
Add translation to calendar event update button

See merge request hubzilla/core!1601
2019-04-19 21:14:29 +02:00
Max Kostikov
2ea9b6d409 Add translation to update button 2019-04-19 21:11:34 +02:00
Max Kostikov
823d71df28 Merge branch 'dev' into 'dev'
Fix translation to update button

See merge request hubzilla/core!1600
2019-04-19 21:06:09 +02:00
Max Kostikov
7560918b32 Add translation to update button 2019-04-19 21:04:00 +02:00
Mario Vavti
fd87faa7a6 Merge branch 'dev' into calendar_merge 2019-04-19 19:37:06 +02:00
Mario Vavti
cb2d706fa1 provide location and description information 2019-04-19 19:06:01 +02:00
Mario
6b638ac896 Merge branch 'dev' into 'dev'
Add remove profile photo button

See merge request hubzilla/core!1598
2019-04-19 17:23:10 +02:00
Mario Vavti
2bd5ae3617 provide link to source and some cleanup 2019-04-19 17:21:45 +02:00
Mario Vavti
39a5311315 Merge branch 'dev' into calendar_merge 2019-04-19 15:34:02 +02:00
Mario Vavti
9b6e46dc6b calendar merge initial commit 2019-04-19 15:32:56 +02:00
Max Kostikov
7311d1182d Add remove profile photo button 2019-04-19 15:30:05 +02:00
Max Kostikov
ea1d8b8104 Add remove profile photo button 2019-04-19 15:29:08 +02:00
Mario
fb03e3f00e Merge branch 'dev' into 'dev'
required php version not available but allowed to continue

See merge request hubzilla/core!1597
2019-04-19 15:19:43 +02:00
Mario
c9c35255e7 Merge branch 'dev' into 'dev'
Precise cache related headers processing; remove duplicated code and optimization

See merge request hubzilla/core!1596
2019-04-19 15:19:19 +02:00
Mario
99a578dbad Merge branch 'homeinstall_certbot' into 'dev'
Letsencrypt: replaced dehydrated by certbot. Backup: replaced rsnaphsot by...

See merge request hubzilla/core!1592
2019-04-19 15:18:42 +02:00
zotlabs
e56c0a6251 Merge branch 'dev' of ../hm into dev 2019-04-18 13:59:06 -07:00
zotlabs
66479e2aa7 Merge branch 'dev' of https://framagit.org/hubzilla/core into dev 2019-04-18 13:58:43 -07:00
zotlabs
6feddcbced required php version not available but allowed to continue 2019-04-18 13:53:39 -07:00
Max Kostikov
db020ca1a3 Update Photo.php 2019-04-18 21:55:06 +02:00
Max Kostikov
6c93518ef7 Merge branch 'dev' into 'dev'
add attachments to zot6 event objects, add zot6 to federated transports (webfinger)

See merge request hubzilla/core!1593
2019-04-18 20:59:41 +02:00
Max Kostikov
eb02d01eed Update Photo.php 2019-04-18 10:13:03 +02:00
Max Kostikov
7a9093f634 Implement ETag: header support for cache control 2019-04-18 09:50:37 +02:00
Max Kostikov
1732b2dfe3 Add 'must-revalidate' to Cache-control header for profile photos 2019-04-17 23:15:46 +02:00
Max Kostikov
a62f891a60 Precise 'Modified:' header processing if no profile photo added; remove duplicated code 2019-04-17 18:30:50 +02:00
zotlabs
a22ecd42ed Merge branch 'dev' of https://framagit.org/hubzilla/core into dev 2019-04-16 18:34:41 -07:00
Max Kostikov
b7cb2a2951 Merge branch 'dev' into 'dev'
Fix file path with filesystem storage

See merge request hubzilla/core!1595
2019-04-16 22:26:53 +02:00
Max Kostikov
c490970324 Fix file path with filesystem storage 2019-04-16 22:24:48 +02:00
Max Kostikov
5a9c8a9343 Merge branch 'dev' into 'dev'
Use base image content instead of os_path; fix base images stats

See merge request hubzilla/core!1594
2019-04-16 17:37:07 +02:00
Max Kostikov
5ba7e5d7d7 Use base image content instead of os_path; fix base images stats 2019-04-16 17:31:27 +02:00
zotlabs
f7b281a65f Merge branch 'dev' of https://framagit.org/hubzilla/core into dev 2019-04-15 22:29:50 -07:00
zotlabs
df5a1c59e6 Merge branch 'dev' of https://framagit.org/hubzilla/core into dev 2019-04-15 20:53:44 -07:00
zotlabs
0615709a7a add attachments to zot6 event objects, add zot6 to federated transports (webfinger) 2019-04-15 20:51:57 -07:00
OJ Random
d85a0130b7 Letsencrypt: replaced dehydrated by certbot. Backup: replaced rsnaphsot by rsync. Readme: changed install instructions. 2019-04-15 21:01:13 +02:00
Mario
71f17a233e Merge branch 'dev' into 'dev'
Extending GitLab CI/CD.

See merge request hubzilla/core!1589
2019-04-15 17:52:52 +02:00
Max Kostikov
25c35cbbe4 Merge branch 'dev' into 'dev'
Update INSTALL.txt

See merge request hubzilla/core!1591
2019-04-15 15:20:51 +02:00