Branch: refs/heads/master
Author: Daniel Plakhotich <daniel.plakhotich(a)gmail.com>
Committer: Daniel Plakhotich <daniel.plakhotich(a)gmail.com>
Date: Fri, 26 Jun 2020 19:56:55 UTC
Commit: ddc6a82fc4f236ff7868bc1153bc3267a09eac1b
https://github.com/geany/geany-themes/commit/ddc6a82fc4f236ff7868bc1153bc32…
Log Message:
-----------
Fix marker_line and marker_mark with disabled markers margin
Modified Paths:
--------------
colorschemes/earthsong.conf
screenshots/earthsong.png
Modified: colorschemes/earthsong.conf
8 lines changed, 4 insertions(+), 4 deletions(-)
===================================================================
@@ -1,7 +1,7 @@
#
# MIT License
#
-# Copyright (c) 2019 Daniel Plakhotich <daniel(dot)plakhotich(at)gmail(dot)com>
+# Copyright (c) 2019-2020 Daniel Plakhotich <daniel(dot)plakhotich(at)gmail(dot)com>
#
# Permission is hereby granted, free of charge, to any person obtaining a copy of
# this software and associated documentation files (the "Software"), to deal in
@@ -26,7 +26,7 @@
[theme_info]
name=Earthsong
description=Warm theme based on the scheme of the same name by Dayle Rees.
-version=1.0
+version=1.1
author=Daniel Plakhotich <daniel(dot)plakhotich(at)gmail(dot)com>
url=
@@ -47,9 +47,9 @@ margin_folding=#756d63;#302828
fold_symbol_highlight=#333333
indent_guide=#574f45
caret=#f8f8f0;#000000;false
-marker_line=#ccb69f;#ccb69f
+marker_line=#ccb69f;#605000
marker_search=#000000;#00ff00
-marker_mark=#ccb69f;#ccb69f
+marker_mark=#ccb69f;#506000
call_tips=#26221f;#ccb69f;true;true
white_space=#574f45;#ffffff;true;false
Modified: screenshots/earthsong.png
0 lines changed, 0 insertions(+), 0 deletions(-)
===================================================================
No diff available, check online
--------------
This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).
Branch: refs/heads/master
Author: Enrico Tröger <enrico.troeger(a)uvena.de>
Committer: Enrico Tröger <enrico.troeger(a)uvena.de>
Date: Sun, 07 Jun 2020 22:14:49 UTC
Commit: 782e0a58af541e9c7a75eaedb4eb98e9ee8b3e51
https://github.com/geany/www.geany.org/commit/782e0a58af541e9c7a75eaedb4eb9…
Log Message:
-----------
Add a note about using GIT branches for Mezzanine dependency
Modified Paths:
--------------
README.dev.md
Modified: README.dev.md
8 lines changed, 8 insertions(+), 0 deletions(-)
===================================================================
@@ -14,6 +14,14 @@ extra packages installed on your system.
The code requires Python 3.5 or higher.
+All Python related dependencies are listed in `requirements.txt` and can
+be installed via `pip` (see below).
+Unfortunately, the last official release of the used CMS Mezzanine supports
+only Django up to 2.0. To use more recent versions of Django, the `requirements.txt`
+refers to a development branch of Mezzanine (and its dependencies
+filebrowser-safe and grappelli-safe) with support for Django 2.2.
+Ideally, a new official Mezzanine release will obsolete the need to
+depend on branches instead releases.
Get the code
------------
--------------
This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).
Branch: refs/heads/master
Author: Enrico Tröger <enrico.troeger(a)uvena.de>
Committer: Enrico Tröger <enrico.troeger(a)uvena.de>
Date: Sun, 07 Jun 2020 22:14:00 UTC
Commit: 1102dc68ceba02901916fb65aca368d07ee713aa
https://github.com/geany/www.geany.org/commit/1102dc68ceba02901916fb65aca36…
Log Message:
-----------
Document website administration and deployment
Modified Paths:
--------------
README.md
Modified: README.md
132 lines changed, 128 insertions(+), 4 deletions(-)
===================================================================
@@ -1,9 +1,133 @@
www.geany.org
=============
-About
------
-This is the new website code for www.geany.org.
-It's based on Django and uses Mezzanine (http://mezzanine.jupo.org/, the coolest Django CMS)
+## About
+
+This is the website code for <https://www.geany.org>.
+It's based on Django and uses Mezzanine (<https://mezzanine.jupo.org/>, the coolest Django CMS)
for content management.
+
+## Management And Maintenance
+
+### Admin Area
+
+To enter the Django admin area, just open <https://geany.org/admin/>.
+In case you forgot your username and/or password or when it never had been set before,
+use the password reset form with your registered email address.
+
+### Set Latest Version on release time
+
+When releasing Geany, the website should be updated as well.
+This is easily done by editing the version number at
+<https://geany.org/admin/latest_version/latestversion/1/change/>.
+After the latest version has been updated in the admin area, it may take
+a few minutes until cached contents have expired.
+
+Afterwards, all references on the website where the version number
+is used, are up to date.
+
+### Deploy Content Changes from GIT to the website
+
+To change any content on the website, find and edit the corresponding
+Markdown source file in this repository's `page_content` directory.
+The directories and files in therein represent the website page structure.
+
+After you made your changes, commit and push the changed file(s) to GIT.
+
+Then open <https://geany.org/admin/mezzanine_sync_pages/mezzaninesyncpages/>,
+check `Execute "git pull"` and press `Sync Pages`.
+Then the current website's pages are synced with the file contents in the
+GIT repository. For your convenience, after the sync has finished you are
+presented with an overview and diff of all made changes.
+
+Please note, there is no dry-run, preview or rollback of the performed changes.
+Only the diff of the changes *after* they have been applied.
+
+#### Special Pages
+
+There are a few special pages which cannot be synced the way described above.
+This is because those pages are partially or completely rendered dynamically
+with non-static content.
+
+ * contribute/translation/statistics.md: generate nightly from source code
+ * documentation/releasenotes.md: generated from Github upon request
+ * documentation/todo.md: generated from Github upon request
+ * download/nightly-builds.md: generated upon request
+ * fake.md: dummy page for various non-CMS pages like pastebin.geany.org and more
+ * support/irc.md: dynamic content is added to the page upon request
+
+#### Supported Markdown Extensions
+
+There are a couple of Markdown extensions enabled for the website, mainly
+to support similar features like Github Flavored Markdown provides:
+
+ * pymdownx.magiclink
+ * pymdownx.betterem
+ * pymdownx.tilde
+ * pymdownx.tasklist
+ * pymdownx.superfences
+ * nl2br (transform line breaks to HTML `<br>` tags)
+ * tables
+ * toc
+
+For details and usage instructions of the listed extensions, please see
+the documentation at <https://facelessuser.github.io/pymdown-extensions/>.
+
+#### Page Content Management Commands
+
+ * `venv/bin/python manage.py sync_pages`
+ This command can be used to sync the website's pages with the
+ file contents in the GIT repository (like described above).
+
+ * `venv/bin/python manage.py dump_pages`
+ Perform a backwards sync, i.e. read the current website's pages
+ content and write it as Markdown files into the repository's
+ `page_content` directory.
+ Be careful, this command should only be executed initially or
+ only if you really know what you are doing.
+ It will overwrite any previous contents in the `page_content`
+ directory without confirmation.
+
+## Deployment
+
+To be able to deploy the code, you need a working SSH connection
+to the geany.org server. Obviously, this implies an user account
+on the server.
+
+### Using Fabric
+
+To deploy the code the following steps are necessary:
+
+ * Install Fabric (<https://www.fabfile.org/>, version 2 or later) on your
+ local machine: `pip install fabric` or use the system package manager
+ * `cd <path-to-the-code-repository>`
+ * `fab deploy`
+ * Done.
+
+### Alternative Way (remote only)
+
+You can also deploy the code to the website using a SSH shell
+on the server and perform the commands manually which would have
+been executed by Fabric otherwise.
+
+ * Login to geany.org with your user via SSH: `ssh geany.org`
+ * Switch to the Django user: `sudjango`
+ * Execute all or only some of the following commands:
+
+ ```sh
+ cd /srv/django/www.geany.org
+ git pull
+ venv/bin/python manage.py clean_pyc
+ venv/bin/python manage.py compile_pyc
+ venv/bin/python manage.py check
+ venv/bin/python manage.py pygments_styles
+ venv/bin/python manage.py collectstatic --clear --no-input --verbosity 0
+ venv/bin/python manage.py compress --verbosity 0
+ venv/bin/python manage.py migrate --run-syncdb
+ venv/bin/python manage.py clear_cache
+ ```
+
+ * Exit the shell session for user "django"
+ * Restart the Uwsgi server: `sudo systemctl restart geany.org.service`
+ * Done.
--------------
This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).
Branch: refs/heads/master
Author: Matthew Brush <matt(a)geany.org>
Committer: GitHub <noreply(a)github.com>
Date: Fri, 05 Jun 2020 23:38:02 UTC
Commit: 2b6d5956eb5b3f17a2f15889a8bea1271cedce1b
https://github.com/geany/geany/commit/2b6d5956eb5b3f17a2f15889a8bea1271cedc…
Log Message:
-----------
Set a default widget name on all GtkBuilder widgets. (#2469)
Allows selecting individual widgets in Gtk CSS using #name selector.
Modified Paths:
--------------
src/ui_utils.c
Modified: src/ui_utils.c
5 lines changed, 5 insertions(+), 0 deletions(-)
===================================================================
@@ -2491,6 +2491,11 @@ void ui_init_builder(void)
g_warning("Unable to get name from GtkBuilder object");
continue;
}
+ else
+ {
+ /* Set a default name for use from CSS by name */
+ gtk_widget_set_name(widget, name);
+ }
toplevel = ui_get_top_parent(widget);
if (toplevel)
--------------
This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).