Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Merge develop into master, fix conflicts #1

Closed
RoboSparrow opened this issue Sep 7, 2018 · 2 comments
Closed

Merge develop into master, fix conflicts #1

RoboSparrow opened this issue Sep 7, 2018 · 2 comments
Assignees
@RoboSparrow
Projects
reefwatch release

Comments

@RoboSparrow
Copy link
Contributor

as discussed in meeting 07/09
@RoboSparrow RoboSparrow self-assigned this Sep 7, 2018
@RoboSparrow RoboSparrow added this to To do in reefwatch release Sep 7, 2018
@RoboSparrow
Copy link
Contributor Author

alright, merging master into develop seemed to have succeeded, no merge conflicts

Frontend
starting up dev server frontend shows some compilation errors due to the merge, need to resolve them individually

ERROR in ./js/Login.js
Module not found: Error: Cannot resolve 'file' or 'directory' ./environments/environment in /home/joerg/Workspace/wgh-reefwatch/reefwatch/js
 @ ./js/Login.js 47:19-56

ERROR in ./js/PasswordChange.js
Module not found: Error: Cannot resolve 'file' or 'directory' ./environments/environment in /home/joerg/Workspace/wgh-reefwatch/reefwatch/js
 @ ./js/PasswordChange.js 39:1``9-56

ERROR in ./js/Welcome.js
Module not found: Error: Cannot resolve 'file' or 'directory' ./environments/environment in /home/joerg/Workspace/wgh-reefwatch/reefwatch/js
 @ ./js/Welcome.js 39:19-56

ERROR in ./js/PhotoUpload.js
Module not found: Error: Cannot resolve module 'react-image-gallery' in /home/joerg/Workspace/wgh-reefwatch/reefwatch/js
 @ ./js/PhotoUpload.js 19:25-55

@RoboSparrow RoboSparrow moved this from To do to In progress in reefwatch release Sep 7, 2018
@RoboSparrow
Copy link
Contributor Author

RoboSparrow commented Sep 10, 2018 •
edited
Loading

eslint errors
https://docs.google.com/spreadsheets/d/1dIzKc6qXpiXiwFuTcP7kbsLG1vsmWAHopgZpqzGWvxY/edit#gid=885265675

reefwatch release automation moved this from In progress to Done Sep 12, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees

@RoboSparrow RoboSparrow

Labels
None yet
Projects
reefwatch release
  
Done
Milestone
No milestone
Development

No branches or pull requests
1 participant
@RoboSparrow