Merge pull request #9 from ndbills/develop
Merging develop into master
Showing
- MyMovieLibrary.wsgi 6 additions, 0 deletionsMyMovieLibrary.wsgi
- project/__init__.py 20 additions, 10 deletionsproject/__init__.py
- project/controllers/library.py 3 additions, 3 deletionsproject/controllers/library.py
- project/controllers/loan.py 97 additions, 2 deletionsproject/controllers/loan.py
- project/controllers/login.py 1 addition, 1 deletionproject/controllers/login.py
- project/controllers/movies.py 8 additions, 2 deletionsproject/controllers/movies.py
- project/controllers/test.py 0 additions, 30 deletionsproject/controllers/test.py
- project/model/Library.py 1 addition, 2 deletionsproject/model/Library.py
- project/model/Loan.py 1 addition, 1 deletionproject/model/Loan.py
- project/model/Movie.py 19 additions, 4 deletionsproject/model/Movie.py
- project/static/css/style.css 64 additions, 3 deletionsproject/static/css/style.css
- project/static/css/ui-darkness/images/animated-overlay.gif 0 additions, 0 deletionsproject/static/css/ui-darkness/images/animated-overlay.gif
- project/static/css/ui-darkness/images/ui-bg_flat_30_cccccc_40x100.png 0 additions, 0 deletions...ic/css/ui-darkness/images/ui-bg_flat_30_cccccc_40x100.png
- project/static/css/ui-darkness/images/ui-bg_flat_50_5c5c5c_40x100.png 0 additions, 0 deletions...ic/css/ui-darkness/images/ui-bg_flat_50_5c5c5c_40x100.png
- project/static/css/ui-darkness/images/ui-bg_glass_20_555555_1x400.png 0 additions, 0 deletions...ic/css/ui-darkness/images/ui-bg_glass_20_555555_1x400.png
- project/static/css/ui-darkness/images/ui-bg_glass_40_0078a3_1x400.png 0 additions, 0 deletions...ic/css/ui-darkness/images/ui-bg_glass_40_0078a3_1x400.png
- project/static/css/ui-darkness/images/ui-bg_glass_40_ffc73d_1x400.png 0 additions, 0 deletions...ic/css/ui-darkness/images/ui-bg_glass_40_ffc73d_1x400.png
- project/static/css/ui-darkness/images/ui-bg_gloss-wave_25_333333_500x100.png 0 additions, 0 deletions...ui-darkness/images/ui-bg_gloss-wave_25_333333_500x100.png
- project/static/css/ui-darkness/images/ui-bg_highlight-soft_80_eeeeee_1x100.png 0 additions, 0 deletions...-darkness/images/ui-bg_highlight-soft_80_eeeeee_1x100.png
- project/static/css/ui-darkness/images/ui-bg_inset-soft_25_000000_1x100.png 0 additions, 0 deletions...s/ui-darkness/images/ui-bg_inset-soft_25_000000_1x100.png
Loading
Please register or sign in to comment