aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'patch-6' into 'dev'Mario2018-10-064-4/+4
| | | | | | | | | | | | Add new table names in docs See merge request hubzilla/core!1315 (cherry picked from commit 778086ce199c38be793ed59e03eb0446af9263ec) 4f70fd3e Add new table names in docs 2e4772ac Update db_groups.bb 4cb46c12 Update intro_for_developers.bb c087aaf5 Update database.bb
* Merge branch 'patch-5' into 'dev'Mario2018-10-061-2/+2
| | | | | | | | | Respect new table names on import See merge request hubzilla/core!1314 (cherry picked from commit 3e231e7c13744ec4d2803941395fb00d8aa2d67f) ebb4811a Respect new table names on import
* Merge branch 'undefined' into '3.8RC'Mario2018-10-052-14033/+14150
|\ | | | | | | | | New russian translations See merge request hubzilla/core!1308
| * New russian translations hmessages.poMax Kostikov2018-10-051-11229/+11308
| |
| * New russian translations hstrings.phpMax Kostikov2018-10-051-2804/+2842
|/
* Merge branch '3.8RC' of https://framagit.org/hubzilla/core into 3.8RCMario Vavti2018-10-052-1/+7
|\
| * do not propagate channel deletion for an already deleted channel.zotlabs2018-10-051-0/+6
| | | | | | (cherry picked from commit 7c1e99884cf9013d68dcce174e8f8d4f9dac49f7)
| * regression: double linebreaks in viewsrc outputzotlabs2018-10-051-1/+1
| | | | | | (cherry picked from commit d33c331abd3ae500fc7cdac206ea647c4c71905e)
* | force major version system apps import for 3.8RC - remove this at a later pointMario Vavti2018-10-051-0/+7
|/
* optimize autoloaderMario Vavti2018-10-052-8/+34
|
* stringsMario Vavti2018-10-051-2535/+2720
|
* bump versionMario Vavti2018-10-051-2/+1
|
* fix issues with bs accordionsMario Vavti2018-10-044-7/+7
|
* fix displaying of perm cats selectorMario Vavti2018-10-041-2/+4
|
* whitespaceMario Vavti2018-10-041-1/+0
|
* move *_divmore_height setting to the module extra_settings, and fix issue ↵Mario Vavti2018-10-0414-18/+95
| | | | where feature settings were not synced if rpath was provided
* move *_list_mode to featuresMario Vavti2018-10-045-10/+18
|
* Merge branch 'patch-1' into 'dev'Mario2018-10-041-5/+4
|\ | | | | | | | | Incorrect block wrapping fixed See merge request hubzilla/core!1306
| * Update settings.tplMax Kostikov2018-10-041-5/+4
| |
* | Merge branch 'patch-1' into 'dev'Mario2018-10-041-19/+21
|\| | | | | | | | | button sticking fixed See merge request hubzilla/core!1305
| * button sticking fixedMax Kostikov2018-10-031-19/+21
| |
* | remove redundant varMario Vavti2018-10-041-2/+0
| |
* | add apd fileMario Vavti2018-10-041-0/+6
| |
* | defperm appMario Vavti2018-10-043-23/+39
| |
* | 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
| | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-25 19:52:37 +0000