Skip to content

Commit

Permalink
Pagionation update
Browse files Browse the repository at this point in the history
  • Loading branch information
Daniel Marchena committed Mar 16, 2015
1 parent cb20510 commit 2c387ec
Show file tree
Hide file tree
Showing 96 changed files with 271 additions and 156 deletions.
Empty file modified .idea/.name
100644 → 100755
Empty file.
2 changes: 1 addition & 1 deletion .idea/MosesWebservice.iml
100644 → 100755

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Empty file modified .idea/dataSources.ids
100644 → 100755
Empty file.
Empty file modified .idea/dataSources.local.xml
100644 → 100755
Empty file.
9 changes: 1 addition & 8 deletions .idea/dataSources.xml
100644 → 100755

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Empty file modified .idea/encodings.xml
100644 → 100755
Empty file.
2 changes: 1 addition & 1 deletion .idea/misc.xml
100644 → 100755

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Empty file modified .idea/modules.xml
100644 → 100755
Empty file.
Empty file modified .idea/scopes/scope_settings.xml
100644 → 100755
Empty file.
Empty file modified .idea/vcs.xml
100644 → 100755
Empty file.
408 changes: 265 additions & 143 deletions .idea/workspace.xml
100644 → 100755

Large diffs are not rendered by default.

Empty file modified LICENSE
100644 → 100755
Empty file.
Empty file modified MosesWebservice/__init__.py
100644 → 100755
Empty file.
Empty file modified MosesWebservice/__pycache__/__init__.cpython-34.pyc
100644 → 100755
Empty file.
Binary file modified MosesWebservice/__pycache__/settings.cpython-34.pyc
Binary file not shown.
Empty file modified MosesWebservice/__pycache__/urls.cpython-34.pyc
100644 → 100755
Empty file.
Empty file modified MosesWebservice/__pycache__/wsgi.cpython-34.pyc
100644 → 100755
Empty file.
6 changes: 3 additions & 3 deletions MosesWebservice/settings.py
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,6 @@
# Examples: "http://example.com/media/", "http://media.example.com/"
MEDIA_URL = NGINX_SERVER_URL + os.sep + 'media' + os.sep

