zotlabs
|
999ae6eb49
|
typo
|
2019-04-08 17:03:08 -07:00 |
|
zotlabs
|
ae1450bbcf
|
missing endTime on Zot6 encoded events, optimise the url fetch of embedphotos
|
2019-04-08 16:45:07 -07:00 |
|
zotlabs
|
1ed0079882
|
Merge branch 'dev' of https://gitlab.com/macgirvin/hubzilla into dev
|
2019-04-07 19:23:38 -07: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 |
|
zotlabs
|
2d886b65ce
|
permissions cleanup
|
2019-04-05 18:06:59 -07: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 |
|
Mario Vavti
|
1b3c73618c
|
backslash
|
2019-03-29 15:51:31 +01:00 |
|
Mario Vavti
|
7b08f1cc8c
|
missing use declaration
|
2019-03-29 15:50:10 +01:00 |
|
Max Kostikov
|
7d392e5adb
|
Merge branch 'z6_discover_fixes' into 'dev'
fix various issues in z6_discover() and add zot6 hubloc creation on channel import
See merge request hubzilla/core!1575
|
2019-03-29 15:28:28 +01:00 |
|
Mario Vavti
|
f44cc2b60c
|
fix typo
|
2019-03-28 15:56:28 +01:00 |
|
Mario Vavti
|
31680898e3
|
another fix for z6_discover() and create a zot6 hubloc if applicable
|
2019-03-28 15:51:24 +01:00 |
|
Mario Vavti
|
318fd7c9e3
|
add backend support for connections ordering
|
2019-03-27 20:42:56 +01:00 |
|
Mario Vavti
|
b10b8ca3f4
|
fix various issues in z6_discover()
|
2019-03-27 15:20:43 +01:00 |
|
Max Kostikov
|
b0c33308be
|
Fix wrong bracket
|
2019-03-27 00:34:38 +01:00 |
|
Max Kostikov
|
1421c4e9d3
|
Merge branch 'dev' into 'dev'
Fix wrong permissions on attached images in personal messages
See merge request hubzilla/core!1574
|
2019-03-27 00:26:26 +01:00 |
|
Max Kostikov
|
f55dfc9025
|
Fix wrong permissions on attached images in personal messages
|
2019-03-27 00:17:14 +01:00 |
|
Max Kostikov
|
c218970890
|
Merge branch 'duplicate_fixes_1' into 'dev'
if we have an uuid deduplicate by uuid otherwise by mid
See merge request hubzilla/core!1573
|
2019-03-25 12:24:36 +01:00 |
|
Mario
|
bd27ce2520
|
Merge branch 'patch-20190324a' into 'dev'
Add ITEM_TYPE_CUSTOM support to Zotlabs/Module/Display.php
See merge request hubzilla/core!1572
|
2019-03-25 11:58:38 +01:00 |
|
Mario Vavti
|
44795b65f9
|
if we have an uuid deduplicate by uuid otherwise by mid
|
2019-03-25 11:33:01 +01:00 |
|
DM42.Net (Matt Dent)
|
af84c4e6bd
|
Add ITEM_TYPE_CUSTOM support to Zotlabs/Module/Display.php
|
2019-03-24 22:56:18 -04:00 |
|
Mario Vavti
|
0a28207200
|
fix wrong field name
|
2019-03-24 21:45:23 +01:00 |
|
Mario Vavti
|
8ca2a5832c
|
Revert "item_store(): deduplicate by mid OR uuid"
This reverts commit d8ce0d0df0.
|
2019-03-24 21:22:20 +01:00 |
|