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

Major update #80

Merged
merged 37 commits into from Jul 4, 2014
Merged

Major update #80

merged 37 commits into from Jul 4, 2014

Conversation

ghost
Copy link

@ghost ghost commented Jul 4, 2014

I broke GH, well just #77. So I've created a new PR. This is a collection of multiple updates:

I've merged the separate branches into one to save a repeat of the other days merge, rebase repeat. 😄

With this lot complete I would say we're in a good position for a 4.1 release to get people testing it. Everything is now working (touch wood) in the movies and TV section with the exception of the Manage Genre window.

As far as features go the To Do list is down to:

  • Finish fix genres
  • The music section

nomad2k and others added 30 commits July 4, 2014 19:06
Remove the duplicate code and wrap it in a function so it can be
customised for the page it's being used on.
Includes new graphics/flags and requires many more, this is a branch so
these new improvements can be studied and improved on and discussed.

Conflicts:
	README.md
	css/silk.css
	favicon.ico
	global.js
	images/favicon.ico
un1versal pushed a commit that referenced this pull request Jul 4, 2014
- Major clean up of the TV section
- Major clean up of the Movie section
- Restore view movies by genre
- Upgrade to ExtJS v3.4.1.1
- Use light gray theme (dark gray theme was removed form ExtJS)
- Add media flags from the Confluence theme (Issue #26)
- Start sharing common code (XWMM.util)
- Rewrite the HTML export feature (Issue #62)
@un1versal un1versal merged commit 7bd6408 into slash2009:master Jul 4, 2014
@ghost ghost deleted the feature/refactor branch July 4, 2014 21:03
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants