Inkscape Wiki - User contributions [en]

WebSite

2017-08-07T20:47:00Z

Tghs: Update other bug tracker link for gitlab migration

The Inkscape project welcomes contributions to its website at https://inkscape.org/. Your help is valuable in different areas, and this page provides info to guide you.

We always need editors, translators, testers, designers and developers — and if you think you can help in any of those areas, please contact us by sending a mail to the translators' mailing list (for translations) or the documentation mailing list (for website development and contents).

== Editing ==

We have a [https://inkscape.org/*editor small team of people] who look after the web site contents, keep it up-to-date and constantly look for ways to improve it, by collecting information from various sources and presenting it on the web site. You can support us in various ways: suggest improvements or corrections, write contents about topics that are missing, write news articles and help with ‘marketing’, or join us long-term and help with contents maintenance.

=== General Rules ===

* All content on the website is licensed '''CC-BY-SA and GPLv2 or later'''. You will be required to agree to this license when you first edit a page.
* Don't disrupt existing pages. If you don't know what you want to do yet, then draft the page here on the wiki, Etherpad or in a separate page first.
* No page is precious to any one person. All pages can be edited by any editor and disputes about drafting changes should be brought to the inkscape-docs mailing list or website editor in chief.
* The website's content is usually very flexible to updates, but final decisions by the webmaster must be accepted by all editors.
* Page language in English or translated should keep to the contributors rules. No swearing, no aggressive content and on website pages there should be no opinion.
* Translations should be strictly a translation of the English versions of pages. If there is new content, it should be added to the English page first to keep all versions of the page in sync.
* When you have made a change to the English website that changes the contents (i.e. not correcting grammar or a typo), and thus requires translation, please kindly inform website translators via translators' mailing list of the change you made. Try to finalize your changes to a page, before you call out to them to do their work.

=== User Account ===


Please [https://inkscape.org/user/register/ register] an account using your email address and activate the account. Once active and logged in, please email any of the website supervisors such as Martin Owens (doctormo@gmail.com), the [http://sourceforge.net/p/inkscape/mailman/inkscape-docs/ inkscape-docs mailing list] or the [http://sourceforge.net/p/inkscape/mailman/inkscape-translator/ inkscape-translator mailing list] to get the necessary permissions.

Your account will then be enabled with the right permissions to add and edit any of the pages on the website. Please take care not to disrupt other content as you edit the website. As before, don't hesitate to ask other website editors on their mailing list if you need help.

If anything goes wrong while you are editing — for example, you encounter a bug, or you accidentally delete something you did not intend to delete, or something weird happens, and you don't know why —, please ask for help on one of the mailing lists — either translators, or inkscape-docs. You can also contact your team admin directly or file a bug report for the website at the [https://gitlab.com/inkscape/inkscape-web/issues bug tracker].

=== Using the Website Editor ===

Editors and translators can visit the Inkscape website, log in as themselves and edit and add content to the django content management system (cms). This does not require any code access but does require knowledge of html and staff access plus that you be in the Editors or Translators group to give you all the required permissions.

When you want to edit a page for the first time after the update, you will be asked to agree to publish your work under the website's licence. This will ensure that your work can be built upon by others in a safe manner.

REMEMBER: Your changes are NOT published until you press the publish button on the tool bar! Once a change is published, there is NO WAY TO UNDO it, so check carefully before publishing.

[[File:Toolbar live mode django-cms 3.2.0.png|600px|thumb|center|The toolbar in live mode]]

The toolbar shown here is made visible by clicking on the top-right arrow sign. From this bar you can turn editing on for any cms page you are visiting and edit the content therein. Ask for help if you get lost editing the various sections of the website.

[[File:Double-click.png|130px|thumb|right|Editing the inkscape.org website]]

The screenshot to the right shows a page with the editor mode switched on. As you can see, when your mouse hovers above an editable section of a web page, you are prompted to double-click to edit that page. This allows you to add new content blocks as well as edit existing blocks. Most pages will only have one such section, but the front page has several. If you need a page with a new design that has multiple blocks, please see website development below.

[[File:Toolbar edit mode changes django-cms 3.2.0.png|600px|thumb|center|The toolbar after you have saved your changes]]

The toolbar will indicate when there are changes on a page that can be published. Click on '''Publish changes''' to publish your (or another person's) changes, and / or click on '''View published''' to leave the edit mode.

To learn how to edit and tweak the front page, you can watch this video on YouTube (note: the video shows how this works on an older version of the website's cms, so icons and toolbar will look different):

[[File:Front-page-video.jpg|Watch the video!|thumb|center|link=https://www.youtube.com/watch?v=Rq2EFX9Aw70|[https://www.youtube.com/watch?v=Rq2EFX9Aw70 Click here to watch the video!] (12:36)]]

==== Specific Instructions ====

[[File:CMS Editor describe changes.png|600px|thumb|center|Add a description of your changes before saving]]

{| style="float: right;"
|-
| [[File:Create internal link.png|120px|thumb|center|Creating an internal link]] || [[File:Add external link.png|120px|thumb|center|Creating a link to an external page]]
|-
| || [[File:Add an image to website.png‎|120px|thumb|center|Dialog for adding pictures to the website]]
|-
| [[File:TOC icon.png|75px|thumb|center|A TOC plugin in edit mode]] || [[File:Inline TOC.png|120px|thumb|center|An inline TOC (can also be added as a ’sidebar’ on the right)]]
|}

'''Texts''': When you save a text plugin, you will be asked to fill in a short description of your changes at the bottom of the editor window. This little summary will be used for updating others about your changes.

'''External tools''': If you decide to do your translations using your favourite editor, be sure to use a plain text editor for this. Office suites and other word processing tools that support formatting are unsuitable, because they might add additional formatting automatically, which can accidentally end up on the website and break the actual formatting.

'''Links''': Links on our website are inserted as plugins. This ensures that internal links will automatically be adapted, if the linked page is moved, or does not have a translation for the language where the link is used. They are managed via the web site's database. This is also part of the preparation for a more automated translation system. The downside of this is, that a link can only be used once, and only in the text where it was created. It may not be copied (if you do so, you can cause severe problems for the website).

'''Images''': Images are plugins, too. They, too, cannot be copied directly from one page to the other, unless one chooses ‘Copy all plugins from English’ to make a whole new page. To insert an image (raster images only, svg is not supported by our current plugin), choose ‘Picture’ from the plugin dropdown list and fill in the dialog with the necessary info. Don't forget to add licence and attribution info, if applicable. If you want to use a picture that is already used on a different page (e.g. when editing a translation), download that picture to your computer (use your browser's right-click menu for that) and upload it again using the picture plugin dialog.

'''TOC''': The TOC (Table of Contents) plugin can be inserted into pages with long texts to make navigating them easier for users. It will also add little anchor symbols behind all headings on that page, that other people can directly link to.

'''Other plugins''': The CMS widgets come in a number of types. File and Video widgets do as you would expect and allow you to add those media elements.

'''Spell Checking''': Your browser's spell checker will work when editing text. To change the language or access suggested replacements, hold Ctrl down while right-clicking into the text.

==== Known Issues ====

* '''IMPORTANT''': When you click on ‘Publish’ for a page, nothing happens for a few seconds. Only then does the loading animation start. Don't click on ‘Publish’ twice, just wait until it starts by itself. Every click on this will send a mail to all subscribers, and add to the server load. Also, incomplete saves have been seen as a result.
* There's a ‘Create’ button now available in the top left. If you are a translator, you will never need this button. It is for creating new, non-translation pages.
* Copy-pasting any plugins (and changing them after this) will result in the plugin source page (i.e. the English page in most cases) being altered. Never copy plugins! Only copy contents using a detour via a '''plain text editor'''.
* Hitting ‘Enter’ while editing a plugin in a pop-up dialog may lose previous page edits.
* Sometimes, the ‘Edit’ button is not available. Then you can still edit the page by going to ‘Page -> Edit this Page’ in the toolbar, or add ‘?edit’ to the URL.
* Sometimes, ‘Publish’ is not available, even if you made changes to some plugins. In this case, go to ‘Page -> Unpublish Page’ in the toolbar, and when it has been unpublished, click on the big blue ‘Publish now’ button to publish.
* If your browser window is not wide enough, some controls on the ‘Pages’ overview in the admin interface (if you have permission to access it) may be missing. You can either try to extend your browser window (even if the left part goes away from your screen; you may use the Responsive Design View of your browser) or zoom out. You may encounter the same problem with the ‘Language’ menu of the toolbar.

== Translations ==

If you are fluent in a language different from English, please consider joining our [https://inkscape.org/*translator website translators' team]. We strive to make Inkscape accessible for as many people as possible, and internationalization is important to reach this goal.

For being able to translate the CMS contents and the news, you will first need to understand how [[#Editing|editing the website]] works.

=== Translating CMS contents ===

==== Adding a new translation ====

[[File:CMS toolbar Page Edit.png|200px|thumb|right|Adding a translation — Step 1]]

To '''add''' a translation of a page which does not yet exist, navigate to the page in your language and use the ‘Page’ menu to '''Edit this Page'''.

[[File:CMS toolbar Page Settings button.png|200px|thumb|right|Adding a translation — Step 2]]

Next, click on the '''Page settings''' button in the toolbar. You'll get this:

[[File:Add_a_language_2.png|600px|thumb|center|Adding a title for the new translation]]

Fill in the Title of your translation in the next dialog and save.

[[File:Copy_from_English.png|120px|thumb|center|Copy contents from English]]

Fill the page by copying everything over from English (‘Language -> Copy all plugins from English’, at the bottom). You may need to zoom out your browser view (Ctrl and -) to reach the bottom-most entry in the drop-down menu item. The page will now contain the same texts and widgets as the English version does. To start translating, double-click on a text.

[[File:Editor_window.png|600px|thumb|center|The editor window in WYSIWYG mode]]

An editor window will pop up and you can translate the text.

If something does not look correct (for example, because you accidentally deleted a certain html tag), you can choose to edit the html source, too.

[[File:Editor_window_source.png|600px|thumb|center|Editing the html source]]

'''Links''' can be edited by '''double-clicking''' on them. '''Never try to copy a link from the English editor or website''' to the editor in your language, or to copy it from the editor's source mode to the source mode in your language. Just double-click and then change the link's text, and, if necessary, adapt the language part of the url for external links.

When you are done, save your work. Don't forget to leave a comment about your changes, or the dialog will not allow you to save. You can now take a look at your translation and if you are happy with your work, click on the '''Publish''' button at the top of the page. Only this will make your translation available to the site's visitors.

Take extra care to '''always check''' if the language you are editing is the one you actually want to edit. Please '''DO NOT''' translate a piece of text while under English or another language as you will cause trouble for that language.

==== Edit an existing translation ====

Many existing translations at inkscape.org are outdated, or contain a copy of an outdated English version. Please, before you start translating, make sure that you actually translate from the '''current''' English version. If the page is very outdated, consider deleting the blocks and copying all plugins from English, as described above in '''Adding a new translation'''.

To '''edit''' an existing translation, just go to the page in your language, toggle the ‘draft’ mode by clicking on the '''Edit''' button in the top bar and double-click on the widget you would like to translate.

If you edit an existing translation, because the English original has changed, you can do the following:

* Open the published English page, and also, in a second tab, your translation, in draft mode.
* Copy the new parts from English by selecting them with the mouse and hitting Ctrl+C.
* Paste them '''into a simple text editor''', if they contain links or pictures (Ctrl+V), to remove the formatting and prevent plugins from being used on two different pages at the same time. If there are no links or other plugins, you can also paste directly into the editor window.
* Insert this into your existing translation, in the correct place (Ctrl+V). '''Never''' paste links directly into the editor window.
* Then translate the text.
* When you come to a link (this is a normal link, not a plugin link), right-click on it, select ‘Edit Link’ to see where it goes. Copy the destination. Close the dialog.
* Right-click on the link again, select ‘Unlink’.
* Translate the link's text.
* Select the new link's text with the mouse.
* From the dropdown list at the top left (‘Plugins’), choose ‘Link’.
* If the link is an internal link, so goes to another page on the website, use the dropdown to select the page it will go to. Add anchor below (without the #), if applicable.
* If the link is an external link, just paste the contents of your clipboard into the topmost line. You might have to add http:// or https:// at the start of the line.
* Save.
* Continue with translation :)

=== Translating News ===

News are a special case on the Inkscape website. To translate a news article, visit it in your own language, then select ‘News -> Translate News’ in the toolbar at the top.

[[File:Translate news dropdown-fs8.png|600px|thumb|center|News app: Dropdown for translating news. Note that the language you will translate to is the one displayed in your URL.]]

Then a window pops up where you can fill in your translation of the news. The text editor boxes for the excerpt and the news article contents will be pre-filled with the English version. You can also always see the English original when you click on ‘Show’ below the editor box.

Text can be formatted by using the text editor's buttons, links can be added by marking some text and clicking on the link symbol. Edit links by right-clicking on the link, then select ‘Edit link’ from the context menu. Save your translation when you're done.

[[File:Translate news-fs8.png|600px|thumb|center|News app: Translating a news article on the Inkscape website. The slug (last part of the url) must be unique.]]

[[File:Edit news link-fs8.png|300px|thumb|right|News app: Right-click to edit a link]]

==== Known Issues ====

* When you double-click on a link in the news editor, you'll get a popup dialog where you cannot click on anything. If this happens, click on ‘Save’ in the parent dialog to not lose any translated work. Continue editing after this.
* When you save your translation for the first time, you may be redirected to a non-existent page (404 error). To return to the article to continue editing, just remove everything after the last slash in the url, and hit enter. Then select your article on the page where this brought you, and edit it again.

=== Translating other parts of the website ===

There are a lot of other translatable sentences and phrases on the Inkscape website, which cannot be translated directly on the website itself. Those include words such as ‘Log in’, ‘Register’, ‘Confirm’ and ‘Save’.

If your language is not yet available on our website, you're still very welcome to help! In this case please file a [https://gitlab.com/inkscape/inkscape-web/issues bug report]. Then we can prepare the website for your changes and make the translation file available, so you can start working on it.

You can download the PO file for your language from the [https://gitlab.com/inkscape/inkscape-web-i18n website's translation repository]. See [[Translation information#PO translation files|here]] for info about how to deal with PO files.

When you are done, create a new issue [https://gitlab.com/inkscape/inkscape-web-i18n/issues in the repository at gitlab] and attach your changed file to it, or make a merge request, if you are familiar with git / gitlab.

== Website Development ==

The Inkscape project has a side project — inkscape-web — which produces the website seen by users and used by everyone to find resources.

You can support the website development with things as easy as reporting bugs, or focused testing, or you can volunteer to test the web site more systematically before a new release. Other important areas where you can help us are website design, and website development. If you would like to help, contact Martin Owens (doctormo@gmail.com).

These are the most important links:
* The published website: https://inkscape.org/
* The staging website (testing): http://staging.inkscape.org/ (currently unavailable)
* The project on Launchpad (only bug reports created before February 2017): https://launchpad.net/inkscape-web/bugs
* The project on gitlab (code repository and bug reports created since February 2017): https://gitlab.com/inkscape/inkscape-web

The guide below is for helping with the website development and to get a running version of the website for design work. The code is available on Gitlab in a [https://gitlab.com/inkscape/inkscape-web git repository].

=== Django and Python ===

The website is written in Python using the Django framework. It is a good idea to have a familiarity with Django and a fairly healthy experience with Python before starting code development on the website:
* To learn Python, attend these online classes: http://www.codecademy.com/en/tracks/python
* To get to know Django, see this tutorial: http://tutorial.djangogirls.org/

=== Local Development ===

You can start an instance of the website locally if you wish to work on the code or design.

Needed dependencies (on Fedora): python-virtualenv and python-dev.

==== Getting the Website Code ====

* Option A: <code>$ git clone https://gitlab.com/inkscape/inkscape-web.git</code>

* Option B (better):
** Create an ssh key if you don't have one yet, and upload your public ssh key to gitlab(instructions: https://docs.gitlab.com/ee/gitlab-basics/create-your-ssh-keys.html), then:
** <code>$ git clone git@gitlab.com:inkscape/inkscape-web.git</code>

==== Running the website locally ====

The following should download the code, set up the Python environment, set up your test database, download all the CMS data from the main website and run the server, showing its address (default is 127.0.0.1:8000):

# <code>$ ./utils/init</code>
# <code>$ ./utils/manage runserver [<domain>:<port>]</code>
# Open http://localhost:8000/ in your web browser (recommendation: Firefox or Chrome) and have fun.
# Log in as the almighty admin user with username "admin" and password "123456"

You can also run the Django manage.py manually using:

<code>$ ./utils/manage <command></code>

The website's database is a local SQLite file in ./data/ as are all the uploaded files. These are not committed to the branch.

To sync the CMS contents with live again, use the refresh-cms command:

<code>$ ./utils/refresh-cms</code>

==== Updating your development version to the current trunk version ====

To get the latest changes for your branch, run:

<code>$ git pull</code>

To update your branch after a pull that introduces changes to the database structure or the installed applications, run:

<code>$ ./utils/update</code>

==== Troubleshooting ====

* Make sure your path to your local copy of inkscape-web only contains ASCII characters.
* If you have any other issues setting up your local environment, email doctormo@gmail.com, send a message to the docs mailing list or create a bug report in the bug tracker for inkscape-web.


==== Bug Reports ====

We use Launchpad's and Gitlab's bug tracker to report and track progress on bug reports. Please see https://bugs.launchpad.net/inkscape-web and https://gitlab.com/inkscape/inkscape-web/issues for possible things to fix.

==== Making changes ====

Once you have made your modifications, please commit back and push to your own fork of inkscape-web for review unless otherwise granted permission to commit to the master branch.

See https://docs.gitlab.com/ce/workflow/forking_workflow.html for more info on forking a project on gitlab and making merge requests.

To set the origin of your local copy of inkscape-web to a personal fork on gitlab, you can do the following:
<code>$ git remote set-url origin https://gitlab.com/USERNAME/OTHERREPOSITORY.git</code>

This will allow you to share your modifications on gitlab.

If you have '''developer access''' to the project, you can also create branches within the original inkscape-web repository.
One easy way to do so is via the button "New Branch" on any issue.

On the commandline, you'll need to do the following, after creating a new branch for your issue on gitlab:

# <code>$ git fetch</code>
# <code>$ git checkout branch_name</code>
# Work on code...
# <code>$ git commit -m "I fixed that annoying bug"</code>
# <code>$ git push origin branch_name</code>

You can add "Fixes #<issue number on gitlab>" to the commit message to tie together code and the bug report, if you didn't create the branch directly from the issue on gitlab.

=== When will your changes be available on inkscape.org? ===

The master branch is open to commits by members of the Inkscape group on gitlab. There is one other branch for live that is used to control deployment. For separate features and WIP, you're welcome to create your own branches in the inkscape-web repo on gitlab.

Deployment of branches should happen automatically by cron script on the server. If your commit is stuck, please ask for help on the inkscape-docs mailing list and we can sort out any clogs.

The idea of the automatic deployment is that we can control the website via all the mechanisms we use to control code commits. This includes permissions, reversions, etc. Large changes can be held for review on staging while smaller changes can be merged into live without fuss.

[[Category:Translation]]

Talk:Working with Git

2017-07-02T17:27:10Z

Tghs: Mac CI done

== TODO list after the GitLab Migration ==

(feel free to modify and expand, [[User:Eduard|Eduard]] ([[User talk:Eduard|talk]]))

* Update build for git [Mc?] code compiles fine already but in some places we depended on bzr (notably for getting revno)
* Clean-up branches
** Make all (release) branches protected branches to prevent accidental force-pushes and other potentially destructive actions (equivalent to bzr append-only branches)
*** If no further commits are supposed to happen to them, they could be marked as 'protected' via gitlab interface (which allows you to set very fine-grained merge and push permissions).
** Rename branches (we have ~100 branches imported and it's impossible to find anything). Suggestion:
*** <s>Release branches (''inkscape.dev_RELEASE_0_91_BRANCH'', ''inkscape.board_0.92.x'', etc.) are renamed to plain ''0.91.x'', ''0.92.x'', etc. This will automatically put them at the top of the branch list and should make searching for them easy.</s> (done) [Eduard]
*** Other branches: Keep for now; see next bullet point
** Sort through other branches that are not release branches
*** Delete branches that are not needed anymore. (For example I realized branches of rejected merge requests were exported, too; I assume it's fine to get rid of them?)
*** In the long run: Decide whether to move those branches to another repo for safekeeping. I suggest we aim at only having release branches under [https://gitlab.com/inkscape/inkscape inkscape/inkscape] while feature branches of developers should reside in personal forks
*** [https://gitlab.com/inkscape/inkscape/tree/inkscape.dev_credentials inkscape.dev_credentials] should probably be moved to a separate repository
* Re-add tags for past releases (some were lost during the migration)
* Set up continuous integration. There are already many devs excited to get CI up and running for different platforms! This will ensure to maintain a certain code quality down the line and prevent build breakages going unnoticed.
** <s>Linux: CI via GitLabCI</s> ([https://gitlab.com/inkscape/inkscape/commit/7bc2bea2ca29dca36a7768a2b040f6823efd0c2f done]) [tedg, Mc]
** <s>macOS: CI via GitLabCI with runner hosted on VM</s> (done: [https://gitlab.com/inkscape/inkscape/commit/ba8c21889ef78e7672444127b99cc04c129be37c 1] [https://gitlab.com/inkscape/inkscape/commit/6984b49a745784627f3b1ee3bb3c1b1513b37e77 2]) [tghs]
** <s>Windows: CI via Appveyor and MSYS2</s> ([https://gitlab.com/inkscape/inkscape/commit/cfaf5b49cacd65bcba8e9b3057f3b202ef3b9343 done]) [Eduard]
* Decide on how we want to handle commit and repo access in the future. GitLab has much to offer to optimize what we did on Launchpad to make contributions easier while still making sure commits will not break badly. Some random thoughts that cam up already:
** Should we enforce merge requests for all larger changes in future? These can be automatically checked via CI to prevent ever getting broken code into the master branch. If enough people are around we might even think about proper code review at some point.
** Should we allow direct push access to the main repo or take the above a step further and require MRs for everything?
** Who should be able to merge MRs? All developers or a group of select trusted devs? (review might create a bottleneck, so has to be carefully considered)
* Finalize set-up of GitLab repo
** The previous bullet point will decide some settings regarding repo access
** <s>Shall we enforce "fast-forward merges"? (i.e. all merges will always be rebased on top of the master branch before merging making the merge commit "Merge branch some_feature ..." unnecessary)</s> (enabled by Bryce) Should be reverted as the "[https://docs.gitlab.com/ee/workflow/rebase_before_merge.html Rebase button]" is only shown for people having write permissions on the branch to be merged (i.e. typically only the requester) making it impossible to merge most MEs via web UI.
** <s>PRs are non-public right now</s> (seems already fixed)
** Consider moving inkscape-docs repo, board repo, windows devlibs repos etc. (and if done, remember to adapt website and wiki accordingly)
* Organization
** Perhaps send out invitations to devs who have not registered yet? This can be done from the 'members' tab of the 'Settings' page by project masters and owners.
** Double-check permissions. Decide on whether Inkscape devs should be given developer status for all Inkscape subgroups, or only on their own subgroup.

== Questions/Confusions ==

* How does one get a list of branches? '''Answer:''' <code>git branch</code> lists local branches, <code>git branch -r</code> lists all branches (local and from all remotes).
* How can one have a set of parallel branches: trunk, 0.92.x, 0.91.x ...? '''Answer:''' See frontpage, [[Working with Git#Checkout multiple branches into different folders]]
* Should it be 'origin/0.92.x' rather than '0.92.x'? '''Answer:''' 'origin/0.92.x' references the branch '0.92.x' in the remote called 'origin' (typically this is the repository that you initially cloned). The locally checked out branch is referred to by plain '0.92.x'. You can other remotes (e.g. 'upstream') and reference those as 'upstream/0.92.x'

== Get full commit history ==

''(probably needs to be placed somewhere else eventually, [[User:Eduard|Eduard]] ([[User talk:Eduard|talk]]) 03:11, 12 June 2017 (UTC))''

I just found out, that our git import has the full history back to 2003-10-30 (it's in 0.45.x/0.46.x branches) while trunk only reaches back to 2006-01-16 (we're missing 8691 revisions in total).

179fa413b047bede6e32109e2ce82437c5fb8d34 --> first commit in trunk/master
971d8ce896dc59d3ec6430610d6ae28586c1301f --> the same commit in 0.45.x/0.46.x (but has no relationship with trunk/master)
9ed8de136577ccaaae3289dd4165171573c7bcbc --> initial commit in 0.45.x/0.46.x

Nice thing about git: We can stitch together both histories using [https://git-scm.com/docs/git-replace git-replace]!

A simple
git replace 179fa413b047bede6e32109e2ce82437c5fb8d34 971d8ce896dc59d3ec6430610d6ae28586c1301f
will tell git that it should replace the first commit in trunk/master with the same commit in 0.45.x/0.46.x.

As a result all revisions descending from 179fa413b047bede6e32109e2ce82437c5fb8d34 will now have proper ancestry reaching back to 9ed8de136577ccaaae3289dd4165171573c7bcbc.

Talk:Working with Git

2017-06-16T10:49:45Z

Tghs: Add note on macOS CI WIP implementation

== TODO list after the GitLab Migration ==

(feel free to modify and expand, [[User:Eduard|Eduard]] ([[User talk:Eduard|talk]]))

* Update build for git [Mc?] code compiles fine already but in some places we depended on bzr (notably for getting revno)
* Clean-up branches
** Make all (release) branches protected branches to prevent accidental force-pushes and other potentially destructive actions (equivalent to bzr append-only branches)
*** If no further commits are supposed to happen to them, they could be marked as 'protected' via gitlab interface (which allows you to set very fine-grained merge and push permissions).
** Rename branches (we have ~100 branches imported and it's impossible to find anything). Suggestion:
*** <s>Release branches (''inkscape.dev_RELEASE_0_91_BRANCH'', ''inkscape.board_0.92.x'', etc.) are renamed to plain ''0.91.x'', ''0.92.x'', etc. This will automatically put them at the top of the branch list and should make searching for them easy.</s> (done) [Eduard]
*** Other branches: Keep for now; see next bullet point
** Sort through other branches that are not release branches
*** Delete branches that are not needed anymore. (For example I realized branches of rejected merge requests were exported, too; I assume it's fine to get rid of them?)
*** In the long run: Decide whether to move those branches to another repo for safekeeping. I suggest we aim at only having release branches under [https://gitlab.com/inkscape/inkscape inkscape/inkscape] while feature branches of developers should reside in personal forks
*** [https://gitlab.com/inkscape/inkscape/tree/inkscape.dev_credentials inkscape.dev_credentials] should probably be moved to a separate repository
* Re-add tags for past releases (some were lost during the migration)
* Set up continuous integration. There are already many devs excited to get CI up and running for different platforms! This will ensure to maintain a certain code quality down the line and prevent build breakages going unnoticed.
** <s>Linux: CI via GitLabCI</s> ([https://gitlab.com/inkscape/inkscape/commit/7bc2bea2ca29dca36a7768a2b040f6823efd0c2f done]) [tedg, Mc]
** macOS: CI via GitLabCI with runner hosted on VM [tghs]
** <s>Windows: CI via Appveyor and MSYS2</s> ([https://gitlab.com/inkscape/inkscape/commit/cfaf5b49cacd65bcba8e9b3057f3b202ef3b9343 done]) [Eduard]
* Decide on how we want to handle commit and repo access in the future. GitLab has much to offer to optimize what we did on Launchpad to make contributions easier while still making sure commits will not break badly. Some random thoughts that cam up already:
** Should we enforce merge requests for all larger changes in future? These can be automatically checked via CI to prevent ever getting broken code into the master branch. If enough people are around we might even think about proper code review at some point.
** Should we allow direct push access to the main repo or take the above a step further and require MRs for everything?
** Who should be able to merge MRs? All developers or a group of select trusted devs? (review might create a bottleneck, so has to be carefully considered)
* Finalize set-up of GitLab repo
** The previous bullet point will decide some settings regarding repo access
** <s>Shall we enforce "fast-forward merges"? (i.e. all merges will always be rebased on top of the master branch before merging making the merge commit "Merge branch some_feature ..." unnecessary)</s> (enabled by Bryce) Should be reverted as the "[https://docs.gitlab.com/ee/workflow/rebase_before_merge.html Rebase button]" is only shown for people having write permissions on the branch to be merged (i.e. typically only the requester) making it impossible to merge most MEs via web UI.
** <s>PRs are non-public right now</s> (seems already fixed)
** Consider moving inkscape-docs repo, board repo, windows devlibs repos etc. (and if done, remember to adapt website and wiki accordingly)
* Organization
** Perhaps send out invitations to devs who have not registered yet? This can be done from the 'members' tab of the 'Settings' page by project masters and owners.
** Double-check permissions. Decide on whether Inkscape devs should be given developer status for all Inkscape subgroups, or only on their own subgroup.

== Questions/Confusions ==

* How does one get a list of branches? '''Answer:''' <code>git branch</code> lists local branches, <code>git branch -r</code> lists all branches (local and from all remotes).
* How can one have a set of parallel branches: trunk, 0.92.x, 0.91.x ...? '''Answer:''' See frontpage, [[Working with Git#Checkout multiple branches into different folders]]
* Should it be 'origin/0.92.x' rather than '0.92.x'? '''Answer:''' 'origin/0.92.x' references the branch '0.92.x' in the remote called 'origin' (typically this is the repository that you initially cloned). The locally checked out branch is referred to by plain '0.92.x'. You can other remotes (e.g. 'upstream') and reference those as 'upstream/0.92.x'

== Get full commit history ==

''(probably needs to be placed somewhere else eventually, [[User:Eduard|Eduard]] ([[User talk:Eduard|talk]]) 03:11, 12 June 2017 (UTC))''

I just found out, that our git import has the full history back to 2003-10-30 (it's in 0.45.x/0.46.x branches) while trunk only reaches back to 2006-01-16 (we're missing 8691 revisions in total).

179fa413b047bede6e32109e2ce82437c5fb8d34 --> first commit in trunk/master
971d8ce896dc59d3ec6430610d6ae28586c1301f --> the same commit in 0.45.x/0.46.x (but has no relationship with trunk/master)
9ed8de136577ccaaae3289dd4165171573c7bcbc --> initial commit in 0.45.x/0.46.x

Nice thing about git: We can stitch together both histories using [https://git-scm.com/docs/git-replace git-replace]!

A simple
git replace 179fa413b047bede6e32109e2ce82437c5fb8d34 971d8ce896dc59d3ec6430610d6ae28586c1301f
will tell git that it should replace the first commit in trunk/master with the same commit in 0.45.x/0.46.x.

As a result all revisions descending from 179fa413b047bede6e32109e2ce82437c5fb8d34 will now have proper ancestry reaching back to 9ed8de136577ccaaae3289dd4165171573c7bcbc.

Talk:Working with Git

2017-06-10T20:12:04Z

Tghs: Note I'm working on Mac CI

Leadership Committee Status Updates

2017-04-06T22:26:23Z

Tghs: Add git migration item

== Place and Time ==

We meet in #inkscape-devel on [https://freenode.net/ freenode].

Board meetings are typically the first Friday of each month.

Everybody in the Inkscape community is invited to participate.

Next meeting: [http://www.timeanddate.com/worldclock/fixedtime.html?month=4&day=7&year=2017&hour=20&min=00&sec=0&p1=0 Noon PST/15:00 DMT (DoctorMonTime)/21:00 CET, (click for world clock)], Fri, April 7th, 2017.

Meetings should be announced in advance on [https://lists.sourceforge.net/lists/listinfo/inkscape-devel inkscape-devel] and [https://lists.sourceforge.net/lists/listinfo/inkscape-board inkscape-board] mailing lists.

== Agenda ==

* Portland Hackfest (cancelled) [bryce]
** Post mortem.

* Future Hackfests/Conferences
** [[Hackfest2017Fall|<strike>Fall</strike> Spring Hackfest Paris, May 29th - June 2nd ?]] [tav]
** [https://2017.guadec.org/ GUADEC] Manchester July 28th - August 2nd. (Gtk3). [tav]

* 2017 Budget

* Merchandise sales [bryce, Mc]
** Spreadshirt account now ready to go
** Need volunteers to set up and administer the Inkscape shop
** Self-serve merchandise sales - spreadshirt, cafepress, Golden Ribbon, Think Penguin or similar [Mc-]
*** √ Investigate how you setup where your money goes
*** √ Register an 'Inkscape Admin' account on the site (and add credentials to our credentials repo)
*** Need to define our designs (SVG). Maybe official "about" images, inkscape logo, etc. just to start
*** Maybe arrange things to give some cash back to original authors, esp. for about screen images
*** Upload a few designs
*** Decide on a price to set
*** Convince people to buy the items
*** Can set up a "shop" for your brand
*** Mc- will help work on getting this set up

* Followup to sponsorship level [bryce]
** Need to add mention of the five levels onto the Sponsor page
** c.f. https://sourceforge.net/p/inkscape/mailman/message/34460338/

* Inkscape forum followup

* Mesh gradient feature followup [tav]

* Funded development [bryce]
** Are the three projects still relevant? Yes
** Identify Manager/Reviewer/Second for each of the jobs
** How should we advertise the jobs?

* GSoC 2017 (We have been accepted!) [tav]
** JavaScript "extensions"
** Polyfills
** Coordinate inversion
** Remove dependence on garbage collector
** etc.

* git migration

* Other Business

=== Action Items ===
* svg 2.0:
** √<s>Land GUI changes for enabling meshgradients for 0.92.x</s> [Tavmjong]
** √<s>Release a pre3 with meshgradients</s> [bryce]
** Look at warning/cleaning for "plain svg" [doctormo]
* Merchandise Sales
** Get doctormo and prkos added as shopkeepers

* Future hackfests
** 0.93 oriented hackfest [Tavmjong] [[HackfestGtk3]] [[Hackfest_0.93]]
*** Location and time highly TBD
*** Tav will brainstorm on wiki about what it might look like
** SCALE oriented event [scislac]
*** Maybe could include class on contributing/hacking on inkscape (JonCruz suggestion)
** Hackfest organizational tips
*** Process: Have folks propose options, and then trade off cost projections and benefits
*** Try to organize group lodging (same hotel, rented/air-bnb house, http://www.linuxhotel.de/community.en.html, etc.)
*** Send a scout ahead of time to help avoid slummy accommodations
*** Catered lunches help keep everyone focused (we're already reimbursing on lunches, so cost differential isn't huge, and it saves hassle all around)
*** Boots on the ground at a location can be a huge help if plans go awry
*** Prefer locations with local inkscape community on the ground

* Fundraising
** Need to engage a few more fund raising efforts, esp. with release as a goal

* Forum
** inkscapeforum is overwhelmed by moderation actions required (spam mostly), roughly 4000 new per month (50 spams per valid message), and lacks adequate active administrators
** √<s>Contact inkscapeforum (deadline next Board meeting)</s> [Scislac]
*** √<s>Maybe request database dump (and maybe site tarball).</s>
*** If we can get a DB dump, consider feasibility of simply transplanting the phpBB
** √<s>Establish an "Inkscape Forum Exploratory Committee" to lay groundwork in case we need to establish our own Inkscape-managed forum</s>
*** √<s>Recruit 3-5 folks for this committee. Ask Brynn to chair.</s> [Bryce]
*** √<s>Evaluate pros/cons of potential forum software candidates</s>
**** Are there DJango forums plugins as functional as phpBB?
**** Consider benefits of tight/loose integration with our Django website vs. something standalone
**** Consider hosting requirements (OSUOSL or elsewhere??)
**** Consider administrative requirements for maintaining/upgrading software
*** Plan the chartering of a moderation team
*** Plan steps for curtailing spam. E.g. akismet, req. account to post; auto-ban spammer accounts; etc.
*** Plan steps for customizing the forum site design appearance / style
*** Present a recommended course of action

* Credentials management for board members and administrators [bryce]
** GPG keys
** Policy on website credential access
** List of administrators needing credential access
** Setting up a shared project administrative account for various services
** Check that our credentials escrow includes √<s>twitter</s>, facebook, Inkscape forum admin, and IRC moderation keys [bryce]

* Finalization of Budget 2016 [bryce]
** Update the budget, see what $$ remains in the hackfest fund [bryce]
* [https://inkscape.org/en/support-us/funded-development/ Funded development] [bryce]
* Add a C++-11 conversion project with tasks detailed to the Roadmap for 0.93 or later. [valavanisalex]
* Regularly check sponsor ads / sponsor mentions on the website (Advance Systems: added Dec 9th, 2016)

== Blocked Action Items ==

* Privacy Policy [drmo] ~ Blocked waiting on time availability by SFC
* Amend CoC reporting section ~ Waiting until we have a dedicated email, e.g. abuse@inkscape.org
* Rekindle release process for 0.91.1 [scislac]
* Verify large donation landed in our account, and then confirm and followup with Scislac for next steps on recognition, etc. [bryce]
** (No sign of it having landed...)

== Past Agenda Items ==

* √<s>Make mention of the code of conduct on the mailing list and website</s> [bryce]
* √<s>Brainstorm future hackfests</s>
** Focused hackfests? Possible topics: 0.92 release, GTK3.
* √<s>Followup to GPLv2+ licensing</s> [tweenk]
* √<s>Followup to CoC work</s>
* √<a>Arrange vote on GPLv2+ board statement</s> [bryce]
* √<s>GSoC 2016 kickoff</s> [scislac]
* √<s>Debrief from [[Hackfest2016|Hackfest 2016]]: Leeds</s> [valavanisalex]
* √<s>New agenda for next month</s> [bryce]
* √<s>Post meeting minutes</s> [scislac]
* √<s>Arrange vote on Leeds hackfest proposal</s> [bryce]
* √<s>Identify who has not registered their GPG keys for credentials access, that should</s> [bryce]
* √<s>Prepare for GSoC 2016 project application</s>
** √<s>Get Project Suggestions list ready for GSoC</s> [bryce]
** √<s>Send bryce list of required details for Project Suggestions page</s> [scislac]
** √<s>Submit mentoring application (opens Feb 8th, deadline Feb 19th)</s> [scislac]
** √<s>Solicit mentors to be pre-assigned to project ideas (tweenk & tav already volunteered)</s> [scislac]
* √<s>Contact GIMP developers about licensing of GPLv3+ code included in Inkscape</s> [tweenk]
* √<s>GPLv2+</s> [tweenk]
** √<s>tweenk will followup regarding resolution of remaining licensing issues</s>
* √<s>Rekindle release process for 0.92. Need to complete cmake work, enter feature freeze, and announce timeline for finishing the release</s> [bryce]

== Minutes ==

* Meeting 2014-09-15: transcript https://inkscape.org/en/gallery/item/392/
* Meeting 2014-09-29: transcript https://inkscape.org/en/gallery/item/854/
* Meeting 2014-10-08: transcript https://inkscape.org/en/gallery/item/950/
* Meeting 2014-10-15: transcript https://inkscape.org/en/gallery/item/1436/
* Meeting 2014-11-05: transcript https://inkscape.org/en/gallery/item/2204/
* Meeting 2014-11-12: transcript https://inkscape.org/en/gallery/item/2210/
* Meeting 2014-11-19: transcript https://inkscape.org/en/gallery/item/2216/
* Meeting 2014-11-26: transcript https://inkscape.org/en/gallery/item/2498/
* Meeting 2015-10-02: transcript https://inkscape.org/en/gallery/item/6701/
* Meeting 2015-11-06: transcript https://inkscape.org/en/gallery/item/6886/
* Meeting 2015-12-04: transcript https://inkscape.org/en/gallery/item/7056/
* Meeting 2016-01-08: transcript https://inkscape.org/en/gallery/item/7276/
* Meeting 2016-04-01: transcript https://inkscape.org/en/gallery/item/9565/
* Meeting 2016-05-06: transcript https://inkscape.org/en/gallery/item/9563/
* Meeting 2016-06-03: transcript https://inkscape.org/en/gallery/item/9667/
* Meeting 2016-07-08: transcript https://inkscape.org/en/gallery/item/9766/
* Meeting 2016-08-05: transcript https://inkscape.org/en/gallery/item/9864/
* Meeting 2016-09-02: transcript https://inkscape.org/en/gallery/item/9971/
* Meeting 2016-11-04: transcript https://inkscape.org/en/gallery/item/10241/
* Meeting 2016-12-02: transcript https://inkscape.org/en/gallery/item/10484/
* Meeting 2017-01-06: transcript https://inkscape.org/en/gallery/item/10582/
* Meeting 2017-02-03: transcript https://inkscape.org/en/gallery/item/10651/
* Meeting 2017-03-03: transcript https://inkscape.org/en/gallery/item/10740/

* Archive of all transcripts: https://inkscape.org/en/gallery/=pastebin/?q=meeting&order=-edited

Release notes/0.93

2017-02-07T17:35:56Z

Tghs: /* Important changes */ Fix typo.

{{Other languages|en=Release_notes/0.93}}

==Inkscape 0.93==

'''(definitely not released yet - [[AnnouncePlanning093]])'''

==Release highlights==

Released on '''«YYYY-MM-DD»'''.

[Please fill in]

==Important changes==

[Please fill in]

The icon preview dialog now correctly shows the page background (Bug #[https://bugs.launchpad.net/inkscape/+bug/1537497 1537497]). As a side effect, custom UI icons SVG files need updating to have their background color alpha channel set to 0 so that they display correctly (see Bug #[https://bugs.launchpad.net/inkscape/+bug/1661989 1661989]).

== Live Path Effects ==

[Please fill in]

== Import / Export ==

[Please fill in]

== Extensions ==

[Please fill in]

== SVG and CSS ==

[Please fill in]

== Command Line ==

* Xverbs ([https://sourceforge.net/p/inkscape/mailman/inkscape-devel/thread/33487d06-e3c1-a4e5-1496-7b370d672d2f%40gmail.com/#msg35392523 mailing list thread])

== New dependencies ==

[Please fill in]

== Translations ==

New UI translations for [please fill in].

== Notable Bugfixes ==

[Please fill in]

For an exhaustive list of bugs that have been fixed, please see the [https://launchpad.net/inkscape/+milestone/0.93 milestones page for Inkscape 0.93]..

== Known Issues ==

[Please fill in]

==Previous releases==
* [[Release notes/0.92]]
* [[Release notes/0.91]]
* [[Release notes/0.48]] ([[Release notes/0.48.1 |0.48.1]], [[Release notes/0.48.2 | 0.48.2]], [[Release notes/0.48.3 | 0.48.3]], [[Release notes/0.48.4 | 0.48.4]], [[Release notes/0.48.5 | 0.48.5]])
* [[Release notes/0.47]]
* [[Release notes/0.46]]
* [[Release notes/0.45]]
* [[Release notes/0.44]]
* [[Release notes/0.43]]
* [[Release notes/0.42]]
* [[Release notes/0.41]]
* [[Release notes/0.40]]
* [[Release notes/0.39]]
* [[Release notes/0.38]]
* [[Release notes/0.37]]
* [[Release notes/0.36]]
* [[Release notes/0.35]]