aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* uexport appMario Vavti2018-10-044-11/+24
|
* bump activity app versionMario2018-10-031-1/+1
|
* jot: show settings icon only to local profile ownerMario2018-10-032-1/+4
|
* move archives from network to channel_homeMario2018-10-031-8/+8
|
* Merge branch 'dev' of https://framagit.org/hubzilla/core into devMario Vavti2018-10-031-1/+1
|\
| * Merge branch 'dev' into 'dev'M. Dent2018-10-031-1/+1
| |\ | | | | | | | | | | | | Fix misplaced comma with period. See merge request hubzilla/core!1304
| | * Fix misplaced comma with period.M.Dent2018-10-021-1/+1
| | |
* | | move filing from conversation to network - it is only functional there.Mario Vavti2018-10-031-8/+8
|/ /
* | add app_destroy hook which allows addons to perform post delete actionsMario Vavti2018-10-023-0/+8
| |
* | do not rely on startpage pconfig anymoreMario Vavti2018-10-011-1/+1
| |
* | do not default to channel_startpage if startpage app is not installedMario Vavti2018-10-011-4/+2
| |
* | indicate locked featuresMario Vavti2018-10-013-5/+3
|/
* Merge branch 'status-editor-hook' into 'dev'M. Dent2018-09-2920-18/+66
|\ | | | | | | | | Status editor hook See merge request hubzilla/core!1300
| * Status editor hookM. Dent2018-09-2920-18/+66
|/
* do not unset $_GET[search] and adjust activity_order widgetMario Vavti2018-09-292-2/+2
|
* improve network searchMario Vavti2018-09-291-15/+4
|
* Merge branch 'dev' of https://framagit.org/hubzilla/core into devMario Vavti2018-09-2935-129/+28
|\
| * Merge branch 'remove-servicelevel-logic' into 'dev'M. Dent2018-09-2916-109/+8
| |\ | | | | | | | | | | | | Remove servicelevel logic See merge request hubzilla/core!1291
| | * Remove servicelevel logicM. Dent2018-09-2916-109/+8
| |/
| * Merge translations for non-installed apps messageM. Dent2018-09-2819-20/+20
| |\ | | | | | | See merge request hubzilla/core!1296
| | * Update Group.phpMax Kostikov2018-09-281-1/+1
| | |
| | * Update Wiki.phpMax Kostikov2018-09-281-1/+1
| | |
| | * Update Webpages.phpMax Kostikov2018-09-281-1/+1
| | |
| | * Update Tokens.phpMax Kostikov2018-09-281-1/+1
| | |
| | * Update Sources.phpMax Kostikov2018-09-281-1/+1
| | |
| | * Update Poke.phpMax Kostikov2018-09-281-1/+1
| | |
| | * Update Permcats.phpMax Kostikov2018-09-281-1/+1
| | |
| | * Update Pdledit.phpMax Kostikov2018-09-281-1/+1
| | |
| | * Update Oauth2.phpMax Kostikov2018-09-281-1/+1
| | |
| | * Update Oauth.phpMax Kostikov2018-09-281-1/+1
| | |
| | * Update Notes.phpMax Kostikov2018-09-281-1/+1
| | |
| | * Update Mood.phpMax Kostikov2018-09-281-1/+1
| | |
| | * Update Lang.phpMax Kostikov2018-09-281-1/+1
| | |
| | * Update Invite.phpMax Kostikov2018-09-281-1/+1
| | |
| | * Update Connect.phpMax Kostikov2018-09-281-1/+1
| | |
| | * Update Chat.phpMax Kostikov2018-09-281-1/+1
| | |
| | * Update Cdav.phpMax Kostikov2018-09-281-2/+2
| | |
| | * Update Cards.phpMax Kostikov2018-09-281-1/+1
| | |
| | * Update Articles.phpMax Kostikov2018-09-280-0/+0
| | |
| | * Update Articles.phpMax Kostikov2018-09-281-1/+1
| | |
| | * Merge branch 'patch-11' into 'dev'Max Kostikov2018-09-281-1/+1
| | |\ | | | | | | | | | | | | | | | | add translations See merge request Kostikov/core!21
| | | * add translationsMax Kostikov2018-09-281-1/+1
| | |/ | |/|
| | * Merge branch 'patch-12' into 'dev'Max Kostikov2018-09-281-1/+1
| | |\ | | | | | | | | | | | | | | | | Update Oauth2.php See merge request Kostikov/core!20
| | | * Update Oauth2.phpMax Kostikov2018-09-281-1/+1
| | |/ | |/|
| | * Merge branch 'patch-13' into 'dev'Max Kostikov2018-09-281-1/+1
| | |\ | | | | | | | | | | | | | | | | Update Pdledit.php See merge request Kostikov/core!19
| | | * Update Pdledit.phpMax Kostikov2018-09-281-1/+1
| | |/ | |/|
| | * Merge branch 'patch-14' into 'dev'Max Kostikov2018-09-281-1/+1
| | |\ | | | | | | | | | | | | | | | | Update Permcats.php See merge request Kostikov/core!18
| | | * Update Permcats.phpMax Kostikov2018-09-281-1/+1
| | |/ | |/|
| | * Merge branch 'patch-15' into 'dev'Max Kostikov2018-09-281-1/+1
| | |\ | | | | | | | | | | | | | | | | Update Poke.php See merge request Kostikov/core!17
| | | * Update Poke.phpMax Kostikov2018-09-281-1/+1
| | |/ | |/|