Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'dev' into 'dev' | M. Dent | 2018-10-03 | 1 | -1/+1 |
|\ | | | | | | | | | Fix misplaced comma with period. See merge request hubzilla/core!1304 | ||||
| * | Fix misplaced comma with period. | M.Dent | 2018-10-02 | 1 | -1/+1 |
| | | |||||
* | | add app_destroy hook which allows addons to perform post delete actions | Mario Vavti | 2018-10-02 | 3 | -0/+8 |
| | | |||||
* | | do not rely on startpage pconfig anymore | Mario Vavti | 2018-10-01 | 1 | -1/+1 |
| | | |||||
* | | do not default to channel_startpage if startpage app is not installed | Mario Vavti | 2018-10-01 | 1 | -4/+2 |
| | | |||||
* | | indicate locked features | Mario Vavti | 2018-10-01 | 3 | -5/+3 |
|/ | |||||
* | Merge branch 'status-editor-hook' into 'dev' | M. Dent | 2018-09-29 | 20 | -18/+66 |
|\ | | | | | | | | | Status editor hook See merge request hubzilla/core!1300 | ||||
| * | Status editor hook | M. Dent | 2018-09-29 | 20 | -18/+66 |
|/ | |||||
* | do not unset $_GET[search] and adjust activity_order widget | Mario Vavti | 2018-09-29 | 2 | -2/+2 |
| | |||||
* | improve network search | Mario Vavti | 2018-09-29 | 1 | -15/+4 |
| | |||||
* | Merge branch 'dev' of https://framagit.org/hubzilla/core into dev | Mario Vavti | 2018-09-29 | 35 | -129/+28 |
|\ | |||||
| * | Merge branch 'remove-servicelevel-logic' into 'dev' | M. Dent | 2018-09-29 | 16 | -109/+8 |
| |\ | | | | | | | | | | | | | Remove servicelevel logic See merge request hubzilla/core!1291 | ||||
| | * | Remove servicelevel logic | M. Dent | 2018-09-29 | 16 | -109/+8 |
| |/ | |||||
| * | Merge translations for non-installed apps message | M. Dent | 2018-09-28 | 19 | -20/+20 |
| |\ | | | | | | | See merge request hubzilla/core!1296 | ||||
| | * | Update Group.php | Max Kostikov | 2018-09-28 | 1 | -1/+1 |
| | | | |||||
| | * | Update Wiki.php | Max Kostikov | 2018-09-28 | 1 | -1/+1 |
| | | | |||||
| | * | Update Webpages.php | Max Kostikov | 2018-09-28 | 1 | -1/+1 |
| | | | |||||
| | * | Update Tokens.php | Max Kostikov | 2018-09-28 | 1 | -1/+1 |
| | | | |||||
| | * | Update Sources.php | Max Kostikov | 2018-09-28 | 1 | -1/+1 |
| | | | |||||
| | * | Update Poke.php | Max Kostikov | 2018-09-28 | 1 | -1/+1 |
| | | | |||||
| | * | Update Permcats.php | Max Kostikov | 2018-09-28 | 1 | -1/+1 |
| | | | |||||
| | * | Update Pdledit.php | Max Kostikov | 2018-09-28 | 1 | -1/+1 |
| | | | |||||
| | * | Update Oauth2.php | Max Kostikov | 2018-09-28 | 1 | -1/+1 |
| | | | |||||
| | * | Update Oauth.php | Max Kostikov | 2018-09-28 | 1 | -1/+1 |
| | | | |||||
| | * | Update Notes.php | Max Kostikov | 2018-09-28 | 1 | -1/+1 |
| | | | |||||
| | * | Update Mood.php | Max Kostikov | 2018-09-28 | 1 | -1/+1 |
| | | | |||||
| | * | Update Lang.php | Max Kostikov | 2018-09-28 | 1 | -1/+1 |
| | | | |||||
| | * | Update Invite.php | Max Kostikov | 2018-09-28 | 1 | -1/+1 |
| | | | |||||
| | * | Update Connect.php | Max Kostikov | 2018-09-28 | 1 | -1/+1 |
| | | | |||||
| | * | Update Chat.php | Max Kostikov | 2018-09-28 | 1 | -1/+1 |
| | | | |||||
| | * | Update Cdav.php | Max Kostikov | 2018-09-28 | 1 | -2/+2 |
| | | | |||||
| | * | Update Cards.php | Max Kostikov | 2018-09-28 | 1 | -1/+1 |
| | | | |||||
| | * | Update Articles.php | Max Kostikov | 2018-09-28 | 0 | -0/+0 |
| | | | |||||
| | * | Update Articles.php | Max Kostikov | 2018-09-28 | 1 | -1/+1 |
| | | | |||||
| | * | Merge branch 'patch-11' into 'dev' | Max Kostikov | 2018-09-28 | 1 | -1/+1 |
| | |\ | | | | | | | | | | | | | | | | | add translations See merge request Kostikov/core!21 | ||||
| | | * | add translations | Max Kostikov | 2018-09-28 | 1 | -1/+1 |
| | |/ | |/| | |||||
| | * | Merge branch 'patch-12' into 'dev' | Max Kostikov | 2018-09-28 | 1 | -1/+1 |
| | |\ | | | | | | | | | | | | | | | | | Update Oauth2.php See merge request Kostikov/core!20 | ||||
| | | * | Update Oauth2.php | Max Kostikov | 2018-09-28 | 1 | -1/+1 |
| | |/ | |/| | |||||
| | * | Merge branch 'patch-13' into 'dev' | Max Kostikov | 2018-09-28 | 1 | -1/+1 |
| | |\ | | | | | | | | | | | | | | | | | Update Pdledit.php See merge request Kostikov/core!19 | ||||
| | | * | Update Pdledit.php | Max Kostikov | 2018-09-28 | 1 | -1/+1 |
| | |/ | |/| | |||||
| | * | Merge branch 'patch-14' into 'dev' | Max Kostikov | 2018-09-28 | 1 | -1/+1 |
| | |\ | | | | | | | | | | | | | | | | | Update Permcats.php See merge request Kostikov/core!18 | ||||
| | | * | Update Permcats.php | Max Kostikov | 2018-09-28 | 1 | -1/+1 |
| | |/ | |/| | |||||
| | * | Merge branch 'patch-15' into 'dev' | Max Kostikov | 2018-09-28 | 1 | -1/+1 |
| | |\ | | | | | | | | | | | | | | | | | Update Poke.php See merge request Kostikov/core!17 | ||||
| | | * | Update Poke.php | Max Kostikov | 2018-09-28 | 1 | -1/+1 |
| | |/ | |/| | |||||
| | * | Merge branch 'patch-16' into 'dev' | Max Kostikov | 2018-09-28 | 1 | -1/+1 |
| | |\ | | | | | | | | | | | | | | | | | Update Sources.php See merge request Kostikov/core!16 | ||||
| | | * | Update Sources.php | Max Kostikov | 2018-09-28 | 1 | -1/+1 |
| | |/ | |/| | |||||
| | * | Merge branch 'patch-17' into 'dev' | Max Kostikov | 2018-09-28 | 1 | -1/+1 |
| | |\ | | | | | | | | | | | | | | | | | Update Tokens.php See merge request Kostikov/core!15 | ||||
| | | * | Update Tokens.php | Max Kostikov | 2018-09-28 | 1 | -1/+1 |
| | |/ | |/| | |||||
| | * | Merge branch 'patch-18' into 'dev' | Max Kostikov | 2018-09-28 | 1 | -1/+1 |
| | |\ | | | | | | | | | | | | | | | | | Update Webpages.php See merge request Kostikov/core!14 | ||||
| | | * | Update Webpages.php | Max Kostikov | 2018-09-28 | 1 | -1/+1 |
| | |/ | |/| |