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

Bump AdminLTE to 3.0 #2424

Open
wants to merge 173 commits into
base: master
Choose a base branch
from
Open

Bump AdminLTE to 3.0 #2424

wants to merge 173 commits into from

Conversation

kasancode
Copy link
Member

@kasancode kasancode commented Jan 25, 2020 •
edited

This PR bump AdminLTE to 3.0.

Before submitting a pull-request to GitBucket I have first:

  • read the contribution guidelines
  • rebased my branch over master
  • verified that project is compiling
  • verified that tests are passing
  • squashed my commits as appropriate (keep several commits if it is relevant to understand the PR)
  • marked as closed using commit message all issue ID that this PR should correct
Implementation status

  • error.scala.html
  • goget.scala.html
  • index.scala.html
  • main.scala.html
  • maincard.scala.html *
  • menu.scala.html
  • signin.scala.html
  • signinform.scala.html
  • account/activity.scala.html
  • account/application.scala.html
  • account/creategroup.scala.html
  • account/edit.scala.html
  • account/editgroup.scala.html
  • account/edithook.scala.html
  • account/gpg.scala.html
  • account/groupform.scala.html
  • account/hooks.scala.html
  • account/main.scala.html
  • account/members.scala.html
  • account/menu.scala.html
  • account/newrepo.scala.html
  • account/preferences
  • account/register.scala.html
  • account/repositories.scala.html
  • account/ssh.scala.html
  • admin/data.scala.html
  • admin/dbviewer.scala.html
  • admin/menu.scala.html
  • admin/plugins.scala.html
  • admin/settings.scala.html
  • admin/settings_authentication.scala.html
  • admin/settings_integrations.scala.html
  • admin/settings_system.scala.html
  • admin/user.scala.html
  • admin/usergroup.scala.html
  • admin/userlist.scala.html
  • dashboard/header.scala.html
  • dashboard/issues.scala.html
  • dashboard/issueslist.scala.html
  • dashboard/issuesnavi.scala.html
  • dashboard/pulls.scala.html
  • dashboard/repos.scala.html
  • dashboard/sidebar.scala.html
  • dashboard/tab.scala.html
  • helper/account.scala.html
  • helper/activities.scala.html
  • helper/attached.scala.html
  • helper/branchcontrol.scala.html
  • helper/checkicon.scala.html
  • helper/commitcomment.scala.html
  • helper/commitcomments.scala.html
  • helper/commitstatus.scala.html
  • helper/copy.scala.html
  • helper/datepicker.scala.html
  • helper/datetimeago.scala.html
  • helper/diff.scala.html
  • helper/dropdown.scala.html
  • helper/error.scala.html
  • helper/forkrepository.scala.html
  • helper/information.scala.html
  • helper/logo.scala.html *
  • helper/paginator.scala.html
  • helper/preview.scala.html
  • helper/repositoryicon.scala.html
  • helper/uploadavatar.scala.html
  • issues/commentform.scala.html
  • issues/commentlist.scala.html
  • issues/create.scala.html
  • issues/editcomment.scala.html
  • issues/editissue.scala.html
  • issues/issue.scala.html
  • issues/issueinfo.scala.html
  • issues/labellist.scala.html
  • issues/list.scala.html
  • issues/listparts.scala.html
  • labels/edit.scala.html
  • labels/label.scala.html
  • labels/list.scala.html
  • milestones/edit.scala.html
  • milestones/list.scala.html
  • milestones/listparts.scala.html
  • milestones/milestone.scala.html
  • milestones/progress.scala.html
  • priorities/edit.scala.html
  • priorities/list.scala.html
  • priorities/priority.scala.html
  • pulls/commits.scala.html
  • pulls/compare.scala.html
  • pulls/conversation.scala.html
  • pulls/files.scala.html
  • pulls/menu.scala.html
  • pulls/mergecheck.scala.html
  • pulls/mergeguide.scala.html
  • pulls/proposals.scala.html
  • releases/form.scala.html
  • releases/list.scala.html
  • releases/release.scala.html
  • repo/blob.scala.html
  • repo/branches.scala.html
  • repo/commentform.scala.html
  • repo/commit.scala.html
  • repo/commits.scala.html
  • repo/creating.scala.html
  • repo/delete.scala.html
  • repo/editcomment.scala.html
  • repo/editor.scala.html
  • repo/files.scala.html
  • repo/find.scala.html
  • repo/forked.scala.html
  • repo/guide.scala.html
  • repo/tag.scala.html
  • repo/upload.scala.html
  • search/code.scala.html
  • search/issues.scala.html
  • search/menu.scala.html
  • search/repositories.scala.html
  • search/wiki.scala.html
  • settings/branches.scala.html
  • settings/branchprotection.scala.html
  • settings/collaborators.scala.html
  • settings/danger.scala.html
  • settings/deploykey.scala.html
  • settings/edithook.scala.html
  • settings/edithookform.scala.html
  • settings/hooks.scala.html
  • settings/menu.scala.html
  • settings/options.scala.html
  • wiki/compare.scala.html
  • wiki/edit.scala.html
  • wiki/history.scala.html
  • wiki/page.scala.html
  • wiki/pages.scala.html

