Gsoc develop merge 4 #1169
Merged
Gsoc develop merge 4 #1169
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Merged develop to stable, V5.0.0
* skipped test_version_name_delete * tests skipped, because they can be biased * ToDos added * skipped because failing in reverse order * test assert removed * hanging tests skipped * a few tests skipped which fails in (reverse) order * skipped because: An unhandled message box popped up during your test! * simplified tests * removed dependency to server start * improved tests for user object, refactored test_files * refactored test_files_api * Test_Init_Server refactored * server tests partial refactored * test_server completed * fixed type bug in server and updated test_server * cleanup duplicated tests * reactored test_server * refactored test_utils * refactored test_chat_manager.py for test_client * refactored to test_client * test_file_manager refactored for test_client * refactored test_files to test_client * test_files_api refactored for test_client * refactored test_seed for test_client * refactored call of db.init_app * used userdata * removed duplications * enabled skipped tests * introduces reverse order on testing * disabled a test, because of KeyError * renamed the "json" parameter * tests start with a resetted database
* hides subprocess windows on os.system = "nt" * improved subprocess_startupinfo
* upgrading first part of flask based modules * refactored for socketio update * used same definition for pallets modules as in v3.x * removed namespaces, removed namespace declarations * reverted missing line, linestyle improved
Merged stable into development
# Conflicts: # mslib/mscolab/_tests/test_chat_manager.py # mslib/mscolab/_tests/test_file_manager.py # mslib/mscolab/_tests/test_files.py # mslib/mscolab/_tests/test_files_api.py # mslib/mscolab/_tests/test_seed.py # mslib/mscolab/_tests/test_server.py # mslib/mscolab/_tests/test_user.py # mslib/mscolab/_tests/test_utils.py # mslib/msui/_tests/test_mscolab.py
joernu76
approved these changes
Aug 23, 2021
joernu76
added a commit
that referenced
this pull request
Aug 23, 2021
commit c4b273c Merge: e6014c0 d7716ba Author: ReimarBauer <rb.proj@gmail.com> Date: Mon Aug 23 15:10:26 2021 +0200 Merge pull request #1169 from aravindm711/gsoc-develop-merge-4 Gsoc develop merge 4 commit d7716ba Author: Aravind Murali <aravindmurali711@gmail.com> Date: Mon Aug 23 17:11:00 2021 +0530 refactored tests for help dialog commit 111f64c Merge: e6014c0 da77f88 Author: Aravind Murali <aravindmurali711@gmail.com> Date: Mon Aug 23 16:58:35 2021 +0530 Merge branch 'develop' into gsoc-develop-merge-4 # Conflicts: # mslib/mscolab/_tests/test_chat_manager.py # mslib/mscolab/_tests/test_file_manager.py # mslib/mscolab/_tests/test_files.py # mslib/mscolab/_tests/test_files_api.py # mslib/mscolab/_tests/test_seed.py # mslib/mscolab/_tests/test_server.py # mslib/mscolab/_tests/test_user.py # mslib/mscolab/_tests/test_utils.py # mslib/msui/_tests/test_mscolab.py commit e6014c0 Author: Aravind Murali <aravindmurali711@gmail.com> Date: Sun Aug 22 11:49:12 2021 +0530 GSoC update - Updated MSColab help dialog (#1161) * partially updated mscolab help dialog * updated mscolab help dialog * updated collaborator description commit b6517e2 Author: Aravind Murali <aravindmurali711@gmail.com> Date: Sun Aug 22 02:46:33 2021 +0530 GSoC config editor update 3 - refactor of config_loader (#1159) * refactor of config_loader * moved config class to config submodule * moved config related tests to its own submodule; extended test scope * fixed restart bug commit 7a10464 Author: Aravind Murali <aravindmurali711@gmail.com> Date: Wed Aug 18 01:04:20 2021 +0530 GSoC config editor update 2 - validations (#1154) * added validations for config options * removed comments; fixed bugs * changed shortcut for views to meta for macOS * changed dialogs from question to warning commit 3cf5476 Merge: 242f1f9 478af6b Author: ReimarBauer <rb.proj@gmail.com> Date: Wed Aug 11 15:14:21 2021 +0200 Merge pull request #1143 from aravindm711/GSOC2021-AravindMurali_gets_updated GSoC develop merge 3 commit 478af6b Author: Aravind Murali <aravindmurali711@gmail.com> Date: Wed Aug 11 17:37:40 2021 +0530 added assert statements from recent changes in develop commit bec4268 Merge: 242f1f9 36f4467 Author: Aravind Murali <aravindmurali711@gmail.com> Date: Wed Aug 11 17:22:26 2021 +0530 Merge branch 'develop' into GSOC2021-AravindMurali_gets_updated # Conflicts: # mslib/msui/_tests/test_mscolab_version_history.py commit 242f1f9 Author: Aravind Murali <aravindmurali711@gmail.com> Date: Wed Aug 11 13:09:20 2021 +0530 GSOC Config editor update (#1103) * initial implementation of profile window; extended test scope * completed profile window implementation and related tests * fixed flake8 test failure * fixed http auth bugs; extended test scope * added qt-json-view to support dir; added info in NOTICE * modified qt-json-view; mentioned modifications in readme * tested qt-json-view for proper usability * Provide same test signature * fixed failing test * handled socket conn exception; cleaned up unwanted comments * started implementation of config editor window * partially implemented merging user settings with default; fixed tests * implemented merging of default and user settings * implemented remove option handler * fixed bugs in 'remove' functionality * implemented restore defaults functionality * fixed restore default bugs and added logging statements * implemented import, export, save_restart * added comments * moved import/save/export options to toolbar Co-authored-by: May <baermay98@gmail.com> commit ff38534 Merge: f57bbb8 ae254f0 Author: J. Ungermann <j.ungermann@fz-juelich.de> Date: Wed Aug 4 10:46:43 2021 +0200 Merge pull request #1119 from aravindm711/gsoc-develop-merge-2 Gsoc develop merge 2 commit ae254f0 Author: Aravind Murali <aravindmurali711@gmail.com> Date: Tue Aug 3 14:04:24 2021 +0530 changed connect_window in tests to non modal to prevent time-out commit 9dad762 Merge: f57bbb8 7d4d924 Author: Aravind Murali <aravindmurali711@gmail.com> Date: Tue Aug 3 10:12:47 2021 +0530 Merge remote-tracking branch 'upstream/develop' into gsoc-develop-merge-2 commit f57bbb8 Author: Aravind Murali <aravindmurali711@gmail.com> Date: Fri Jul 23 16:22:12 2021 +0530 New Profile window (#1086) * initial implementation of profile window; extended test scope * completed profile window implementation and related tests * fixed flake8 test failure * fixed http auth bugs; extended test scope * Provide same test signature * fixed failing test Co-authored-by: May <baermay98@gmail.com> commit 853e2d5 Merge: 69672e4 7050cd9 Author: ReimarBauer <rb.proj@gmail.com> Date: Sun Jul 18 07:29:12 2021 +0200 Merge pull request #1082 from aravindm711/gsoc-develop-merge Gsoc develop merge commit 7050cd9 Author: Aravind Murali <aravindmurali711@gmail.com> Date: Sat Jul 17 16:08:16 2021 +0530 fixed tests; merged open/import commit 8c0f788 Author: Aravind Murali <aravindmurali711@gmail.com> Date: Thu Jul 15 14:24:31 2021 +0530 fixed mainwindow tests commit 69672e4 Merge: 018babe 45b2343 Author: ReimarBauer <rb.proj@gmail.com> Date: Thu Jul 15 09:45:19 2021 +0200 Merge pull request #1079 from aravindm711/GSOC2021-AravindMurali GSoC Progress Update 2 - Integrated plugins, refactored tests commit 19faae6 Merge: 45b2343 e2607fb Author: Aravind Murali <aravindmurali711@gmail.com> Date: Tue Jul 13 20:11:23 2021 +0530 Merge remote-tracking branch 'upstream/develop' into gsoc-develop-merge # Conflicts: # mslib/msui/_tests/test_mscolab.py # mslib/msui/_tests/test_mss_pyui.py # mslib/msui/mscolab.py commit 45b2343 Author: Aravind Murali <aravindmurali711@gmail.com> Date: Tue Jul 13 19:51:05 2021 +0530 fixed requested changes commit d8d7987 Author: Aravind Murali <aravindmurali711@gmail.com> Date: Tue Jul 13 10:55:53 2021 +0530 fixed failing tests and flake8 errors commit 38107a7 Author: Aravind Murali <aravindmurali711@gmail.com> Date: Sun Jul 11 15:47:38 2021 +0530 added plugin filter to add project browse; refactored tests commit 018babe Merge: 7895db8 4eecd75 Author: J. Ungermann <j.ungermann@fz-juelich.de> Date: Thu Jul 8 09:05:37 2021 +0200 Merge pull request #1059 from aravindm711/GSOC2021-AravindMurali GSoC progress update commit 4eecd75 Author: Aravind Murali <aravindmurali711@gmail.com> Date: Wed Jul 7 15:03:13 2021 +0530 integrated plugins with save flighttrack commit a4fdf64 Author: Aravind Murali <aravindmurali711@gmail.com> Date: Mon Jul 5 21:23:04 2021 +0530 removed activate flighttrack submenu commit 1f72361 Author: Aravind Murali <aravindmurali711@gmail.com> Date: Fri Jul 2 16:27:33 2021 +0530 made some improvements to ui commit 943216b Author: Aravind Murali <aravindmurali711@gmail.com> Date: Fri Jul 2 11:50:58 2021 +0530 fixed bug while opening views in local commit 2ea1282 Author: Aravind Murali <aravindmurali711@gmail.com> Date: Thu Jul 1 21:44:14 2021 +0530 moved from tabs to parallel layout of lists commit fb9d359 Author: Aravind Murali <aravindmurali711@gmail.com> Date: Thu Jul 1 14:41:21 2021 +0530 fixed view behaviour commit 690b49c Author: Aravind Murali <aravindmurali711@gmail.com> Date: Wed Jun 30 23:24:02 2021 +0530 initial implementation of change in view behaviour commit 21727f9 Author: Aravind Murali <aravindmurali711@gmail.com> Date: Wed Jun 30 19:53:43 2021 +0530 partially fixed mscolab tests commit 2354ae9 Author: Aravind Murali <aravindmurali711@gmail.com> Date: Wed Jun 30 00:21:46 2021 +0530 fixed view appearance; started test refactoring commit 7895db8 Merge: e516945 f55501d Author: J. Ungermann <j.ungermann@fz-juelich.de> Date: Fri Jun 25 13:41:58 2021 +0200 Merge pull request #1030 from aravindm711/GSOC2021-AravindMurali Implementation of Connect Window commit f55501d Author: Aravind Murali <aravindmurali711@gmail.com> Date: Fri Jun 25 14:49:09 2021 +0530 fixed view submenus, fatal errors commit 2649a45 Author: Aravind Murali <aravindmurali711@gmail.com> Date: Tue Jun 22 21:12:30 2021 +0530 improvements to ui commit 5b76093 Author: Aravind Murali <aravindmurali711@gmail.com> Date: Tue Jun 22 01:01:02 2021 +0530 completed merging of both window functionalities commit 83fe70b Author: Aravind Murali <aravindmurali711@gmail.com> Date: Sat Jun 19 00:27:12 2021 +0530 retained mscolab functionalities in separate file commit 8660f5b Author: Aravind Murali <aravindmurali711@gmail.com> Date: Mon Jun 14 13:59:02 2021 +0530 partial implementation of after_login in main window commit 91c6b35 Author: Aravind Murali <aravindmurali711@gmail.com> Date: Fri Jun 11 17:04:34 2021 +0530 implemented new connect window
ReimarBauer
pushed a commit
that referenced
this pull request
Aug 24, 2021
* Squashed commit of the following: commit c4b273c Merge: e6014c0 d7716ba Author: ReimarBauer <rb.proj@gmail.com> Date: Mon Aug 23 15:10:26 2021 +0200 Merge pull request #1169 from aravindm711/gsoc-develop-merge-4 Gsoc develop merge 4 commit d7716ba Author: Aravind Murali <aravindmurali711@gmail.com> Date: Mon Aug 23 17:11:00 2021 +0530 refactored tests for help dialog commit 111f64c Merge: e6014c0 da77f88 Author: Aravind Murali <aravindmurali711@gmail.com> Date: Mon Aug 23 16:58:35 2021 +0530 Merge branch 'develop' into gsoc-develop-merge-4 # Conflicts: # mslib/mscolab/_tests/test_chat_manager.py # mslib/mscolab/_tests/test_file_manager.py # mslib/mscolab/_tests/test_files.py # mslib/mscolab/_tests/test_files_api.py # mslib/mscolab/_tests/test_seed.py # mslib/mscolab/_tests/test_server.py # mslib/mscolab/_tests/test_user.py # mslib/mscolab/_tests/test_utils.py # mslib/msui/_tests/test_mscolab.py commit e6014c0 Author: Aravind Murali <aravindmurali711@gmail.com> Date: Sun Aug 22 11:49:12 2021 +0530 GSoC update - Updated MSColab help dialog (#1161) * partially updated mscolab help dialog * updated mscolab help dialog * updated collaborator description commit b6517e2 Author: Aravind Murali <aravindmurali711@gmail.com> Date: Sun Aug 22 02:46:33 2021 +0530 GSoC config editor update 3 - refactor of config_loader (#1159) * refactor of config_loader * moved config class to config submodule * moved config related tests to its own submodule; extended test scope * fixed restart bug commit 7a10464 Author: Aravind Murali <aravindmurali711@gmail.com> Date: Wed Aug 18 01:04:20 2021 +0530 GSoC config editor update 2 - validations (#1154) * added validations for config options * removed comments; fixed bugs * changed shortcut for views to meta for macOS * changed dialogs from question to warning commit 3cf5476 Merge: 242f1f9 478af6b Author: ReimarBauer <rb.proj@gmail.com> Date: Wed Aug 11 15:14:21 2021 +0200 Merge pull request #1143 from aravindm711/GSOC2021-AravindMurali_gets_updated GSoC develop merge 3 commit 478af6b Author: Aravind Murali <aravindmurali711@gmail.com> Date: Wed Aug 11 17:37:40 2021 +0530 added assert statements from recent changes in develop commit bec4268 Merge: 242f1f9 36f4467 Author: Aravind Murali <aravindmurali711@gmail.com> Date: Wed Aug 11 17:22:26 2021 +0530 Merge branch 'develop' into GSOC2021-AravindMurali_gets_updated # Conflicts: # mslib/msui/_tests/test_mscolab_version_history.py commit 242f1f9 Author: Aravind Murali <aravindmurali711@gmail.com> Date: Wed Aug 11 13:09:20 2021 +0530 GSOC Config editor update (#1103) * initial implementation of profile window; extended test scope * completed profile window implementation and related tests * fixed flake8 test failure * fixed http auth bugs; extended test scope * added qt-json-view to support dir; added info in NOTICE * modified qt-json-view; mentioned modifications in readme * tested qt-json-view for proper usability * Provide same test signature * fixed failing test * handled socket conn exception; cleaned up unwanted comments * started implementation of config editor window * partially implemented merging user settings with default; fixed tests * implemented merging of default and user settings * implemented remove option handler * fixed bugs in 'remove' functionality * implemented restore defaults functionality * fixed restore default bugs and added logging statements * implemented import, export, save_restart * added comments * moved import/save/export options to toolbar Co-authored-by: May <baermay98@gmail.com> commit ff38534 Merge: f57bbb8 ae254f0 Author: J. Ungermann <j.ungermann@fz-juelich.de> Date: Wed Aug 4 10:46:43 2021 +0200 Merge pull request #1119 from aravindm711/gsoc-develop-merge-2 Gsoc develop merge 2 commit ae254f0 Author: Aravind Murali <aravindmurali711@gmail.com> Date: Tue Aug 3 14:04:24 2021 +0530 changed connect_window in tests to non modal to prevent time-out commit 9dad762 Merge: f57bbb8 7d4d924 Author: Aravind Murali <aravindmurali711@gmail.com> Date: Tue Aug 3 10:12:47 2021 +0530 Merge remote-tracking branch 'upstream/develop' into gsoc-develop-merge-2 commit f57bbb8 Author: Aravind Murali <aravindmurali711@gmail.com> Date: Fri Jul 23 16:22:12 2021 +0530 New Profile window (#1086) * initial implementation of profile window; extended test scope * completed profile window implementation and related tests * fixed flake8 test failure * fixed http auth bugs; extended test scope * Provide same test signature * fixed failing test Co-authored-by: May <baermay98@gmail.com> commit 853e2d5 Merge: 69672e4 7050cd9 Author: ReimarBauer <rb.proj@gmail.com> Date: Sun Jul 18 07:29:12 2021 +0200 Merge pull request #1082 from aravindm711/gsoc-develop-merge Gsoc develop merge commit 7050cd9 Author: Aravind Murali <aravindmurali711@gmail.com> Date: Sat Jul 17 16:08:16 2021 +0530 fixed tests; merged open/import commit 8c0f788 Author: Aravind Murali <aravindmurali711@gmail.com> Date: Thu Jul 15 14:24:31 2021 +0530 fixed mainwindow tests commit 69672e4 Merge: 018babe 45b2343 Author: ReimarBauer <rb.proj@gmail.com> Date: Thu Jul 15 09:45:19 2021 +0200 Merge pull request #1079 from aravindm711/GSOC2021-AravindMurali GSoC Progress Update 2 - Integrated plugins, refactored tests commit 19faae6 Merge: 45b2343 e2607fb Author: Aravind Murali <aravindmurali711@gmail.com> Date: Tue Jul 13 20:11:23 2021 +0530 Merge remote-tracking branch 'upstream/develop' into gsoc-develop-merge # Conflicts: # mslib/msui/_tests/test_mscolab.py # mslib/msui/_tests/test_mss_pyui.py # mslib/msui/mscolab.py commit 45b2343 Author: Aravind Murali <aravindmurali711@gmail.com> Date: Tue Jul 13 19:51:05 2021 +0530 fixed requested changes commit d8d7987 Author: Aravind Murali <aravindmurali711@gmail.com> Date: Tue Jul 13 10:55:53 2021 +0530 fixed failing tests and flake8 errors commit 38107a7 Author: Aravind Murali <aravindmurali711@gmail.com> Date: Sun Jul 11 15:47:38 2021 +0530 added plugin filter to add project browse; refactored tests commit 018babe Merge: 7895db8 4eecd75 Author: J. Ungermann <j.ungermann@fz-juelich.de> Date: Thu Jul 8 09:05:37 2021 +0200 Merge pull request #1059 from aravindm711/GSOC2021-AravindMurali GSoC progress update commit 4eecd75 Author: Aravind Murali <aravindmurali711@gmail.com> Date: Wed Jul 7 15:03:13 2021 +0530 integrated plugins with save flighttrack commit a4fdf64 Author: Aravind Murali <aravindmurali711@gmail.com> Date: Mon Jul 5 21:23:04 2021 +0530 removed activate flighttrack submenu commit 1f72361 Author: Aravind Murali <aravindmurali711@gmail.com> Date: Fri Jul 2 16:27:33 2021 +0530 made some improvements to ui commit 943216b Author: Aravind Murali <aravindmurali711@gmail.com> Date: Fri Jul 2 11:50:58 2021 +0530 fixed bug while opening views in local commit 2ea1282 Author: Aravind Murali <aravindmurali711@gmail.com> Date: Thu Jul 1 21:44:14 2021 +0530 moved from tabs to parallel layout of lists commit fb9d359 Author: Aravind Murali <aravindmurali711@gmail.com> Date: Thu Jul 1 14:41:21 2021 +0530 fixed view behaviour commit 690b49c Author: Aravind Murali <aravindmurali711@gmail.com> Date: Wed Jun 30 23:24:02 2021 +0530 initial implementation of change in view behaviour commit 21727f9 Author: Aravind Murali <aravindmurali711@gmail.com> Date: Wed Jun 30 19:53:43 2021 +0530 partially fixed mscolab tests commit 2354ae9 Author: Aravind Murali <aravindmurali711@gmail.com> Date: Wed Jun 30 00:21:46 2021 +0530 fixed view appearance; started test refactoring commit 7895db8 Merge: e516945 f55501d Author: J. Ungermann <j.ungermann@fz-juelich.de> Date: Fri Jun 25 13:41:58 2021 +0200 Merge pull request #1030 from aravindm711/GSOC2021-AravindMurali Implementation of Connect Window commit f55501d Author: Aravind Murali <aravindmurali711@gmail.com> Date: Fri Jun 25 14:49:09 2021 +0530 fixed view submenus, fatal errors commit 2649a45 Author: Aravind Murali <aravindmurali711@gmail.com> Date: Tue Jun 22 21:12:30 2021 +0530 improvements to ui commit 5b76093 Author: Aravind Murali <aravindmurali711@gmail.com> Date: Tue Jun 22 01:01:02 2021 +0530 completed merging of both window functionalities commit 83fe70b Author: Aravind Murali <aravindmurali711@gmail.com> Date: Sat Jun 19 00:27:12 2021 +0530 retained mscolab functionalities in separate file commit 8660f5b Author: Aravind Murali <aravindmurali711@gmail.com> Date: Mon Jun 14 13:59:02 2021 +0530 partial implementation of after_login in main window commit 91c6b35 Author: Aravind Murali <aravindmurali711@gmail.com> Date: Fri Jun 11 17:04:34 2021 +0530 implemented new connect window * fixed popup bug; handled json error message loading Co-authored-by: Aravind Murali <aravindmurali711@gmail.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.