diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 28544205f693dda1d9b5f25f32fbb0140d32b717..6ef3b7e306272d8202bcb88a8636729aeb855164 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -39,6 +39,7 @@ Changed Fixed ~~~~~ +* [Docs] Certain parts of installation docs not visible * GraphQL mutations did not return errors in case of exceptions. * Group GraphQL queries failed when queried by owner or member. * Nav submenu items could not be distinguished from regular ones. diff --git a/aleksis/core/frontend/components/calendar/Calendar.vue b/aleksis/core/frontend/components/calendar/Calendar.vue index cab41c0df33a925bf0315c25c4c38304231b6dc4..5c32a13744299e27bb7968543b524a8f570ef400 100644 --- a/aleksis/core/frontend/components/calendar/Calendar.vue +++ b/aleksis/core/frontend/components/calendar/Calendar.vue @@ -165,7 +165,6 @@ export default { }; }, mergedFetchedDateRanges() { - // FIXME Migrate to Luxon let sortedRanges = this.fetchedDateRanges .slice() .sort((a, b) => a.start - b.start); @@ -198,7 +197,7 @@ export default { watch: { params(newParams) { if (this.range.start && this.range.end) { - this.$apollo.queries.calendar.refetch(this.queryVariables); + this.refetchWithNewParams(); } }, calendarFeeds(newFeeds, oldFeeds) { @@ -209,16 +208,7 @@ export default { .map((ncf) => ncf.name) .every((n) => oldFeeds.map((ocf) => ocf.name).includes(n)) ) { - this.$apollo.queries.calendar.stopPolling(); - clearInterval(this.fetchMoreInterval); - - this.$apollo.queries.calendar.setVariables(this.queryVariables); - this.$apollo.queries.calendar.startPolling(30000); - - // Reset fetched date ranges to newly fetched date range - this.fetchedDateRanges = [ - { start: this.extendedStart, end: this.extendedEnd }, - ]; + this.refetchWithNewParams(); } }, range: { @@ -348,7 +338,9 @@ export default { previousCalendarFeeds.forEach((calendarFeed, i, calendarFeeds) => { // Get all events except those that are updated let keepEvents = calendarFeed.events.filter( - (event) => event.endDateTime < start || event.startDateTime > end + (event) => + this.$parseISODate(event.end) < start || + this.$parseISODate(event.start) > end ); /// Update the events of the calendar feed @@ -380,6 +372,19 @@ export default { // Also reset the currently selected event (for the detail view) this.selectedEvent = null; }, + refetchWithNewParams() { + // Stop polling the query with old variables + this.$apollo.queries.calendar.stopPolling(); + clearInterval(this.fetchMoreInterval); + + this.$apollo.queries.calendar.setVariables(this.queryVariables); + this.$apollo.queries.calendar.startPolling(30000); + + // Reset fetched date ranges to newly fetched date range + this.fetchedDateRanges = [ + { start: this.extendedStart, end: this.extendedEnd }, + ]; + }, fetch() { this.title = this.$refs.calendar.title; diff --git a/aleksis/core/locale/ru/LC_MESSAGES/django.po b/aleksis/core/locale/ru/LC_MESSAGES/django.po index 8c9d34c43cd5a5152fe2e1a21f861d009f85c4d9..97f7d699fdf23d06b6db81311f074edd72f1fd69 100644 --- a/aleksis/core/locale/ru/LC_MESSAGES/django.po +++ b/aleksis/core/locale/ru/LC_MESSAGES/django.po @@ -8,17 +8,14 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2023-02-27 13:23+0100\n" -"PO-Revision-Date: 2023-07-04 04:21+0000\n" +"PO-Revision-Date: 2023-08-12 09:43+0000\n" "Last-Translator: Serhii Horichenko <m@sgg.im>\n" -"Language-Team: Russian <https://translate.edugit.org/projects/aleksis/" -"aleksis-core/ru/>\n" +"Language-Team: Russian <https://translate.edugit.org/projects/aleksis/aleksis-core/ru/>\n" "Language: ru\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" -"%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n" -"%100>=11 && n%100<=14)? 2 : 3);\n" +"Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n" "X-Generator: Weblate 4.12.1\n" #: aleksis/core/apps.py:155 aleksis/core/apps.py:161 @@ -3716,75 +3713,64 @@ msgid "Maintenance mode was turned off successfully." msgstr "Режим обÑÐ»ÑƒÐ¶Ð¸Ð²Ð°Ð½Ð¸Ñ ÑƒÑпешно выключен." #: aleksis/core/models.py:1528 -#, fuzzy msgid "Start date and time" -msgstr "Дата и времÑ" +msgstr "Дата и Ð²Ñ€ÐµÐ¼Ñ Ð½Ð°Ñ‡Ð°Ð»Ð°" #: aleksis/core/models.py:1530 -#, fuzzy msgid "End date and time" -msgstr "Дата и времÑ" +msgstr "Дата и Ð²Ñ€ÐµÐ¼Ñ Ð¾ÐºÐ¾Ð½Ñ‡Ð°Ð½Ð¸Ñ" #: aleksis/core/models.py:1531 -#, fuzzy msgid "Timezone" -msgstr "ВремÑ" +msgstr "ЧаÑовой поÑÑ" #: aleksis/core/models.py:1534 -#, fuzzy msgid "Recurrences" -msgstr "СвойÑтва" +msgstr "Повторы" #: aleksis/core/models.py:1540 msgid "Amended base event" -msgstr "" +msgstr "ИÑправлено оÑновное Ñобытие" #: aleksis/core/models.py:1643 -#, fuzzy msgid "Calendar Event" -msgstr "Ленты календарей" +msgstr "Календарное Ñобытие" #: aleksis/core/models.py:1644 -#, fuzzy msgid "Calendar Events" -msgstr "Ленты календарей" +msgstr "Календарные ÑобытиÑ" #: aleksis/core/models.py:1670 -#, fuzzy msgid "Birthdays" -msgstr "Календарь Дней РождениÑ" +msgstr "Дни РождениÑ" #: aleksis/core/models.py:1674 -#, fuzzy msgid "{}'s birthday" -msgstr "%(name)s отмечает День РождениÑ" +msgstr "{} отмечает День РождениÑ" #: aleksis/core/models.py:1713 aleksis/core/models.py:1775 msgid "Holidays" -msgstr "" +msgstr "Выходные" #: aleksis/core/models.py:1774 msgid "Holiday" -msgstr "" +msgstr "Выходной" #: aleksis/core/preferences.py:33 -#, fuzzy msgid "Calendar" -msgstr "Ленты календарей" +msgstr "Календарь" #: aleksis/core/preferences.py:490 -#, fuzzy msgid "Birthday calendar feed color" -msgstr "Календарь Дней РождениÑ" +msgstr "Цвет ÐºÐ°Ð»ÐµÐ½Ð´Ð°Ñ€Ñ Ð”Ð½ÐµÐ¹ РождениÑ" #: aleksis/core/preferences.py:502 msgid "Holiday calendar feed color" -msgstr "" +msgstr "Цвет ÐºÐ°Ð»ÐµÐ½Ð´Ð°Ñ€Ñ Ð’Ñ‹Ñ…Ð¾Ð´Ð½Ñ‹Ñ…" #: aleksis/core/preferences.py:515 -#, fuzzy msgid "Activated calendars" -msgstr "Календарь Дней РождениÑ" +msgstr "Ðктивные календари" #: aleksis/core/templates/account/email/email_confirmation_message.txt:6 #, python-format @@ -3794,6 +3780,8 @@ msgid "" "If it was you, please confirm the registration by clicking on the following " "link:" msgstr "" +"Кто-то попыталÑÑ Ð·Ð°Ñ€ÐµÐ³Ð¸Ñтрировать учётную запиÑÑŒ на Ñайте %(site_domain)s Ñ Ð»Ð¾Ð³Ð¸Ð½Ð¾Ð¼ %(user_display)s и Вашим адреÑом Ñл.почты.\n" +"ЕÑли Ñто были Ð’Ñ‹, подтвердите, пожалуйÑта, региÑтрацию, Ð¿ÐµÑ€ÐµÐ¹Ð´Ñ Ð¿Ð¾ ÑÑылке:" #~ msgid "" #~ "\n" diff --git a/aleksis/core/locale/uk/LC_MESSAGES/django.po b/aleksis/core/locale/uk/LC_MESSAGES/django.po index 5cd5dc251e9a975a8cec68dee5e656ba8c081e8e..e274c80699b2539045fb47cb85d38ad02aa0bc4d 100644 --- a/aleksis/core/locale/uk/LC_MESSAGES/django.po +++ b/aleksis/core/locale/uk/LC_MESSAGES/django.po @@ -8,18 +8,14 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2023-02-27 13:23+0100\n" -"PO-Revision-Date: 2023-07-04 04:21+0000\n" +"PO-Revision-Date: 2023-08-12 09:43+0000\n" "Last-Translator: Serhii Horichenko <m@sgg.im>\n" -"Language-Team: Ukrainian <https://translate.edugit.org/projects/aleksis/" -"aleksis-core/uk/>\n" +"Language-Team: Ukrainian <https://translate.edugit.org/projects/aleksis/aleksis-core/uk/>\n" "Language: uk\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=4; plural=(n % 1 == 0 && n % 10 == 1 && n % 100 != " -"11 ? 0 : n % 1 == 0 && n % 10 >= 2 && n % 10 <= 4 && (n % 100 < 12 || n % " -"100 > 14) ? 1 : n % 1 == 0 && (n % 10 ==0 || (n % 10 >=5 && n % 10 <=9) || " -"(n % 100 >=11 && n % 100 <=14 )) ? 2: 3);\n" +"Plural-Forms: nplurals=4; plural=(n % 1 == 0 && n % 10 == 1 && n % 100 != 11 ? 0 : n % 1 == 0 && n % 10 >= 2 && n % 10 <= 4 && (n % 100 < 12 || n % 100 > 14) ? 1 : n % 1 == 0 && (n % 10 ==0 || (n % 10 >=5 && n % 10 <=9) || (n % 100 >=11 && n % 100 <=14 )) ? 2: 3);\n" "X-Generator: Weblate 4.12.1\n" #: aleksis/core/apps.py:151 @@ -1363,9 +1359,7 @@ msgstr "Підтвердити" msgid "" "Please confirm that <a href=\"mailto:%(email)s\">%(email)s</a> is an e-mail " "address for user %(user_display)s." -msgstr "" -"Підтвердіть, будь лаÑка, що <a href=\"mailto:%(email)s\">%(email)s</a> Ñ” " -"адреÑою ел.пошти Ð´Ð»Ñ ÐºÐ¾Ñ€Ð¸Ñтувача %(user_display)s." +msgstr "Підтвердьте, будь лаÑка, що <a href=\"mailto:%(email)s\">%(email)s</a> Ñ” адреÑою ел.пошти Ð´Ð»Ñ ÐºÐ¾Ñ€Ð¸Ñтувача %(user_display)s." #: aleksis/core/templates/account/email_confirm.html:25 #, python-format @@ -3429,75 +3423,64 @@ msgid "Person was already invited." msgstr "ОÑоба вже була запрошена." #: aleksis/core/models.py:1528 -#, fuzzy msgid "Start date and time" -msgstr "Дата Ñ– чаÑ" +msgstr "Дата Ñ– Ñ‡Ð°Ñ Ð¿Ð¾Ñ‡Ð°Ñ‚ÐºÑƒ" #: aleksis/core/models.py:1530 -#, fuzzy msgid "End date and time" -msgstr "Дата Ñ– чаÑ" +msgstr "Дата Ñ– Ñ‡Ð°Ñ Ð·Ð°ÐºÑ–Ð½Ñ‡ÐµÐ½Ð½Ñ" #: aleksis/core/models.py:1531 -#, fuzzy msgid "Timezone" -msgstr "ЧаÑ" +msgstr "ЧаÑовий поÑÑ" #: aleksis/core/models.py:1534 -#, fuzzy msgid "Recurrences" -msgstr "ВлаÑтивоÑÑ‚Ñ–" +msgstr "Повтори" #: aleksis/core/models.py:1540 msgid "Amended base event" -msgstr "" +msgstr "Виправлена оÑновна подіÑ" #: aleksis/core/models.py:1643 -#, fuzzy msgid "Calendar Event" -msgstr "Канали календарів" +msgstr "Календарна подіÑ" #: aleksis/core/models.py:1644 -#, fuzzy msgid "Calendar Events" -msgstr "Канали календарів" +msgstr "Календарні події" #: aleksis/core/models.py:1670 -#, fuzzy msgid "Birthdays" -msgstr "Календар Днів ÐародженнÑ" +msgstr "Дні ÐародженнÑ" #: aleksis/core/models.py:1674 -#, fuzzy msgid "{}'s birthday" -msgstr "%(name)s має День ÐародженнÑ" +msgstr "{} ÑвÑткує День ÐародженнÑ" #: aleksis/core/models.py:1713 aleksis/core/models.py:1775 msgid "Holidays" -msgstr "" +msgstr "Вихідні" #: aleksis/core/models.py:1774 msgid "Holiday" -msgstr "" +msgstr "Вихідний" #: aleksis/core/preferences.py:33 -#, fuzzy msgid "Calendar" -msgstr "Канали календарів" +msgstr "Календар" #: aleksis/core/preferences.py:490 -#, fuzzy msgid "Birthday calendar feed color" -msgstr "Календар Днів ÐародженнÑ" +msgstr "Колір ÐºÐ°Ð»ÐµÐ½Ð´Ð°Ñ€Ñ Ð”Ð½Ñ–Ð² ÐародженнÑ" #: aleksis/core/preferences.py:502 msgid "Holiday calendar feed color" -msgstr "" +msgstr "Колір ÐºÐ°Ð»ÐµÐ½Ð´Ð°Ñ€Ñ Ð’Ð¸Ñ…Ñ–Ð´Ð½Ð¸Ñ…" #: aleksis/core/preferences.py:515 -#, fuzzy msgid "Activated calendars" -msgstr "Календар Днів ÐародженнÑ" +msgstr "Ðктивні календарі" #: aleksis/core/templates/account/email/email_confirmation_message.txt:6 #, python-format @@ -3507,6 +3490,8 @@ msgid "" "If it was you, please confirm the registration by clicking on the following " "link:" msgstr "" +"ХтоÑÑŒ Ñпробував на Ñайті %(site_domain)s зареєÑтрувати обліковий Ð·Ð°Ð¿Ð¸Ñ Ð· логіном %(user_display)s та Вашою адреÑою ел.пошти.\n" +"Якщо це були Ви, підтвердьте, будь лаÑка, реєÑтрацію, перейшовши за поÑиланнÑм:" #~ msgid "Revoke access" #~ msgstr "Відкликати доÑтуп" diff --git a/docs/admin/10_install.rst b/docs/admin/10_install.rst index 6100d509692474a474572b99d1b34da8b7257fb6..5390ef4aa22920e33354592ef40914aebb315bee 100644 --- a/docs/admin/10_install.rst +++ b/docs/admin/10_install.rst @@ -141,11 +141,13 @@ from `yarnpkg`, collect static files, and migrate the database to the final sche You only need to install these additional dependencies if installing the meta-package: .. code-block:: shell + apt install libmariadb-dev libldap2-dev libsasl2-dev pkg-config After that, you can install the aleksis meta-package, or only `aleksis-core`: .. code-block:: shell + pip3 install --break-system-packages aleksis aleksis-admin vite build aleksis-admin collectstatic --clear @@ -158,6 +160,7 @@ Make dynamic content writable for webserver To make AlekSIS® able to write dynamic content, you need to assign permissions to the webserver user. .. code-block:: shell + chown -R www-data:www-data /var/lib/aleksis .. _core-configure-uwsgi: