Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | typo | zotlabs | 2019-04-08 | 1 | -1/+1 |
* | missing endTime on Zot6 encoded events, optimise the url fetch of embedphotos | zotlabs | 2019-04-08 | 2 | -34/+60 |
* | Merge branch 'dev' of https://gitlab.com/macgirvin/hubzilla into dev | zotlabs | 2019-04-07 | 5 | -35/+57 |
|\ | |||||
| * | Merge branch 'dev' into 'dev' | Mario | 2019-04-06 | 1 | -3/+3 |
| |\ | |||||
| * \ | Merge branch 'dev' into 'dev' | Max Kostikov | 2019-04-05 | 1 | -21/+24 |
| |\ \ | |||||
| | * | | Update Photo.php | Max Kostikov | 2019-04-05 | 1 | -5/+5 |
| | * | | Update Photo.php | Max Kostikov | 2019-04-05 | 1 | -1/+1 |
| | * | | Update Photo.php | Max Kostikov | 2019-04-05 | 1 | -3/+4 |
| | * | | Prevent return wrong profile photo modification date by plugin | Max Kostikov | 2019-04-05 | 1 | -21/+23 |
| * | | | Merge branch 'dev' into 'dev' | Mario | 2019-04-04 | 1 | -4/+16 |
| |\| | | |||||
| | * | | Skip removal if no cover image found | Max Kostikov | 2019-04-04 | 1 | -6/+7 |
| | * | | Sync cover photo removal with clones | Max Kostikov | 2019-04-03 | 1 | -2/+13 |
| |/ / | |||||
| * | | Fix sync cover photo for clonned channels | Max Kostikov | 2019-04-03 | 1 | -2/+5 |
| * | | Remove suggest channels from features | Mario | 2019-04-02 | 1 | -8/+0 |
| * | | Revert "Revert "suggestion widget using feature_enabled still - upgrade to us... | Mario | 2019-04-02 | 1 | -2/+4 |
| * | | Revert "suggestion widget using feature_enabled still - upgrade to use apps." | Mario | 2019-04-02 | 1 | -4/+2 |
| * | | Merge branch 'cover_photo_fixes' into 'dev' | Max Kostikov | 2019-04-01 | 0 | -0/+0 |
| |\ \ | |||||
| | * | | missing string | Mario Vavti | 2019-04-01 | 1 | -0/+1 |
| * | | | Add text to cover remove button | Max Kostikov | 2019-04-01 | 1 | -0/+1 |
| |/ / | |||||
| * | | Merge branch 'dev' into 'dev' | Mario | 2019-04-01 | 3 | -2/+13 |
| |\ \ | |||||
| | * | | Add submit button styling | Max Kostikov | 2019-03-30 | 1 | -1/+1 |
| | * | | Add remove cover photo processing | Max Kostikov | 2019-03-30 | 1 | -0/+10 |
| | * | | Add remove cover button | Max Kostikov | 2019-03-30 | 1 | -1/+2 |
| * | | | Merge branch 'dev' into 'dev' | Mario | 2019-04-01 | 4 | -4/+20 |
| |\ \ \ | |||||
| * | | | | Revert "Add submit button styling" | Max Kostikov | 2019-03-30 | 1 | -1/+1 |
* | | | | | permissions cleanup | zotlabs | 2019-04-05 | 1 | -4/+12 |
| |_|_|/ |/| | | | |||||
* | | | | Merge branch 'dev' of ../hz into dev | zotlabs | 2019-04-05 | 1 | -3/+3 |
|\ \ \ \ | |_|/ / |/| | | | |||||
| * | | | security: perms_pending not evaluated correctly | zotlabs | 2019-04-05 | 1 | -3/+3 |
* | | | | Merge branch 'dev' of ../hz into dev | zotlabs | 2019-03-31 | 2 | -3/+5 |
|\| | | | |||||
| * | | | suggestion widget using feature_enabled still - upgrade to use apps. | zotlabs | 2019-03-31 | 1 | -2/+4 |
| * | | | nomadic is not a parameter in the hz version of encode_item_collection | zotlabs | 2019-03-21 | 1 | -1/+1 |
* | | | | check service class limits when syncing files | zotlabs | 2019-03-30 | 1 | -0/+14 |
* | | | | we no longer use xchan_instance_url - this is an abook thing | zotlabs | 2019-03-30 | 1 | -1/+1 |
| |/ / |/| | | |||||
* | | | Add submit button styling | Max Kostikov | 2019-03-30 | 1 | -1/+1 |
* | | | Merge branch 'connections_ordering' into 'dev' | M. Dent | 2019-03-29 | 1 | -2/+16 |
|\ \ \ | |||||
| * | | | add backend support for connections ordering | Mario Vavti | 2019-03-27 | 1 | -2/+16 |
* | | | | backslash | Mario Vavti | 2019-03-29 | 1 | -1/+1 |
* | | | | missing use declaration | Mario Vavti | 2019-03-29 | 1 | -0/+2 |
* | | | | Merge branch 'z6_discover_fixes' into 'dev' | Max Kostikov | 2019-03-29 | 2 | -5/+39 |
|\ \ \ \ | |_|_|/ |/| | | | |||||
| * | | | fix typo | Mario Vavti | 2019-03-28 | 1 | -2/+2 |
| * | | | another fix for z6_discover() and create a zot6 hubloc if applicable | Mario Vavti | 2019-03-28 | 2 | -2/+34 |
| * | | | fix various issues in z6_discover() | Mario Vavti | 2019-03-27 | 1 | -3/+5 |
| |/ / | |||||
* | | | Fix wrong bracket | Max Kostikov | 2019-03-27 | 1 | -2/+2 |
* | | | Merge branch 'dev' into 'dev' | Max Kostikov | 2019-03-27 | 1 | -2/+2 |
|\ \ \ | |/ / |/| | | |||||
| * | | Fix wrong permissions on attached images in personal messages | Max Kostikov | 2019-03-27 | 1 | -2/+2 |
|/ / | |||||
* | | Merge branch 'duplicate_fixes_1' into 'dev' | Max Kostikov | 2019-03-25 | 1 | -5/+15 |
|\ \ | |||||
| * | | if we have an uuid deduplicate by uuid otherwise by mid | Mario Vavti | 2019-03-25 | 1 | -5/+15 |
* | | | Merge branch 'patch-20190324a' into 'dev' | Mario | 2019-03-25 | 1 | -0/+5 |
|\ \ \ | |/ / |/| | | |||||
| * | | Add ITEM_TYPE_CUSTOM support to Zotlabs/Module/Display.php | DM42.Net (Matt Dent) | 2019-03-24 | 1 | -0/+5 |
|/ / | |||||
* | | fix wrong field name | Mario Vavti | 2019-03-24 | 1 | -2/+2 |