REST_FRAMEWORK = {
'PAGINATE_BY': 20
}
# REST_FRAMEWORK = {
# 'PAGINATE_BY': 20
# }
Empty file modified MosesWebservice/urls.py
100644 → 100755
Empty file.
Empty file modified MosesWebservice/wsgi.py
100644 → 100755
Empty file.
Empty file modified MosesWebserviceApp/__init__.py
100644 → 100755
Empty file.
Empty file modified MosesWebserviceApp/__pycache__/__init__.cpython-34.pyc
100644 → 100755
Empty file.
Empty file modified MosesWebserviceApp/__pycache__/admin.cpython-34.pyc
100644 → 100755
Empty file.
Empty file modified MosesWebserviceApp/__pycache__/fields.cpython-34.pyc
100644 → 100755
Empty file.
Binary file modified MosesWebserviceApp/__pycache__/models.cpython-34.pyc
Binary file not shown.
Binary file modified MosesWebserviceApp/__pycache__/serializers.cpython-34.pyc
Binary file not shown.
Binary file modified MosesWebserviceApp/__pycache__/views.cpython-34.pyc
Binary file not shown.
Empty file modified MosesWebserviceApp/admin.py
100644 → 100755
Empty file.
Empty file modified MosesWebserviceApp/fields.py
100644 → 100755
Empty file.
Empty file modified MosesWebserviceApp/migrations/__init__.py
100644 → 100755
Empty file.
Empty file.
Empty file modified MosesWebserviceApp/models.py
100644 → 100755
Empty file.
Empty file modified MosesWebserviceApp/serializers.py
100644 → 100755
Empty file.
Empty file modified MosesWebserviceApp/tests.py
100644 → 100755
Empty file.
Empty file modified MosesWebserviceApp/views.py
100644 → 100755
Empty file.
Empty file modified README.md
100644 → 100755
Empty file.
Empty file modified __pycache__/manage.cpython-34.pyc
100644 → 100755
Empty file.
Empty file modified media/images/949e8647-c6d7-4049-9896-87b9bacc98f6.png
100644 → 100755
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified setup_docs/Moses-Webservice.conf
100644 → 100755
Empty file.
Empty file modified setup_docs/mosesapp
100644 → 100755
Empty file.
Empty file modified setup_docs/nginx.conf
100644 → 100755
Empty file.
Empty file modified setup_docs/setup_server.txt
100644 → 100755
Empty file.
Empty file modified setup_docs/uwsgi_params
100644 → 100755
Empty file.
Empty file modified static/rest_framework/css/bootstrap-tweaks.css
100644 → 100755
Empty file.
Empty file modified static/rest_framework/css/bootstrap.min.css
100644 → 100755
Empty file.
Empty file modified static/rest_framework/css/default.css
100644 → 100755
Empty file.
Empty file modified static/rest_framework/css/prettify.css
100644 → 100755
Empty file.
Empty file modified static/rest_framework/fonts/glyphicons-halflings-regular.eot
100644 → 100755
Empty file.
Empty file modified static/rest_framework/fonts/glyphicons-halflings-regular.svg
100644 → 100755
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified static/rest_framework/fonts/glyphicons-halflings-regular.ttf
100644 → 100755
Empty file.
Empty file modified static/rest_framework/fonts/glyphicons-halflings-regular.woff
100644 → 100755
Empty file.
Empty file modified static/rest_framework/img/glyphicons-halflings-white.png
100644 → 100755
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified static/rest_framework/img/glyphicons-halflings.png
100644 → 100755
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified static/rest_framework/img/grid.png
100644 → 100755
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified static/rest_framework/img/logo_moses.png
100644 → 100755
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified static/rest_framework/js/bootstrap.min.js
100644 → 100755
Empty file.
Empty file modified static/rest_framework/js/default.js
100644 → 100755
Empty file.
Empty file modified static/rest_framework/js/jquery-1.8.1-min.js
100644 → 100755
Empty file.
Empty file modified static/rest_framework/js/prettify-min.js
100644 → 100755
Empty file.
Empty file modified templates/rest_framework/api.html
100644 → 100755
Empty file.
Empty file modified templates/rest_framework/api_form.html
100644 → 100755
Empty file.
Empty file modified templates/rest_framework/base.html
100644 → 100755
Empty file.
Empty file modified templates/rest_framework/horizontal/checkbox.html
100644 → 100755
Empty file.
Empty file modified templates/rest_framework/horizontal/checkbox_multiple.html
100644 → 100755
Empty file.
Empty file modified templates/rest_framework/horizontal/fieldset.html
100644 → 100755
Empty file.
Empty file modified templates/rest_framework/horizontal/form.html
100644 → 100755
Empty file.
Empty file modified templates/rest_framework/horizontal/input.html
100644 → 100755
Empty file.
Empty file modified templates/rest_framework/horizontal/list_fieldset.html
100644 → 100755
Empty file.
Empty file modified templates/rest_framework/horizontal/radio.html
100644 → 100755
Empty file.
Empty file modified templates/rest_framework/horizontal/select.html
100644 → 100755
Empty file.
Empty file modified templates/rest_framework/horizontal/select_multiple.html
100644 → 100755
Empty file.
Empty file modified templates/rest_framework/horizontal/textarea.html
100644 → 100755
Empty file.
Empty file modified templates/rest_framework/inline/checkbox.html
100644 → 100755
Empty file.
Empty file modified templates/rest_framework/inline/checkbox_multiple.html
100644 → 100755
Empty file.
Empty file modified templates/rest_framework/inline/fieldset.html
100644 → 100755
Empty file.
Empty file modified templates/rest_framework/inline/form.html
100644 → 100755
Empty file.
Empty file modified templates/rest_framework/inline/input.html
100644 → 100755
Empty file.
Empty file modified templates/rest_framework/inline/list_fieldset.html
100644 → 100755
Empty file.
Empty file modified templates/rest_framework/inline/radio.html
100644 → 100755
Empty file.
Empty file modified templates/rest_framework/inline/select.html
100644 → 100755
Empty file.
Empty file modified templates/rest_framework/inline/select_multiple.html
100644 → 100755
Empty file.
Empty file modified templates/rest_framework/inline/textarea.html
100644 → 100755
Empty file.
Empty file modified templates/rest_framework/login.html
100644 → 100755
Empty file.
Empty file modified templates/rest_framework/login_base.html
100644 → 100755
Empty file.
Empty file modified templates/rest_framework/raw_data_form.html
100644 → 100755
Empty file.
Empty file modified templates/rest_framework/vertical/checkbox.html
100644 → 100755
Empty file.
Empty file modified templates/rest_framework/vertical/checkbox_multiple.html
100644 → 100755
Empty file.
Empty file modified templates/rest_framework/vertical/fieldset.html
100644 → 100755
Empty file.
Empty file modified templates/rest_framework/vertical/form.html
100644 → 100755
Empty file.
Empty file modified templates/rest_framework/vertical/input.html
100644 → 100755
Empty file.
Empty file modified templates/rest_framework/vertical/list_fieldset.html
100644 → 100755
Empty file.
Empty file modified templates/rest_framework/vertical/radio.html
100644 → 100755
Empty file.
Empty file modified templates/rest_framework/vertical/select.html
100644 → 100755
Empty file.
Empty file modified templates/rest_framework/vertical/select_multiple.html
100644 → 100755
Empty file.
Empty file modified templates/rest_framework/vertical/textarea.html
100644 → 100755
Empty file.
Empty file modified uwsgi_params
100644 → 100755
Empty file.

0 comments on commit 2c387ec

Please sign in to comment.