Skip to content

Move oc_webroot/OC.webroot to the bundle #15295

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
Merged
MorrisJobke merged 1 commit into from
May 6, 2019
Merged

Move oc_webroot/OC.webroot to the bundle #15295

MorrisJobke merged 1 commit into from
May 6, 2019

Conversation

@ChristophWurst
Copy link
Member

@ChristophWurst ChristophWurst commented Apr 29, 2019 •
edited
Loading

@ChristophWurst ChristophWurst added the 2. developing Work in progress label Apr 29, 2019
@ChristophWurst ChristophWurst added this to the Nextcloud 17 milestone Apr 29, 2019
@ChristophWurst ChristophWurst self-assigned this Apr 29, 2019
@ChristophWurst ChristophWurst force-pushed the refactor/oc-webroot-bundle branch 2 times, most recently from dde6e66 to 00df528 Compare May 2, 2019 14:07
@ChristophWurst ChristophWurst requested review from danxuliu, georgehrke, juliusknorr, rullzer and skjnldsv and removed request for juliusknorr and skjnldsv May 2, 2019 14:07
@ChristophWurst ChristophWurst added 3. to review Waiting for reviews and removed 2. developing Work in progress labels May 2, 2019
@ChristophWurst ChristophWurst mentioned this pull request May 2, 2019
Merged
3 tasks
@ChristophWurst ChristophWurst force-pushed the refactor/oc-webroot-bundle branch from 00df528 to 2850ddc Compare May 2, 2019 14:13
@ChristophWurst ChristophWurst force-pushed the refactor/oc-webroot-bundle branch from 2850ddc to a898f1e Compare May 2, 2019 14:45
@ChristophWurst ChristophWurst force-pushed the refactor/oc-webroot-bundle branch from a898f1e to b2ea454 Compare May 3, 2019 06:16
@ChristophWurst ChristophWurst mentioned this pull request May 3, 2019
Closed
@MorrisJobke MorrisJobke force-pushed the refactor/oc-webroot-bundle branch from b2ea454 to e135f1d Compare May 6, 2019 08:09
@MorrisJobke
Copy link
Member

MorrisJobke commented May 6, 2019

Rebased to fix conflicts 👍

MorrisJobke
MorrisJobke approved these changes May 6, 2019
View reviewed changes
Copy link
Member

@MorrisJobke MorrisJobke left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Tested and works 👍

@MorrisJobke MorrisJobke added 4. to release Ready to be released and/or waiting for tests to finish and removed 3. to review Waiting for reviews labels May 6, 2019
@skjnldsv
Copy link
Member

skjnldsv commented May 6, 2019

webpack & jsunit fails

@skjnldsv skjnldsv added 2. developing Work in progress and removed 4. to release Ready to be released and/or waiting for tests to finish labels May 6, 2019
@ChristophWurst ChristophWurst force-pushed the refactor/oc-webroot-bundle branch from e135f1d to 07efdba Compare May 6, 2019 11:55
@ChristophWurst ChristophWurst force-pushed the refactor/oc-webroot-bundle branch from ff19e81 to 249a5db Compare May 6, 2019 15:55
@ChristophWurst ChristophWurst added 4. to release Ready to be released and/or waiting for tests to finish and removed 2. developing Work in progress labels May 6, 2019
@MorrisJobke MorrisJobke merged commit d20bbb7 into master May 6, 2019
@MorrisJobke MorrisJobke deleted the refactor/oc-webroot-bundle branch May 6, 2019 20:05
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@MorrisJobke MorrisJobke MorrisJobke approved these changes

@georgehrke georgehrke georgehrke approved these changes

@skjnldsv skjnldsv skjnldsv approved these changes

@danxuliu danxuliu Awaiting requested review from danxuliu

@juliusknorr juliusknorr Awaiting requested review from juliusknorr

@rullzer rullzer Awaiting requested review from rullzer

Assignees

@ChristophWurst ChristophWurst

Labels

4. to release Ready to be released and/or waiting for tests to finish technical debt

Projects

None yet

Milestone

Nextcloud 17

Development

Successfully merging this pull request may close these issues.

5 participants

@ChristophWurst @MorrisJobke @skjnldsv @georgehrke