 zotlabs
|
d2aa2c080f
|
Merge branch 'master' into zvi
|
2018-11-07 01:43:43 -08:00 |
|
|
zotlabs
|
7148311953
|
Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_merge
|
2018-11-07 01:43:26 -08:00 |
|
 Mario
|
fc1d8c0138
|
Merge branch 'revert-40d9277e' into 'dev'
Revert "remove 'Expiries' HTTP header"
See merge request hubzilla/core!1372
|
2018-11-07 09:36:30 +01:00 |
|
 Max Kostikov
|
a5a77d1e7c
|
Revert "remove 'Expiries' HTTP header"
This reverts commit 40d9277ef3
|
2018-11-07 08:41:32 +01:00 |
|
|
zotlabs
|
f57fcefe6b
|
signature issue
|
2018-11-06 21:45:43 -08:00 |
|
|
zotlabs
|
a5483a03c9
|
fix signatures
|
2018-11-06 21:44:57 -08:00 |
|
|
zotlabs
|
bb8b3b9291
|
this is brutal
|
2018-11-06 20:44:40 -08:00 |
|
 M. Dent
|
6c6dca05e7
|
Merge branch 'patch-25' into 'dev'
'Last-Modified' and 'Content-Length' HTTP headers added for better image caching
See merge request hubzilla/core!1369
|
2018-11-06 19:25:38 +01:00 |
|
|
M. Dent
|
97b4a31b16
|
Merge branch 'patch-26' into 'dev'
New plural functions for JavaScript compatibility
See merge request hubzilla/core!1370
|
2018-11-06 18:26:58 +01:00 |
|
|
Max Kostikov
|
40d9277ef3
|
remove 'Expiries' HTTP header
|
2018-11-06 16:22:34 +01:00 |
|
|
Max Kostikov
|
009044b71e
|
Update hmessages.po
|
2018-11-06 14:58:06 +01:00 |
|
|
Max Kostikov
|
4760a3f3e8
|
Update hmessages.po
|
2018-11-06 14:57:12 +01:00 |
|
|
Max Kostikov
|
3302012c02
|
New pt-br plural function for JavaScript compatibility
|
2018-11-06 14:55:58 +01:00 |
|
|
Max Kostikov
|
812c5a314f
|
New nl plural function for JavaScript compatibility
|
2018-11-06 14:55:21 +01:00 |
|
|
Max Kostikov
|
c2da8c3fd4
|
New nb-no plural function for JavaScript compatibility
|
2018-11-06 14:54:49 +01:00 |
|
|
Max Kostikov
|
aa78640491
|
New it plural function for JavaScript compatibility
|
2018-11-06 14:54:06 +01:00 |
|
|
Max Kostikov
|
7c49688e1b
|
New he plural function for JavaScript compatibility
|
2018-11-06 14:53:29 +01:00 |
|
|
Max Kostikov
|
dbe10c7965
|
New fi plural function for JavaScript compatibility
|
2018-11-06 14:52:58 +01:00 |
|
|
Max Kostikov
|
f1f5107282
|
New es plural function for JavaScript compatibility
|
2018-11-06 14:52:23 +01:00 |
|
|
Max Kostikov
|
cc06250bf8
|
New fr plural function for JavaScript compatibility
|
2018-11-06 14:50:37 +01:00 |
|
|
Max Kostikov
|
af1ea7f495
|
New plural function for JavaScript compatibility
|
2018-11-06 14:48:58 +01:00 |
|
|
Max Kostikov
|
3491c488d3
|
Update Photo.php
|
2018-11-06 13:51:01 +01:00 |
|
|
Max Kostikov
|
1828b6daab
|
Update Photo.php
|
2018-11-06 13:41:41 +01:00 |
|
|
Max Kostikov
|
c26f45b7c2
|
Update Photo.php
|
2018-11-06 13:39:36 +01:00 |
|
|
Max Kostikov
|
e116b90116
|
'Last-Modified' and 'Content-Length' HTTP headers added for better image caching
|
2018-11-06 13:37:50 +01:00 |
|
|
zotlabs
|
e7f1d350c9
|
more zot6 work
|
2018-11-05 21:29:26 -08:00 |
|
|
zotlabs
|
3b9aedec5f
|
populate new fields
|
2018-11-05 19:52:30 -08:00 |
|
|
zotlabs
|
fabcf841c9
|
z6 work
|
2018-11-05 19:34:10 -08:00 |
|
|
zotlabs
|
43a5f928ba
|
these changes needed to ensure cloning/syncing works in the future to non-zot6 enabled servers after the (coming) zot6 schema updates. This should probably be on a fast track to master branch
|
2018-11-05 16:57:32 -08:00 |
|
|
M. Dent
|
873fa16517
|
Merge branch 'patch-23' into 'dev'
Use modern get_config() syntax
See merge request hubzilla/core!1368
|
2018-11-06 01:27:06 +01:00 |
|
|
Max Kostikov
|
f7ce374a28
|
Update Photo.php
|
2018-11-05 21:26:10 +01:00 |
|
|
Max Kostikov
|
2dd124d09e
|
Use modern get_config() syntax
|
2018-11-05 21:25:08 +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 |
|
|
Mario Vavti
|
4320f047db
|
update changelog and bump version
|
2018-11-05 10:22:56 +01:00 |
|
|
Mario Vavti
|
b6938da552
|
Merge remote-tracking branch 'mike/master' into dev
|
2018-11-05 09:56:52 +01:00 |
|
|
Mario
|
92ea3ef720
|
Merge branch 'dev' into 'dev'
more fixes for forum notifications handling: do not count likes/dislikes if…
See merge request hubzilla/core!1367
|
2018-11-05 09:42:07 +01:00 |
|
|
zotlabs
|
73d2719330
|
debug zot6 discovery
|
2018-11-04 19:35:55 -08:00 |
|
|
zotlabs
|
af82aab3a6
|
Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_merge
|
2018-11-04 13:58:02 -08:00 |
|
|
zotlabs
|
51b4b6216f
|
z6 updates to owa, linkinfo improved image detection
|
2018-11-04 13:56:32 -08:00 |
|
|
Mario Vavti
|
de32b0bba5
|
more fixes for forum notifications handling: do not count likes/dislikes if likes notifications are disabled and also do not show like activities when clicking a forum notification and like notifications are disabled
|
2018-11-03 20:53:23 +01:00 |
|
|
Mario
|
de0fab78ed
|
Merge branch 'dev' into 'dev'
Fixed typo at view/es-es/hstrings.php
See merge request hubzilla/core!1366
|
2018-11-03 20:11:14 +01:00 |
|
 Manuel Jiménez Friaza
