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.

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

Scheduler GUI is accessible via url #456

Merged
merged 4 commits into from
Sep 3, 2015

Conversation

pgo-eea-sk
Copy link

resolves #384
GUI change was not implemented. Only URL handling was done.

…ia_URL

Conflicts:
	frontend/src/main/resources/frontend-messages.properties
@skrchnavy skrchnavy changed the title Feature/384 scheduler gui change access via url Scheduler GUI is accessible via url Jul 14, 2015
@ghost ghost assigned tomas-knap Jul 16, 2015
@tomas-knap
Copy link

@pgo-eea-sk, could you please merge latest develop into this branch?

Also please during merging, keep special attention to frontend/src/main/resources/frontend-messages.properties and frontend/src/main/resources/frontend-messages_sk.properties - please do not reformat what is in the latest develop branch and in case of conflict always use what is in the develop branch. Only new/updated frontend messages should be modified by this pull request.

Then please assing to me, I will test.

…ia_URL

Conflicts:
	frontend/src/main/java/cz/cuni/mff/xrg/odcs/frontend/gui/views/Scheduler.java
	frontend/src/main/resources/frontend-messages.properties
	frontend/src/main/resources/frontend-messages_sk.properties
pgo-eea-sk added a commit that referenced this pull request Sep 3, 2015
…hange_access_via_URL

Scheduler GUI is accessible via url
@pgo-eea-sk pgo-eea-sk merged commit 6d48b6a into develop Sep 3, 2015
@skrchnavy skrchnavy deleted the feature/384_scheduler_gui_change_access_via_URL branch September 3, 2015 16:25
@tomas-knap
Copy link

@pgo-eea-sk, this was not tested!! I asked you not to merge the pull request, but to merge develop TO this pull request! Please do not merge without approval!

@tomas-knap
Copy link

TODO: Test and in case of problems revert

@tomas-knap tomas-knap self-assigned this Sep 4, 2015
@tomas-knap tomas-knap restored the feature/384_scheduler_gui_change_access_via_URL branch September 4, 2015 08:12
@skrchnavy skrchnavy deleted the feature/384_scheduler_gui_change_access_via_URL branch September 4, 2015 10:54
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants