aboutsummaryrefslogtreecommitdiff
path: root/src
Commit message (Expand)AuthorAge
* Merge branch 'feat/sidebar-alignment' into 'develop'Shpuld Shpludson2020-05-20
|\
| * Merge branch 'develop' into feat/sidebar-alignmentMark Felder2020-05-15
| |\
| * | Permit sidebar alignment with instance configuration optionMark Felder2020-05-12
* | | Merge branch 'fix/its-me-elements' into 'develop'Shpuld Shpludson2020-05-20
|\ \ \
| * | | Make a condition clear and unambiguousSergey Suprunenko2020-05-14
| * | | Show "it's you" label and hide follow btn for current userSergey Suprunenko2020-05-14
* | | | Merge branch 'chore/remote-unused-option' into 'develop'Shpuld Shpludson2020-05-20
|\ \ \ \
| * | | | Merge branch 'develop' into chore/remote-unused-optionMark Felder2020-05-14
| |\| | |
| * | | | Remove unused noAttachmentLinks optionMark Felder2020-05-13
| | |/ / | |/| |
* | | | Merge branch 'feat/add-embed-relationships' into 'develop'lain2020-05-17
|\ \ \ \ | |_|_|/ |/| | |
| * | | remove search1 with_relationshipsShpuld Shpuldson2020-05-13
| * | | don't send undefinedShpuld Shpuldson2020-05-13
| * | | add with_relationships where necessaryShpuld Shpuldson2020-05-13
| |/ /
* | | Merge remote-tracking branch 'weblate/develop' into resolve-weblate-merge-con...rinpatch2020-05-14
|\ \ \
| * | | Translated using Weblate (English)Anonymous2020-05-14
| * | | Translated using Weblate (Italian)Ben Is2020-05-14
| * | | Translated using Weblate (Dutch)Fristi2020-05-14
| * | | Translated using Weblate (Dutch)Fristi2020-05-14
| * | | Translated using Weblate (Dutch)Fristi2020-05-14
| | |/ | |/|
* | | Merge branch 'i18n/update-delete-description' into 'develop'HJ2020-05-14
|\ \ \ | |/ / |/| |
| * | Clarify that we only delete data, not the accountMark Felder2020-05-08
| |/
* | name setting should be with apiConfig sectionMark Felder2020-05-13
* | registrationOpen is not an FE settingMark Felder2020-05-13
* | Really alpha sort thisMark Felder2020-05-13
* | Merge branch 'develop' into chore/update-config-docsMark Felder2020-05-13
|\ \
| * | Translated using Weblate (Russian)rinpatch2020-05-13
| * | Translated using Weblate (Italian)Ben Is2020-05-13
| * | Translated using Weblate (Finnish)Shpuld Shpuldson2020-05-13
| * | Translated using Weblate (Polish)MichaƂ Sidor2020-05-13
| * | Translated using Weblate (Russian)rinpatch2020-05-13
| * | Translated using Weblate (Italian)Ben Is2020-05-13
| * | Translated using Weblate (German)Toro Mino2020-05-13
| * | Translated using Weblate (Finnish)Shpuld Shpuldson2020-05-13
| * | Translated using Weblate (Italian)Anonymous2020-05-13
| * | Translated using Weblate (Russian)rinpatch2020-05-13
| * | Translated using Weblate (Russian)hj2020-05-13
| * | Translated using Weblate (Russian)Alibek Omarov2020-05-13
| * | Translated using Weblate (Russian)Egor2020-05-12
| * | Translated using Weblate (French)Haelwenn (lanodan) Monnier2020-05-12
| |/
* | Split apiConfig options from static/config.json options;Mark Felder2020-05-13
* | loginMethod was missingMark Felder2020-05-13
* | Separate the user configurable sectionMark Felder2020-05-13
* | alpha sortMark Felder2020-05-13
|/
* Merge branch 'develop' into 'feat/relationship-refactor'Shpuld Shpludson2020-05-08
|\
| * Merge branch 'feat/status-content-separation' into 'develop'Shpuld Shpludson2020-05-08
| |\
| | * Separate status content from status like in direct conversations mrShpuld Shpuldson2020-04-27
| * | Merge branch 'develop' into 'feature/copy-link'Shpuld Shpludson2020-05-08
| |\ \
| | * \ Merge branch 'fix/signup-without-email' into 'develop'Shpuld Shpludson2020-05-07
| | |\ \
| | | * | make email validation conditional workShpuld Shpuldson2020-05-04
| | | * | Merge branch 'develop' into fix/signup-without-emailShpuld Shpuldson2020-05-04
| | | |\ \