harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
25,393 Commits 6 Branches 36 Tags 152 MiB
master
Commit Graph

99 Commits

Author SHA1 Message Date
harukin
6859053727 Revert "Revert "Merge branch 'develop' into 'origin'"" 
This reverts commit 8c207cf1eb.
 2019-12-29 13:59:00 +09:00
harukin
8c207cf1eb Revert "Merge branch 'develop' into 'origin'" 
This reverts commit e1922bd555.
 2019-12-29 13:53:59 +09:00
harukin
e1922bd555 Merge branch 'develop' into 'origin' 
# Conflicts:
#   view/ja/hstrings.php
 2019-12-29 13:31:01 +09:00
Mario
580c3f4ffe another bulk of composer updates 
(cherry picked from commit 6685381fd8db507493c3d7c1793f8c05c681bbce)
 2019-11-10 14:10:03 +01:00
Mario
bcd0802ea4 update composr libs 
(cherry picked from commit 2df15f35d706d4608ff723ce6288391ca774f7ba)
 2019-11-08 10:47:28 +01:00
M. Dent
15eaa80301 Merge branch 'cherry-pick-9aa928ec' into 'dev' 
composer update simplepie/simplepie

See merge request hubzilla/core!1735
 2019-09-23 19:20:45 +02:00
M. Dent
1e924a8530 Merge branch 'cherry-pick-e4336578' into 'dev' 
composer update vendor/league/html-to-markdown/.github/

See merge request hubzilla/core!1734
 2019-09-23 19:18:53 +02:00
M. Dent
23995ccb07 Merge branch 'cherry-pick-38cb094e' into 'dev' 
composer update ezyang/htmlpurifier

See merge request hubzilla/core!1733
 2019-09-23 19:16:59 +02:00
M. Dent
a4f2603454 Merge branch 'cherry-pick-a34ce790' into 'dev' 
composer update ezyang/htmlpurifier

See merge request hubzilla/core!1732
 2019-09-23 19:16:38 +02:00
Mario Vavti
7fcbff3ceb composer update simplepie/simplepie 
(cherry picked from commit 9aa928ec8f378c6df2a0c8bbe892ff971c3bc672)
 2019-09-23 12:22:35 +02:00
Mario Vavti
efec0af394 composer update vendor/league/html-to-markdown/.github/ 
(cherry picked from commit e4336578388b3e59ba8130123649ccdc9b8487d0)
 2019-09-23 12:22:08 +02:00
Mario Vavti
aafecd9d1e composer update ezyang/htmlpurifier 
(cherry picked from commit 38cb094ede8a389ef0b8bb331c1e6a3befd666a8)
 2019-09-23 12:21:04 +02:00
Mario Vavti
e37c43ea06 composer update ezyang/htmlpurifier 
(cherry picked from commit a34ce790129bdd729a5019895ea6cd4c59f08ba4)
 2019-09-23 12:20:28 +02:00
Mario Vavti
3fac7b5bb7 composer update blueimp/jquery-file-upload 
(cherry picked from commit 53b8ee7866eb1394980b08b90153a63563832391)
 2019-09-23 12:19:33 +02:00
harukin
63d7bfde81 Merge branch 'origin' into 'develop' 
Update 4.4.1

See merge request harukin/core!61
 2019-08-17 08:38:51 +09:00
Mario Vavti
943db4496b regenerate autoload cache 2019-06-28 09:58:22 +02:00
Mario Vavti
c0b9ab930d update composer libs 2019-06-17 11:50:17 +02:00
harukin
76e879e5de Merge branch 'origin' into 'develop' 
Update 4.2

See merge request harukin/core!55
 2019-06-09 10:54:57 +09:00
Mario Vavti
9866053f0c update bootstrap to version 4.3.1 2019-05-10 14:21:36 +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 Vavti
e779335d06 update composer libs 2019-04-25 08:52:50 +02:00
harukin
087b45ab90 Merge branch 'origin' into 'develop' 
marge from origin 4.1

