Ville Suoranta | b9f13262b27M | Pull request #11: CAS-14231Merge in CASA/casaplotserver from CAS-14231 to master
* commit 'a44d3f1ee688f9a868f9a21ad508bb4850fc1831':
Fix create-app url
Add qt.conf for Apple Silicon/Qt5
Upgrade to create-app-assembly-1.13.jar
Mark wheel as arm64
casaplotserver.pro arm64 updates | | CAS-14231 |
Ville Suoranta | a44d3f1ee68Fix create-app url | Fix create-app url | | |
Ville Suoranta | 3f6531ed527 | Add qt.conf for Apple Silicon/Qt5 | | |
Ville Suoranta | 2544c0e0fa4 | Upgrade to create-app-assembly-1.13.jar | | |
Ville Suoranta | 36596027673 | Mark wheel as arm64 | | |
Ville Suoranta | 7680d73e3c2 | casaplotserver.pro arm64 updates | | |
 Pam Harris | 76c183c7bd8M | Pull request #10: CAS-14085 support Qt5 in plotserverMerge in CASA/casaplotserver from CAS-14085 to master
* commit '301d0203b22c7b7fc93e8bda88181a66e5d83a23':
Update casa6 branch with master
Update casa6 branch commit
Update path in agentflagger display test for casaplotserver
Adapt casaplotserver code to Qt5 | | CAS-14085 |
Pam Harris | 301d0203b22 | Update casa6 branch with master | | |
Pam Harris | c83f5f0f714M | Merge branch 'master' into CAS-14085 | | CAS-14085 |
 Darrell Schiebel | 89bec49a805M | Pull request #9: update casaplotserver with new version of casacore [CAS-14106]Merge in CASA/casaplotserver from CAS-14106 to master
* commit '498d28ac88301d5c62e548ccce9874308e71c2fb':
update casaplotserver with new version of casacore [CAS-14106] | | CAS-14106 |
Pam Harris | d037f24a59eM | Merge branch 'CAS-14085' of https://open-bitbucket.nrao.edu/scm/casa/casaplotserver into CAS-14085 | | CAS-14085 |
Pam Harris | 5ccd8ac96a1 | Update casa6 branch commit | | |
Darrell Schiebel | 498d28ac883 | update casaplotserver with new version of casacore [CAS-14106] | | CAS-14106 |
Pam Harris | 90400b7fa7b | Update path in agentflagger display test for casaplotserver | | |
Pam Harris | bd2b089f275 | Adapt casaplotserver code to Qt5 | | |
Ville Suoranta | c03cfd6befbM | Pull request #8: CAS-13923Merge in CASA/casaplotserver from CAS-13923 to master
* commit '6973b1bb87881d56d8f65e1318afe2e62721a850':
update casa-source [CAS-13923]
build with system grpc (without casatools, at build time) [CAS-13923] | | CAS-13923 |
Darrell Schiebel | 6973b1bb878 | update casa-source [CAS-13923] | | CAS-13923 |
Darrell Schiebel | 5b73726d921 | build with system grpc (without casatools, at build time) [CAS-13923] | | CAS-13923 |
 C. Enrique Garcia Dabo | ff3f8efde67M | Pull request #7: CAS-13867: Clean up of #ifdef conditional compilationsMerge in CASA/casaplotserver from CAS-13867 to master
* commit 'ca0273f903fbb4a60421fda11f287eb70b162ce4':
Point casa-source to latest commit in CAS-13867 | | CAS-13867 |
C. Enrique Garcia Dabo | ca0273f903fM | Merge remote-tracking branch 'origin/master' into CAS-13867 | | CAS-13867 |
C. Enrique Garcia Dabo | b63bc3b64df | Point casa-source to latest commit in CAS-13867 | | CAS-13867 |
 C. Enrique Garcia Dabo | f63c1d940c5M | Pull request #6: CAS-13867: Clean up of #ifdef conditional compilationsMerge in CASA/casaplotserver from CAS-13867 to master
* commit '0f928a85f8cf06b0f0bec367073d349939dc8d05':
Fix typo
Do not use CASATOOLS ifdef but rather USE_GRPC where appropiate.
Point to casa-source in CAS-13867
Do not define CASATOOLS. Define USE_GRPC where needed.
Move casa-source pointer to casa6 CAS-13867 branch | | CAS-13867 |
C. Enrique Garcia Dabo | 0f928a85f8c | Fix typo | | |
C. Enrique Garcia Dabo | 1739576dd11 | Do not use CASATOOLS ifdef but rather USE_GRPC where appropiate.Fixies partially CAS-13867 | | CAS-13867 |
C. Enrique Garcia Dabo | 6929f79c612M | Merge remote-tracking branch 'origin/master' into CAS-13867 | | CAS-13867 |
C. Enrique Garcia Dabo | 4c70d0c1d06 | Point to casa-source in CAS-13867 | | CAS-13867 |
C. Enrique Garcia Dabo | da6e8b1efe1 | Do not define CASATOOLS. Define USE_GRPC where needed.Fixes partially CAS-13867 | | CAS-13867 |
 C. Enrique Garcia Dabo | f483c65f642M | Pull request #5: CAS-13859: Break circular dependency of casacpp modulesMerge in CASA/casaplotserver from CAS-13859 to master