|
71425c3b23
|
Fixed typo at view/es-es/hstrings.php
|
2018-11-03 19:19:01 +01:00 |
|
|
Mario
|
75f7b1e261
|
Merge branch 'patch-3' into 'dev'
Update hmessages.po
See merge request hubzilla/core!1365
|
2018-11-03 13:22:34 +01:00 |
|
|
Mario
|
9af35d998f
|
Merge branch 'patch-2' into 'dev'
Update hstrings.php
See merge request hubzilla/core!1364
|
2018-11-03 13:21:53 +01:00 |
|
|
Mario
|
34e3f3907a
|
Merge branch 'patch-22' into 'dev'
More precise content encoding detection on conversion
See merge request hubzilla/core!1363
|
2018-11-03 13:21:22 +01:00 |
|
|
Max Kostikov
|
46b0510b99
|
Update Linkinfo.php
|
2018-11-03 10:41:31 +01:00 |
|
|
Max Kostikov
|
a7624ea48b
|
Update Linkinfo.php
|
2018-11-03 00:10:05 +01:00 |
|
|
Max Kostikov
|
2f3b4a7aaf
|
Update Linkinfo.php
|
2018-11-03 00:01:15 +01:00 |
|
|
Max Kostikov
|
a9bbe0b128
|
Update Linkinfo.php
|
2018-11-02 22:40:48 +01:00 |
|
|
Max Kostikov
|
0d9d0a4b70
|
more precise codepage detection
|
2018-11-02 22:37:53 +01:00 |
|