See merge request harukin/core!45
 2019-03-21 21:42:45 +09:00
Mario Vavti
aab515b16c optimize autoload cache and update changelog 2019-03-21 11:01:01 +01:00
Mario
e123f7c743 add phpmd and phpcs to require-dev 2019-03-17 21:42:14 +01:00
harukin
8f594ad6d9 Merge branch 'origin' into 'japanese' 
marge from origin 4.0

See merge request harukin/core!41
 2019-03-09 17:58:02 +09:00
Mario Vavti
cead10b9af update composer autoload cache 2019-02-19 10:24:20 +01:00
harukin
d9a0382539 edit translation 2019-02-11 17:15:48 +09:00
Mario Vavti
dbd230da74 update composer libs 2019-01-02 22:41:03 +01:00
Mario Vavti
f581f6163a optimize autoload cache 2018-12-03 11:52:38 +01:00
Mario
a151532ffa update jquery-file-upload and psr-log via composer 
(cherry picked from commit c7ae3fdc9a)
 2018-12-02 10:14:58 +01:00
Mario
a0d1ce77dc update imagesloaded to version 4.1.4 via composer 
(cherry picked from commit c667572d3e)
 2018-12-02 10:14:37 +01:00
M. Dent
a88a515fa0 Merge branch 'composer-updates' into 'dev' 
update jquery-file-upload and psr-log via composer

See merge request hubzilla/core!1408
 2018-11-28 03:55:13 +01:00
Mario
c7ae3fdc9a update jquery-file-upload and psr-log via composer 2018-11-25 10:18:26 +01:00
Mario
c667572d3e update imagesloaded to version 4.1.4 via composer 2018-11-25 10:09:26 +01:00
Mario
d6523c67a6 Merge branch 'patch-20181028a' into 'dev' 
Add timestamp to pconfig

See merge request hubzilla/core!1355
 2018-11-05 10:40:29 +01:00
Mike Macgirvin
7e1f431eca yet another blueimp vulnerability. Move to composer. 2018-10-31 15:56:08 +11:00
Mario Vavti
2192ea6fdf update html_to_markdown, smarty and sabredav libs via composer 2018-10-30 12:12:07 +01:00
M.Dent
c7c35b8b5a DB Updates to prep for pconfig timestamps. 2018-10-28 17:20:29 -04:00
Mario Vavti
2583270774 optimize autoload 2018-10-19 11:12:07 +02:00
Mario Vavti
b96a05494b optimize autoloader 2018-10-05 11:28:14 +02:00
Mario Vavti
54fa28441c install bootstrap via composer 2018-09-07 11:26:02 +02:00
Mario Vavti
07792adc56 add paragonie and symfonie since ramsey/uuid appears to require them 2018-08-28 12:06:36 +02:00
Mario Vavti
c0c827d3ad update composer libs and add ramsey/uuid 2018-08-28 12:00:23 +02:00
Mario Vavti
896d29d0c0 update composer autoload cache 2018-07-18 11:52:42 +02:00
Klaus Weidenbach
dafe0afa65 ⬆️ Update libraries. 
Updating smarty/smarty (v3.1.31 => v3.1.32)
Updating sabre/vobject (4.1.5 => 4.1.6)
 2018-05-09 21:07:25 +02:00
Klaus Weidenbach
a24d254404 Update composer autoload cache. 
Should add to Prepare RC Release documentation:
composer dump-autoload --no-dev
 2018-05-02 23:24:48 +02:00
Klaus Weidenbach
c80837a9e6 ⬆️ Update libraries. 
michelf/php-markdown (1.7.0 => 1.8.0)
ezyang/htmlpurifier (v4.9.3 => v4.10.0)
commerceguys/intl (v0.7.4 => v0.7.5)
sabre/http (4.2.3 => v4.2.4)
sabre/vobject (4.1.3 => 4.1.5)
 2018-03-18 02:15:29 +01:00