* commit '99af612646ac5a6fa5dce8295b3def095402e8ea':
Update casa-source
Remove files from the build system that no longer exist
Follow changes in repository structure of casa6 as part of CAS-13859 | | CAS-13859 |
C. Enrique Garcia Dabo | 99af612646aM | Merge branch 'CAS-13859' of https://open-bitbucket.nrao.edu/scm/casa/casaplotserver into CAS-13859 | | CAS-13859 |
C. Enrique Garcia Dabo | 74b00e99963 | Update casa-source | | |
C. Enrique Garcia Dabo | aa2d7f67706M | Merge remote-tracking branch 'origin/master' into CAS-13859 | | CAS-13859 |
 C. Enrique Garcia Dabo | 5fe5030b67fM | Pull request #4: CAS-13868 Remove obsolete X11 headersMerge in CASA/casaplotserver from CAS-13868 to master
* commit '7b9fdff2a21247265d897a5dbfb2d598ad60d0cf':
explicitly set permissions in the app
Update project file for casacore changes
Update casa6 branch commit | | CAS-13868 |
C. Enrique Garcia Dabo | 9f344ce7d55M | Merge branch 'CAS-13859' of https://open-bitbucket.nrao.edu/scm/casa/casaplotserver into CAS-13859 | | CAS-13859 |
C. Enrique Garcia Dabo | 345ff953e42 | Remove files from the build system that no longer exist | | |
C. Enrique Garcia Dabo | 064fca94384M | Merge commit '8c1431eb19db0f1a526b3d0f61399204075e03cf' into CAS-13859 | | CAS-13859 |
C. Enrique Garcia Dabo | 319335d039f | Follow changes in repository structure of casa6 as part of CAS-13859 | | CAS-13859 |
C. Enrique Garcia Dabo | eab33c56082 | Move casa-source pointer to casa6 CAS-13867 branch | | CAS-13867 |
C. Enrique Garcia Dabo | ddce08f8c4aM | Merge commit '8c1431eb19db0f1a526b3d0f61399204075e03cf' into CAS-13867 | | CAS-13867 |
Pam Harris | 7b9fdff2a21 | explicitly set permissions in the app | | |
Pam Harris | 8c1431eb19d | Update project file for casacore changes | | |
Pam Harris | 734be78b228 | Update casa6 branch commit | | |
C. Enrique Garcia Dabo | 6d3e9e1772f | Revert "updated casa-source to most recent casa6 CAS-13857 changes"This reverts commit 0d0092238d1b3468a2a5920951abfe3f2fc274e8. | | CAS-13857 |
C. Enrique Garcia Dabo | 0d0092238d1 | updated casa-source to most recent casa6 CAS-13857 changes | | CAS-13857 |
Ville Suoranta | e066fbda8c0M | Merge pull request #3 in CASA/casaplotserver from CAS-13461 to master* commit 'ca7180c6e528451f53a7b948ef7e56feda5010f1':
updated casa-source to point to (hopefully) final CAS-13461 state before PR
updated casa-source to most recent casa6 CAS-13461 changes
casa-source brought up to date with latest merge of master into casa6 for this branch
updated casa-source to most recent CAS-13461
Updated casa-source to latest casa6 CAS-13461 branch
Link with lib... | | CAS-13461 |
Bob Garwood | ca7180c6e52 | updated casa-source to point to (hopefully) final CAS-13461 state before PR | | CAS-13461 |
Bob Garwood | 4a018268cb1 | updated casa-source to most recent casa6 CAS-13461 changes | | CAS-13461 |
Bob Garwood | 596337f314f | casa-source brought up to date with latest merge of master into casa6 for this branch | | |
Bob Garwood | 70ed99ded76 | updated casa-source to most recent CAS-13461 | | CAS-13461 |
Bob Garwood | 4f70d8a509b | Updated casa-source to latest casa6 CAS-13461 branch | | CAS-13461 |
Ville Suoranta | c37020a34c9M | Merge branch 'master' into CAS-13461 | | CAS-13461 |