harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
24,297 Commits 6 Branches 36 Tags 152 MiB
405e07f0a2
Commit Graph

24297 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mario Vavti
405e07f0a2 improve channel date query 2019-04-27 23:01:05 +02:00
Mario Vavti
73248aadd5 possible sql performance improvement 2019-04-27 15:35:41 +02:00
Mario Vavti
a518471a27 update changelog 2019-04-26 11:28:06 +02:00
Mario
a6f50b8c85 Merge branch 'dev' into 'dev' 
import/export zot6 hublocs+xchans

See merge request hubzilla/core!1610
 2019-04-26 09:34:58 +02:00
Zot
e2dfa1d72f import/export zot6 hublocs+xchans 2019-04-26 09:34:58 +02:00
Mario
b57dcc74d1 Merge branch 'dev' into 'dev' 
update fix_system_urls() to handle zot6 hublocs (recommend cherry-pick to master)

See merge request hubzilla/core!1609
 2019-04-26 09:12:23 +02:00
Zot
f8c583636c update fix_system_urls() to handle zot6 hublocs (recommend cherry-pick to master) 2019-04-26 09:12:23 +02:00
Mario
d689778465 Merge branch 'dev' into 'dev' 
hubloc confusion in magic auth

See merge request hubzilla/core!1608
 2019-04-25 11:54:37 +02:00
Zot
3c8f8b76aa hubloc confusion in magic auth 2019-04-25 11:54:37 +02:00
Mario Vavti
c123fa5422 update blueimp/jquery-file-upload 2019-04-25 11:50:26 +02:00
Mario Vavti
0ade8be7f7 add missing files 2019-04-25 11:47:59 +02:00
Mario Vavti
a60c2f38c6 update sabre/vobject 2019-04-25 11:47:18 +02:00
Mario
f1c0797780 Revert "update composer libs" 
This reverts commit e779335d06
 2019-04-25 11:24:09 +02:00
Mario
701167bc12 Revert "fix test" 
This reverts commit c5fca0a1e7
 2019-04-25 11:22:45 +02:00
Mario
a39e63e324 Revert "dbunit does not work wirh phpunit v 8.1.3 - try 7.5.9" 
This reverts commit 8401e9c2b4
 2019-04-25 11:22:21 +02:00
Mario Vavti
8401e9c2b4 dbunit does not work wirh phpunit v 8.1.3 - try 7.5.9 2019-04-25 11:14:40 +02:00
Mario Vavti
c5fca0a1e7 fix test 2019-04-25 10:52:57 +02:00
Mario Vavti
e779335d06 update composer libs 2019-04-25 08:52:50 +02:00
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
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