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

Merge a mobile web interface with your mainstream pytivo fork? #2

Open
wants to merge 27 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
47fef9f
combined mobileweb of lucas_nz fork and wmcbrine fork
wynneth Jan 21, 2012
b735ed5
missing &Format=text/html in folder pages
wynneth Jan 21, 2012
2277dbf
missing &Format=text/html in various pages
wynneth Jan 21, 2012
e9326c0
bug chasing mobileweb still wont display NPL page
wynneth Jan 21, 2012
6729920
functioning mobileUI, needs video plugin ui tweaked for visual and co…
wynneth Jan 21, 2012
87afb35
aesthetic fix to video page
wynneth Jan 21, 2012
4b15424
merged mobileui into master
wynneth Jan 22, 2012
72e0cb7
Merge remote branch 'upstream/master'
wynneth Jan 28, 2012
f118a57
Merge branch 'master' of git://github.com/wmcbrine/pytivo
wynneth Jan 28, 2012
23cd976
Merge branch 'master' of git://github.com/wmcbrine/pytivo
wynneth Jan 30, 2012
4204f0a
Merge branch 'master' of git://github.com/wmcbrine/pytivo
wynneth Feb 2, 2012
f2c667f
Merge branch 'master' of git://github.com/wmcbrine/pytivo
wynneth Feb 5, 2012
a59ade8
Added &Format=text/html to title/capture date links
wynneth Feb 6, 2012
212662d
Merge remote-tracking branch 'remotes/wmcbrine/master'
wynneth Feb 18, 2012
4561da7
Added an r to the end of $video.displayMajorNumbe
wynneth Feb 18, 2012
8a81e61
Added dvdvideo plugin code to httpserver.py
wynneth Feb 18, 2012
61ca448
Merged recent iluvatar branch
wynneth Mar 20, 2012
fd6b5b4
Merged iluvatar branch
wynneth Mar 20, 2012
89c0cb8
Linkify video count and arrow on mobile
wynneth Mar 20, 2012
d900c46
Merged recent wmcbrine changes
wynneth Mar 21, 2012
fd7eb26
Update git tracking of item.tmpl
wynneth Mar 21, 2012
7d9ef7d
Pulled wmcbrine versioning commit
wynneth Apr 8, 2012
931ad06
Removed unnecessary Format string in container xml file
wynneth Jul 5, 2012
e909566
Updated to latest wmcbrine and lucasnz commits. Bugfixed an issue I c…
wynneth Jul 6, 2012
898f2ae
selective merge with wmcbrine, removed dvdvideo plugin (lack of use)
wynneth Feb 24, 2013
e3d2751
updated to latest wmcbrine changes
wynneth Jul 7, 2013
c62a3b8
updated to latest wmcbrine commits
wynneth Sep 7, 2013
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
589 changes: 0 additions & 589 deletions Cheetah/CheetahWrapper.py

This file was deleted.

374 changes: 0 additions & 374 deletions Cheetah/FileUtils.py

This file was deleted.

Loading