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 of the AdminExperience repository #3041

Merged
merged 5,779 commits into from
Oct 2, 2019
Merged

Merge of the AdminExperience repository #3041

merged 5,779 commits into from
Oct 2, 2019

Conversation

valadas
Copy link
Contributor

@valadas valadas commented Sep 30, 2019

At this stage this is just to test merging the admin experience repository into the main repository, please do not merge yet.

ohine and others added 30 commits February 20, 2019 00:30
@ohine
Merge pull request dnnsoftware#226 from dnnsoftware/release/9.3.0
7f4891d 
Update master with fixes from v9.3.0-rc2
@mikebigun @mitchelsellers
PB > Site Settings > Languages shows language settings of Portal 0 (d…
878c9aa 
…nnsoftware#410)

* DNN-29318 PB > Site Settings > Languages shows language settings of Portal 0

* DNN-29318 PB > Site Settings > Languages shows language settings of Portal 0

* DNN-29318 PB > Site Settings > Languages shows language settings of Portal 0
@valadas @daguiler
Fixes issue with Edge (dnnsoftware#406)
ccd579a
@mikebigun @daguiler
Relative path of personaBarDialog.css (dnnsoftware#413)
313ab5b
@mikebigun @valadas
DNN-29419 Users - Getting Error message while creating new user (dnns…
0dd0a29 
…oftware#421)
@bdukes @valadas
Fix UsersCommon.js including arrow functions (dnnsoftware#424)
a3a12c7
@valadas @mitchelsellers
Makes users module show up in IE11 (dnnsoftware#425)
83329d6 
* Makes users module show up in IE11

* Reverts debugging settings for a minified final output
@anishmishra978 @daguiler
Enable Localized Content button not updating after process (dnnsoftwa…
1939ed1 
…re#423)
@mikebigun @valadas
DNN-29500 DNN Products > Manage > Sites > Blank Sites page is display…
bb42d7a 
…ed in IE Browser (dnnsoftware#432)
@mikebigun @mitchelsellers
Language screen is displayed blank with console errors in IE11 (dnnso…
f622943 
…ftware#431)

* DNN-29460 DNN Platform -> Settings -> Site Settings -> Languages -> Blank Language Page is displayed in IE Browser

* Minor formatting
@mikebigun @bdukes
DNN-29331 [Admin Experience - IE] Settings - Scheduler - Scheduler Ta…
6f136b6 
…b - UI Issue for Add Task in IE Browser
@ohine
Merge pull request dnnsoftware#439 from dnnsoftware/release/2.0.x
fd56ce7 
Update development with fixes from v9.3.0-rc
@ohine @mitchelsellers
update version to v2.0.0 (dnnsoftware#440)
f6ef13d
@ohine
Upgrade to .NET Framework 4.7.2
6041fa4
@donker
Merge pull request dnnsoftware#648 from nbrane/devops/bump-aspnet472
fca2ebe 
Upgrade to .NET Framework 4.7.2
@ohine
restructure the pages project to allow for multiple extensions
6ba8b9e
@ohine
revert changes to Solution.build
8c1391c
@ohine
relocate Recycling Bin
2aff776
@ohine
update manifest for recycling bin
5ca5958
@ohine
delete old project
bcb3277
@ohine
relocate Extensions project into new Extensions project
2f21ade
@ohine
update solution and included files
1ecd2e4
@ohine
remove old recycling bin project from solution
12ab064
@ohine
clean up old build tasks and update a couple reference paths
d58bc91
@ohine
fix a couple reference paths
0d517fb
@ohine
update yarn msbuild task and update working directory for extensions …
aded365 
…project
@ohine
update dnn manifest to match package
697f38e
@ohine
update core version dependency
22d1d34
@ohine @bdukes
replace jre based yui compressor with .net msbuild version
e61f3c6
@bdukes
Remove empty CSS file and references
0a372ae
@david-poindexter
Copy link
Contributor

Tested locally and this looks really good for me - thanks @valadas!

@mitchelsellers
Copy link
Contributor

I looked at this also, this looks great.

Administrative question - do we squash merge this, or do we retain history? (If not squashed, @valadas you are going to get a lot of internet points for this one!)

@valadas
Copy link
Contributor Author

valadas commented Oct 1, 2019 •
edited
Loading

For people reviewing this, mainly looking for developer experience.

  1. git clone -b pb-merge https://github.com/valadas/Dnn.Platform
  2. open powershell as admin and run ./Build.ps1 -Target BuildAll
    Let it build then verify the following

** Status should be clean **
git status should show nothing to commit (providing there was no build errors that stopped the buidl midway in which case, you should run git reset --hard and try again fixing what caused the error.

** You should have 4 zips in the Artifacts folder **
Try a clean install.
Try an upgrade.
Verify the Persona Bar works and gets 9.4.2 version

@valadas valadas marked this pull request as ready for review October 2, 2019 06:14
@mitchelsellers
Copy link
Contributor

Per agreement with the Approvers group, I am merging this with a single approval as part of the Build Support processes.

@mitchelsellers mitchelsellers merged commit ecd98ad into dnnsoftware:release/9.4.x Oct 2, 2019
@mitchelsellers mitchelsellers changed the title Tests a merge of the AdminExperience repository Merge of the AdminExperience repository Oct 2, 2019
@mitchelsellers mitchelsellers added this to the 9.4.2 milestone Oct 2, 2019
@valadas valadas mentioned this pull request Oct 18, 2019
Closed
3 tasks
@valadas valadas deleted the pb-merge branch December 31, 2019 06:48
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
9.4.2
Development

Successfully merging this pull request may close these issues.