harukin
|
d9560ad124
|
edit translation
|
2018-11-26 13:19:32 +09:00 |
|
harukin
|
b93397e415
|
edit translation
|
2018-11-26 13:14:51 +09:00 |
|
harukin
|
44d89c7209
|
edit translation
|
2018-11-26 12:49:12 +09:00 |
|
harukin
|
5bb9890660
|
edit translation
|
2018-11-26 12:33:13 +09:00 |
|
harukin
|
f22d589c49
|
edit translation
|
2018-11-26 10:55:54 +09:00 |
|
harukin
|
17f873db70
|
edit translation /settings/display fin
|
2018-11-26 10:43:55 +09:00 |
|
harukin
|
1647c39bf2
|
Merge branch 'develop' into 'japanese'
merge from master/upstream
See merge request harukin/core!21
|
2018-11-26 10:22:21 +09:00 |
|
harukin
|
026d6d4a70
|
edit translation /settings/display
|
2018-11-26 03:44:07 +09:00 |
|
harukin
|
93113e0f00
|
edit translation /settings/channel fin
|
2018-11-26 03:29:31 +09:00 |
|
harukin
|
236692908a
|
edit translation /settings/channel
|
2018-11-26 03:22:27 +09:00 |
|
harukin
|
6eea7c7e50
|
edit translation /settings/channel
|
2018-11-26 00:48:51 +09:00 |
|
harukin
|
31516acec2
|
edit translation /settings/editor/ fin
|
2018-11-26 00:32:55 +09:00 |
|
harukin
|
c9728961bf
|
edit settings/editor/ launguage
|
2018-11-26 00:12:46 +09:00 |
|
harukin
|
7bd89a9ab1
|
|
2018-11-26 00:00:41 +09:00 |
|
harukin
|
39b553529d
|
add manifest.json
|
2018-11-25 23:36:59 +09:00 |
|
Mario
|
e5883dd605
|
Merge branch 'patch-20181120a' into 'dev'
Do not store serialized pconfig value received via to Module/Pconfig.php
See merge request hubzilla/core!1402
|
2018-11-25 10:22:09 +01:00 |
|
M. Dent
|
6b02c664fb
|
Do not store serialized pconfig value received via to Module/Pconfig.php
|
2018-11-25 10:22:09 +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
|
9bbd6ff67d
|
Merge branch 'es-es' into 'dev'
Update es-es
See merge request hubzilla/core!1406
|
2018-11-24 21:16:59 +01:00 |
|
Manuel Jiménez Friaza
|
ca98a566ee
|
Update es-es
|
2018-11-24 13:23:20 +01:00 |
|
Manuel Jiménez Friaza
|
f865d6e5da
|
Resolved merge conflicts
|
2018-11-24 13:01:01 +01:00 |
|
Mario
|
bc9f2922e0
|
Merge remote-tracking branch 'mike/master' into dev
|
2018-11-23 22:04:51 +01:00 |
|
zotlabs
|
c5a9b00eae
|
Organization actor type was missing
|
2018-11-23 12:25:05 -08:00 |
|
Mario
|
f408ff982c
|
Merge remote-tracking branch 'mike/master' into dev
|
2018-11-23 15:42:40 +01:00 |
|
zotlabs
|
9a8d1200ec
|
use uuid in file storage
|
2018-11-22 18:39:38 -08:00 |
|
Mario
|
16c7aa2813
|
fix db upgrade 1228 for postgres
|
2018-11-22 12:52:08 +01:00 |
|
Mario
|
85f52d2aed
|
Merge remote-tracking branch 'mike/master' into dev
|
2018-11-22 10:17:18 +01:00 |
|
zotlabs
|
8e71324514
|
fix mastodon tag notifications (again)
|
2018-11-21 20:25:59 -08:00 |
|
zotlabs
|
ea235c0c67
|
no mention notifications from mastodon (and pleroma)
|
2018-11-21 20:03:58 -08:00 |
|
harukin
|
ea995d017b
|
Merge branch 'develop' into 'master'
merge from master/upstream
See merge request harukin/core!20
|
2018-11-21 21:54:12 +09:00 |
|
harukin
|
1aecbbece5
|
merge from master
|
2018-11-21 21:49:47 +09:00 |
|
Mario Vavti
|
e30be643c9
|
fix call to undefined function
(cherry picked from commit 0bba9482df)
|
2018-11-21 13:27:21 +01:00 |
|
Mario Vavti
|
0bba9482df
|
fix call to undefined function
|
2018-11-21 13:21:29 +01:00 |
|
Mario
|
07fd2dbc99
|
Merge branch 'dev' into 'dev'
Update Russian translation
See merge request hubzilla/core!1400
|
2018-11-20 11:08:27 +01:00 |
|
Mario Vavti
|
f8a8559523
|
fix typo which prevented propagation of comments
(cherry picked from commit 0c94747ab1)
|
2018-11-20 10:09:46 +01:00 |
|
zotlabs
|
6481c9dca1
|
use this form instead
|
2018-11-19 15:20:28 -08:00 |
|
zotlabs
|
7aaa1973f4
|
push recent changes
|
2018-11-19 15:04:08 -08:00 |
|
harukin
|
a12abaac9d
|
規約誤植修正
|
2018-11-19 22:30:10 +09:00 |
|
Max Kostikov
|
4dea1b5a0d
|
Replace hmessages.po
|
2018-11-19 13:52:31 +01:00 |
|
Max Kostikov
|
da44ab0529
|
Replace hstrings.php
|
2018-11-19 13:51:54 +01:00 |
|
harukin
|
1a1e8463cc
|
Merge branch 'develop' into 'japanese'
merge from upsream 3.8.5 release
See merge request harukin/core!19
|
2018-11-19 21:44:09 +09:00 |
|
harukin
|
343fccd7fd
|
Merge branch 'develop' into 'master'
merge from upsream 3.8.5 release
See merge request harukin/core!18
|
2018-11-19 21:40:07 +09:00 |
|
harukin
|
577102c4ec
|
merge from upsream 3.8.5 release
|
2018-11-19 21:40:07 +09:00 |
|
Mario
|
73b836c73d
|
Revert "Fix return on wrong sotred in Content-Length size for full size photos"
This reverts commit 6010b5c619
|
2018-11-19 13:11:18 +01:00 |
|
Mario
|
af0c2f59cc
|
Revert "Add filesize for streaming content"
This reverts commit 238a616292
|
2018-11-19 13:11:04 +01:00 |
|
harukin
|
f5faa053bf
|
merge from upsream 3.8.5 release
|
2018-11-19 20:40:12 +09:00 |
|
Mario Vavti
|
1044e8e91a
|
version 3.8.5
|
2018-11-19 11:12:32 +01:00 |
|
Mario Vavti
|
dffc0a4ed8
|
changelog
(cherry picked from commit 5cb4cdaa5e)
|
2018-11-19 11:11:47 +01:00 |
|
Mario Vavti
|
ba4b1cb5af
|
Merge branch 'master' of https://framagit.org/hubzilla/core
|
2018-11-19 11:10:36 +01:00 |
|