Max Kostikov
|
92a5b9ac41
|
Add PHOTO_CACHE photo type
|
2018-11-29 10:34:18 +01:00 |
|
M. Dent
|
cded6b1136
|
Merge branch 'es-es' into 'dev'
Revision 1 doc/es-es/about/about.bb
See merge request hubzilla/core!1410
|
2018-11-28 05:32:10 +01:00 |
|
M. Dent
|
19f0ce7e37
|
Merge branch 'default2flex-conversion' into 'dev'
use flex for the default template
See merge request hubzilla/core!1409
|
2018-11-28 04:03:39 +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 |
|
M. Dent
|
a4b2eac0f0
|
Merge branch 'update-imagesloaded' into 'dev'
update imagesloaded to version 4.1.4 via composer
See merge request hubzilla/core!1407
|
2018-11-28 03:52:53 +01:00 |
|
M. Dent
|
0bd38290e6
|
Merge branch 'pg-fixes' into 'dev'
fix db upgrade 1228 for postgres
See merge request hubzilla/core!1403
|
2018-11-28 03:49:22 +01:00 |
|
zotlabs
|
19e4f3c2f0
|
prevent incompatible export files (osada/zap) from being imported. This is to keep your DB from getting trashed. We probably need a similar thing for item import since the object formats aren't compatible
|
2018-11-27 11:53:02 -08:00 |
|
harukin
|
e6edac1589
|
edit translation
|
2018-11-28 00:29:24 +09:00 |
|
harukin
|
781d0c0fe0
|
edit translation
|
2018-11-27 23:26:03 +09:00 |
|
harukin
|
b48cb47f41
|
edit translation
|
2018-11-27 19:38:00 +09:00 |
|
harukin
|
1ece7caa57
|
edit translation
|
2018-11-27 19:35:54 +09:00 |
|
harukin
|
0c1a3b1a61
|
edit translation
|
2018-11-27 19:10:07 +09:00 |
|
harukin
|
2b5d4ef346
|
edit translation
|
2018-11-27 19:07:33 +09:00 |
|
harukin
|
2dbd990017
|
edit translate
|
2018-11-27 18:59:50 +09:00 |
|
harukin
|
34961b39fe
|
edit translation
|
2018-11-27 18:53:26 +09:00 |
|
harukin
|
088a54dacb
|
edit translation
|
2018-11-27 18:47:25 +09:00 |
|
harukin
|
bc9d4a7643
|
edit translation
|
2018-11-27 18:32:55 +09:00 |
|
harukin
|
e0ee14d5b0
|
edit translation
|
2018-11-27 16:19:46 +09:00 |
|
harukin
|
e88db3d609
|
edit translation
|
2018-11-27 15:45:10 +09:00 |
|
harukin
|
f7d3550122
|
edit translation
|
2018-11-27 15:35:48 +09:00 |
|
harukin
|
896681b671
|
edit translation
|
2018-11-27 14:47:19 +09:00 |
|
harukin
|
fbdbd440d2
|
edit translation
|
2018-11-27 14:40:32 +09:00 |
|
harukin
|
c0af854cb6
|
fixed translation
|
2018-11-27 14:37:10 +09:00 |
|
harukin
|
92889397e6
|
edit translation
|
2018-11-27 14:29:43 +09:00 |
|
harukin
|
7c10b53209
|
えぢ らんぁちおん
|
2018-11-27 14:19:23 +09:00 |
|
harukin
|
a154fedbfb
|
edit translation
|
2018-11-27 14:13:47 +09:00 |
|
harukin
|
7c43f5b554
|
edit translation
|
2018-11-27 14:09:58 +09:00 |
|
harukin
|
d19769115c
|
edit translation
|
2018-11-27 14:03:06 +09:00 |
|
harukin
|
561ffce031
|
edit translation & add OSUSHI!.svg
|
2018-11-27 11:48:06 +09:00 |
|
harukin
|
61e2190f98
|
edit translation
|
2018-11-27 03:14:59 +09:00 |
|
harukin
|
c56abbf7df
|
fixed translation
|
2018-11-27 03:11:16 +09:00 |
|
harukin
|
1cd2f7e0f4
|
edit translation
|
2018-11-27 03:08:22 +09:00 |
|
harukin
|
516ad23aa5
|
fix translation miss
|
2018-11-27 03:05:27 +09:00 |
|
harukin
|
0599d27463
|
edit translation
|
2018-11-27 03:04:07 +09:00 |
|
harukin
|
f56107c84d
|
edit translation
|
2018-11-27 02:59:08 +09:00 |
|
harukin
|
dd61824df5
|
edit translation
|
2018-11-27 02:54:15 +09:00 |
|
harukin
|
531b4d955c
|
edit translation
|
2018-11-27 02:00:16 +09:00 |
|
Manuel Jiménez Friaza
|
8bede7b81f
|
Merge branch 'cherry-pick-5ac08ec3' into 'es-es'
Revision 1 doc/es-es/about/about.bb
See merge request mjfriaza/core!3
|
2018-11-26 12:59:03 +01:00 |
|
Manuel Jiménez Friaza
|
37d563c30e
|
Revision 1 doc/es-es/about/about.bb
(cherry picked from commit 5ac08ec3aa)
|
2018-11-26 12:53:24 +01:00 |
|
Mario
|
3775be4ce9
|
use flex for the default template
|
2018-11-26 12:44:10 +01:00 |
|
harukin
|
87e2aa42b8
|
edit translation
|
2018-11-26 13:23:18 +09:00 |
|
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 |
|