aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs
Commit message (Expand)AuthorAgeFilesLines
* Status editor hookM. Dent2018-09-2917-17/+17
* 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-2928-99/+25
|\
| * Remove servicelevel logicM. Dent2018-09-299-79/+5
| * 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-281-1/+1
| * Merge branch 'patch-11' into 'dev'Max Kostikov2018-09-281-1/+1
| |\
| | * add translationsMax Kostikov2018-09-281-1/+1
| * | Merge branch 'patch-12' into 'dev'Max Kostikov2018-09-281-1/+1
| |\ \
| | * | Update Oauth2.phpMax Kostikov2018-09-281-1/+1
| | |/
| * | Merge branch 'patch-13' into 'dev'Max Kostikov2018-09-281-1/+1
| |\ \
| | * | Update Pdledit.phpMax Kostikov2018-09-281-1/+1
| | |/
| * | Merge branch 'patch-14' into 'dev'Max Kostikov2018-09-281-1/+1
| |\ \
| | * | Update Permcats.phpMax Kostikov2018-09-281-1/+1
| | |/
| * | Merge branch 'patch-15' into 'dev'Max Kostikov2018-09-281-1/+1
| |\ \
| | * | Update Poke.phpMax Kostikov2018-09-281-1/+1
| | |/
| * | Merge branch 'patch-16' into 'dev'Max Kostikov2018-09-281-1/+1
| |\ \
| | * | Update Sources.phpMax Kostikov2018-09-281-1/+1
| | |/
| * | Merge branch 'patch-17' into 'dev'Max Kostikov2018-09-281-1/+1
| |\ \
| | * | Update Tokens.phpMax Kostikov2018-09-281-1/+1
| | |/
| * | Merge branch 'patch-18' into 'dev'Max Kostikov2018-09-281-1/+1
| |\ \
| | * | Update Webpages.phpMax Kostikov2018-09-281-1/+1
| | |/
| * | Merge branch 'patch-19' into 'dev'Max Kostikov2018-09-281-1/+1
| |\ \
| | * | Update Wiki.phpMax Kostikov2018-09-281-1/+1
| | |/
| * | Merge branch 'patch-20' into 'dev'Max Kostikov2018-09-281-1/+1
| |\ \
| | * | Update Articles.phpMax Kostikov2018-09-281-1/+1
| | |/
| * | Merge branch 'patch-21' into 'dev'Max Kostikov2018-09-281-1/+1
| |\ \
| | * | Update Cards.phpMax Kostikov2018-09-281-1/+1
| | |/
| * | Merge branch 'patch-22' into 'dev'Max Kostikov2018-09-281-2/+2
| |\ \
| | * | Update Cdav.phpMax Kostikov2018-09-281-2/+2
| | |/
| * | Merge branch 'patch-23' into 'dev'Max Kostikov2018-09-281-1/+1
| |\ \
| | * | Update Chat.phpMax Kostikov2018-09-281-1/+1
| | |/