aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'channel-limits' into 'dev'M. Dent2018-09-281-2/+6
|\ | | | | | | | | Hide form when at or over service_class['limit_identities'] See merge request hubzilla/core!1292
| * Hide form when at or over service_class['limit_identities']M.Dent2018-09-271-2/+6
| |
* | Merge branch 'patch-9' into 'dev'M. Dent2018-09-281-2/+17
|\ \ | | | | | | | | | | | | Add translation for new apps See merge request hubzilla/core!1289
| * | Add translation for new appsMax Kostikov2018-09-271-2/+17
| |/
* / Missprint in Oauth.php fixedMax Kostikov2018-09-271-1/+1
|/
* Merge branch 'dev' into 'dev'M. Dent2018-09-271-0/+1
|\ | | | | | | | | Translate system app names See merge request hubzilla/core!1286
| * Translate system app namesM.Dent2018-09-271-0/+1
| |
* | implement conversation tools (settings/conversation), remove additional ↵Mario Vavti2018-09-274-44/+66
| | | | | | | | features from the settings menu and get rid of skill levels
* | tokens: add css file and fix argc and argv valuesMario Vavti2018-09-261-3/+3
| |
* | guest access appMario Vavti2018-09-263-19/+29
| |
* | permcats appMario Vavti2018-09-264-21/+30
|/
* remove oauth from featuresMario Vavti2018-09-261-16/+0
|
* add check for local_channel()Mario Vavti2018-09-262-0/+13
|
* change wordingMario Vavti2018-09-262-4/+4
|
* wrong app nameMario Vavti2018-09-261-1/+1
|
* oauth and oauth2 apps managerMario Vavti2018-09-262-45/+76
|
* appification of the pdl editor and move advanced_theming to theme settings ↵Mario Vavti2018-09-262-15/+16
| | | | where it belongs
* appification of privacy groupsMario Vavti2018-09-252-6/+27
|
* move advanced_theming switch to settings/display for nowMario Vavti2018-09-251-3/+8
|
* move start_menu switch to settings/display for nowMario Vavti2018-09-252-2/+19
|
* premium channel appMario Vavti2018-09-252-39/+48
|
* appification of notesMario Vavti2018-09-242-11/+44
|
* Merge branch 'app-installed-filters' into 'dev'Mario2018-09-241-4/+31
|\ | | | | | | | | Add filters for addon/app installed checks and docs See merge request hubzilla/core!1284
| * Add filters for addon/app installed checks and docsM.Dent2018-09-231-4/+31
| |
* | add fileMario2018-09-241-0/+43
| |
* | settings for directory and set App::$profile_uid in directory if local_channel()Mario2018-09-241-1/+5
| |
* | only explain how to select a channel if there are channels to selectMario2018-09-231-2/+2
|/
* minor cleanupMario2018-09-231-2/+0
|
* use different settings for cal_first_day in events and cdav/calendar. This ↵Mario2018-09-232-2/+2
| | | | is a tradeoff. It would be better to have one setting for both but if we want to preserve the *all settings* view, this would break its functionality
* settings for events and cdav calendarMario2018-09-237-5/+138
|
* provide settings for mod photo and make it slightly simpler to create new ↵Mario2018-09-235-32/+57
| | | | module settings
* keep the features in the central array but sort them by module nameMario2018-09-235-232/+20
|
* this should be off by defaultMario2018-09-221-1/+1
|
* add files and settings for channel managerMario2018-09-223-1/+128
|
* introduce profile settings and provide a way for modules without an app to ↵Mario2018-09-221-2/+2
| | | | still be able to link to its settings page from the navbar
* Merge branch 'dev' of https://framagit.org/hubzilla/core into devMario Vavti2018-09-221-2/+13
|\
| * Page meta propertiesM. Dent2018-09-221-2/+13
| |
* | appification of sourcesMario Vavti2018-09-222-16/+15
|/
* add fileMario Vavti2018-09-211-0/+120
|
* provide a return path from settings pagesMario Vavti2018-09-213-1/+6
|
* compare strpos() result against falseMario Vavti2018-09-211-1/+2
|
* don't double encodezotlabs2018-09-202-2/+2
|
* remove bbcode from event hovertipzotlabs2018-09-202-3/+4
|
* Merge branch 'dev'zotlabs2018-09-204-42/+85
|\
| * remove connection filter from network settingsMario Vavti2018-09-201-8/+0
| |
| * move connection filtering setting from network to connections, provide a ↵Mario Vavti2018-09-203-21/+65
| | | | | | | | link to settings in the navbar if present for a module and some code optimisation
| * Merge remote-tracking branch 'mike/master' into devMario Vavti2018-09-201-1/+1
| |\
| * | allow a second url in apd files for settings, hide pin and star buttons in ↵Mario Vavti2018-09-191-11/+19
| | | | | | | | | | | | edit mode and use strpos() instead of strstr() in some places
| * | Merge remote-tracking branch 'mike/master' into devMario Vavti2018-09-192-5/+5
| |\ \
| * | | remove superfluous commaMario Vavti2018-09-171-1/+1
| | | |