harukin
b9f1cb2021
Merge branch 'origin' into 'japanese'
...
Update 4.0.3
See merge request harukin/core!54
2019-04-28 18:00:17 +09:00
Mario
f6a4084f81
bump version
2019-04-26 11:30:23 +02:00
Mario Vavti
d5f89c165a
update changelog
...
(cherry picked from commit a518471a27
2019-04-26 11:29:01 +02:00
zotlabs
dce5080e53
permissions cleanup
...
(cherry picked from commit 2d886b65ce
2019-04-26 10:52:35 +02:00
zotlabs
2221d4d612
add attachments to zot6 event objects, add zot6 to federated transports (webfinger)
...
(cherry picked from commit 0615709a7a
2019-04-26 10:43:56 +02:00
Zot
5f73a46c05
import/export zot6 hublocs+xchans
...
(cherry picked from commit e2dfa1d72f
2019-04-26 10:42:09 +02:00
Zot
b782c6bd16
update fix_system_urls() to handle zot6 hublocs (recommend cherry-pick to master)
...
(cherry picked from commit f8c583636c
2019-04-26 10:41:52 +02:00
Zot
ab8d8aa552
hubloc confusion in magic auth
...
(cherry picked from commit 3c8f8b76aa
2019-04-26 10:41:35 +02:00
Daniel Lowe
f955276694
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.
(cherry picked from commit 9a6531e2a2
2019-04-26 10:41:04 +02:00
zotlabs
77cc60faf2
required php version not available but allowed to continue
...
(cherry picked from commit 6feddcbced
2019-04-26 10:40:02 +02:00
harukin
d55f691ec0
Merge branch 'origin' into 'japanese'
...
Update 4.0.2
See merge request harukin/core!51
2019-04-18 06:40:08 +09:00
Mario Vavti
dcd8a05809
version bump
2019-04-08 11:12:02 +02:00
Mario Vavti
62e466f774
Merge branch 'dev'
2019-04-08 11:10:10 +02:00
Mario Vavti
70777a047d
Merge branch 'master' of https://framagit.org/hubzilla/core
2019-04-08 11:09:55 +02:00
Mario Vavti
47fd95db9d
more changelog
2019-04-08 11:03:33 +02:00
Mario Vavti
7602d9e54b
changelog and version bump
2019-04-08 11:00:21 +02:00
Mario Vavti
b026be410c
Merge branch 'dev' of https://framagit.org/hubzilla/core into dev
2019-04-07 22:48:33 +02:00
Mario Vavti
767a1711ff
enable list views
2019-04-06 16:10:50 +02:00
zotlabs
a93bd8d944
security: perms_pending not evaluated correctly
...
(cherry picked from commit 5a46f1229d
2019-04-06 10:30:32 +02:00
Mario
4e12f86e90
Merge branch 'dev' into 'dev'
...
security: perms_pending not evaluated correctly
See merge request hubzilla/core!1583
2019-04-06 10:27:30 +02:00
Mario Vavti
3007009fab
upgrade cdav calendar to version 4
2019-04-06 10:22:03 +02:00
zotlabs
8700b87030
Merge branch 'dev' of ../hz into dev
2019-04-05 16:48:04 -07:00
zotlabs
5a46f1229d
security: perms_pending not evaluated correctly
2019-04-05 16:46:52 -07:00
Max Kostikov
9d5f8883a7
Merge branch 'dev' into 'dev'
...
Prevent return wrong profile photo modification date by plugin
See merge request hubzilla/core!1582
2019-04-05 14:24:22 +02:00
Max Kostikov
8e0b9b82e9
Update Photo.php
2019-04-05 14:21:05 +02:00
Max Kostikov
ea4b4ddce4
Update Photo.php
2019-04-05 14:17:39 +02:00
Max Kostikov
bd95c7b82a
Update Photo.php
2019-04-05 14:15:40 +02:00
Max Kostikov
e20c5cf9cf
Prevent return wrong profile photo modification date by plugin
2019-04-05 14:10:48 +02:00
Mario
6adb489cb3
Merge branch 'dev' into 'dev'
...
Sync cover photo removal with clones
See merge request hubzilla/core!1581
2019-04-04 16:46:40 +02:00
Max Kostikov
0c2db1cea5
Skip removal if no cover image found
2019-04-04 11:00:19 +02:00
Max Kostikov
e33604887b
Sync cover photo removal with clones
2019-04-03 12:05:22 +02:00
Max Kostikov
410f37df1b
Fix sync cover photo for clonned channels
2019-04-03 00:15:34 +02:00
Mario
c9f3883c8c
Remove suggest channels from features
2019-04-02 15:12:32 +02:00
Mario
4346d7605d
Revert "Revert "suggestion widget using feature_enabled still - upgrade to use apps.""
...
This reverts commit a0a2c27973
2019-04-02 14:59:35 +02:00
Mario
a0a2c27973
Revert "suggestion widget using feature_enabled still - upgrade to use apps."
...
This reverts commit b2bdc73164
2019-04-02 14:55:03 +02:00
Max Kostikov
3fb87ee76e
Merge branch 'cover_photo_fixes' into 'dev'
...
missing string
See merge request hubzilla/core!1580
2019-04-01 17:26:27 +02:00
Max Kostikov
242aeea24c
Add text to cover remove button
2019-04-01 13:15:16 +02:00
Mario Vavti
c305dc8d22
missing string
2019-04-01 12:55:36 +02:00
Mario
f61b898633
Merge branch 'dev' into 'dev'
...
Add remove cover photo function
See merge request hubzilla/core!1577
2019-04-01 12:42:28 +02:00
Mario
2bdcd436bb
Merge branch 'dev' into 'dev'
...
check service class limits when syncing files
See merge request hubzilla/core!1578
2019-04-01 12:42:07 +02:00
zotlabs
a1bea7d7cc
Merge branch 'dev' of ../hz into dev
2019-03-31 16:23:04 -07:00
zotlabs
b2bdc73164
suggestion widget using feature_enabled still - upgrade to use apps.
2019-03-31 16:22:02 -07:00
zotlabs
cbaf0a3864
check service class limits when syncing files
2019-03-30 15:11:13 -07:00
zotlabs
103563b375
we no longer use xchan_instance_url - this is an abook thing
2019-03-30 15:10:28 -07:00
Max Kostikov
595429fdde
Add submit button styling
2019-03-30 23:08:41 +01:00
Max Kostikov
b384b27546
Revert "Add submit button styling"
...
This reverts commit 0b996245d5
2019-03-30 23:05:37 +01:00
Max Kostikov
0b996245d5
Add submit button styling
2019-03-30 23:01:07 +01:00
Max Kostikov
1ee91dd690
Add remove cover photo processing
2019-03-30 22:55:36 +01:00
Max Kostikov
f9e602c44c
Add remove cover button
2019-03-30 22:54:20 +01:00
M. Dent
4fa827ddfd
Merge branch 'connections_ordering' into 'dev'
...
add backend support for connections ordering
See merge request hubzilla/core!1576
2019-03-29 18:19:06 +01:00
