rename mail and change order #35
Conversation
Currently translated at 12.3% (188 of 1525 strings) Co-authored-by: Matevž Špacapan <[email protected]>
Bumps [vite](https://github.com/vitejs/vite/tree/HEAD/packages/vite) from 4.4.8 to 4.5.2. - [Release notes](https://github.com/vitejs/vite/releases) - [Changelog](https://github.com/vitejs/vite/blob/v4.5.2/packages/vite/CHANGELOG.md) - [Commits](https://github.com/vitejs/vite/commits/v4.5.2/packages/vite) Signed-off-by: Tobias Kunze <[email protected]>
closes #1659
closes #1613
Currently translated at 49.5% (755 of 1525 strings) Translate-URL: http://translate.pretalx.com/projects/pretalx/pretalx/nl/ Translation: pretalx/pretalx Co-authored-by: Remco Poortinga - van Wijnen <[email protected]> Signed-off-by: Tobias Kunze <[email protected]>
closes #1660
closes #1666
ref #1351
Signed-off-by: Marco A. Gutierrez <[email protected]>
Signed-off-by: Marco A. Gutierrez <[email protected]>
Signed-off-by: Marco A. Gutierrez <[email protected]>
Signed-off-by: Marco A. Gutierrez <[email protected]>
Signed-off-by: Marco A. Gutierrez <[email protected]>
|
Please deploy the system locally with the changes and add a screenshot into the PR description. Thanks |
For better clarity, instead of using the acronym "CfP" we can instead use "Call for Speakers" directly. fixes: fossasia#9
|
@mariobehling I have deployed and added a screenshot above. Please have a look, thank you |
Add button link to view or edit speaker profile fossasia#17 --------- Co-authored-by: Marco A. Gutierrez <[email protected]>
This reverts commit 259641e.
Co-authored-by: Marco A. Gutierrez <[email protected]>
Co-authored-by: Marco A. Gutierrez <[email protected]>
Co-authored-by: Marco A. Gutierrez <[email protected]>
|
@mariobehling @marcoag I have committed all the suggestions. But there are merge conflicts. I think the code lines mentioned in the files have been updated. You might want to have a look at one of the conflict files. Should I solve the merge conflicts also? |
|
Yes, please merge the |
…ventyay-talk into mail_rename_order
|
@norbusan I've tried to merge changes but this PR now looks really ugly. I'm assuming I need to create a new PR for the development branch instead of the main branch, or did I do something wrong? |
|
Yes please, since and main and development are more or less the same, I suggest re-opening a new PR against development from the same branch. If you do this, please close this PR. |
|
Re-opened new PR against development branch. Closing this PR now |
This PR closes/references issue #11
How has this been tested?
Results on running the server locally are:
Checklist
doc/changelog.rst.