@kasancode
Copy link
Member Author

If official handle this project, I can change merge target from master to another branch.
Anyway, I keep implementing this PR slowly.

@kasancode
fix logo
3cfac2f
@kasancode
dashboard/repos
0009281
@kasancode
fix JS
258ede4
@kasancode
issues/label, issues/priorities, release/list, repo/branch, repo/file…
0414db8 
…s, repo/guide
@kasancode
Ignore Limited settings, when searching repositories.
b752076
@kasancode
Merge branch 'master' into AdminLTE3
bcc60ac
@kasancode
Merge remote-tracking branch 'upstream/master' into unlimit_search
b1269aa
@kasancode
Set withoutPhysicalInfo = true
6912c51
@kasancode
Merge remote-tracking branch 'upstream/master' into AdminLTE3
f605cce
@kasancode
issues/labels
0f3ac73
@kasancode
gitbucket.css
74235d3
@kasancode
isues/priorities
3f3b81b
@kasancode
issues/milestones
611f1ba
@kasancode
Merge remote-tracking branch 'upstream/master' into AdminLTE3
5a3889b
@kasancode
wiki/page, wiki/edit, helper/preview
757f9fc
@kasancode
Adjust layout
844e880
@kasancode
issues/issue
e4fb96a
@kasancode
adjust wiki/page
d826eef
@kasancode
blob
f3f5d23
@kasancode
files
da6ffff
@kasancode
css
eb07aa1
@kasancode
Merge branch 'unlimit_search' into AdminLTE3
83998b0
@kasancode
Merge branch 'master' of https://github.com/gitbucket/gitbucket.git i…
230a0c2 
…nto AdminLTE3

# Resolved Conflicts:
#	src/main/twirl/gitbucket/core/main.scala.html
#	src/main/twirl/gitbucket/core/menu.scala.html
#	src/main/twirl/gitbucket/core/releases/list.scala.html
#	src/main/twirl/gitbucket/core/signin.scala.html
@kasancode
issues/listparts
cbd25e1
@kasancode
repo/editor
1250d05
@kasancode
fix container
3543b2b
@onukura
Copy link
Member

onukura commented Jan 12, 2021

It is getting close to the finish. It would be nice if there is demo site for this AdminLTE 3.0 ver GitBucket, thus we can give feedback easily. @kasancode @takezoe Do you guys have some ideas or what do you think about it?

@kasancode kasancode changed the title [WIP] Trial to update AdminLTE 3.0 Bump AdminLTE to 3.0 Jan 19, 2021
@kasancode kasancode marked this pull request as ready for review January 19, 2021 13:34
@kasancode
Copy link
Member Author

If these commits should be squashed, I will create another squashed PR.

@kasancode
Merge branch 'master' of https://github.com/gitbucket/gitbucket.git i…
bdfb840 
…nto AdminLTE3

# Resolve conflicts:
#	src/main/scala/gitbucket/core/view/helpers.scala
#	src/main/twirl/gitbucket/core/helper/diff.scala.html
#	src/main/twirl/gitbucket/core/issues/commentform.scala.html
#	src/main/twirl/gitbucket/core/issues/issueinfo.scala.html
#	src/main/twirl/gitbucket/core/pulls/conversation.scala.html
#	src/main/webapp/assets/common/css/gitbucket.css
@kasancode
Merge branch 'master' of https://github.com/gitbucket/gitbucket.git i…
6fcb762 
…nto AdminLTE3
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@tlcd96 tlcd96 tlcd96 left review comments

Assignees
No one assigned
Labels
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@kasancode @tlcd96 @onukura