ericmarcos
commented
9 years ago Gràcies Pau!!
He fet una primera repassada i pinta bé ;) Ja et comentaré si trobo algun problema fent el merge.
Espero que tinguis una molt bona entrada d'any! Parlem aviat ;)
2014-12-31 7:48 GMT+01:00 Pau Gay notifications@github.com:
Hey @ericmarcos https://github.com/ericmarcos, disculpeu que hagi trigat tant ...
Se m'han juntat moltes coses, però no em vull excusar massa, m'ha costat trobar la energia per a posar-m'hi.
Per fi crec que ho he enlesstit, però no te'n refiïs massa si-us-plau. Dona una ullada a veure com ho veus.
Qualsevol cosa ho comentem ;) !
You can merge this Pull Request by running
git pull https://github.com/ericmarcos/dareyoo-web feature/paginating-users-bets
Or view, comment on, or merge it at:
https://github.com/ericmarcos/dareyoo-web/pull/3 Commit Summary
- Adding pagination to the user profile bets.
- Merge branch 'develop' into feature/paginating-users-bets
File Changes
- M .gitignore https://github.com/ericmarcos/dareyoo-web/pull/3/files#diff-0 (3)
- M beta/templates/beta-app.html https://github.com/ericmarcos/dareyoo-web/pull/3/files#diff-1 (2)
- M beta/urls.py https://github.com/ericmarcos/dareyoo-web/pull/3/files#diff-2 (2)
- M bets/api.py https://github.com/ericmarcos/dareyoo-web/pull/3/files#diff-3 (28)
- M bets/serializers.py https://github.com/ericmarcos/dareyoo-web/pull/3/files#diff-4 (8)
- M bets/views.py https://github.com/ericmarcos/dareyoo-web/pull/3/files#diff-5 (23)
- M dareyoo/settings.py https://github.com/ericmarcos/dareyoo-web/pull/3/files#diff-6 (8)
- M dareyoo/urls.py https://github.com/ericmarcos/dareyoo-web/pull/3/files#diff-7 (16)
- M package.json https://github.com/ericmarcos/dareyoo-web/pull/3/files#diff-8 (17)
- M static/beta/build/js/controllers.js https://github.com/ericmarcos/dareyoo-web/pull/3/files#diff-9 (21)
- M static/beta/build/js/dareyoo_app.all.min.js https://github.com/ericmarcos/dareyoo-web/pull/3/files#diff-10 (21)
- M static/beta/build/partials/profile.html https://github.com/ericmarcos/dareyoo-web/pull/3/files#diff-11 (28)
- M static/beta/build/partials/profile_bets.html https://github.com/ericmarcos/dareyoo-web/pull/3/files#diff-12 (3)
- M static/beta/js/controllers.js https://github.com/ericmarcos/dareyoo-web/pull/3/files#diff-13 (21)
- M static/beta/partials/profile.html https://github.com/ericmarcos/dareyoo-web/pull/3/files#diff-14 (28)
- M static/beta/partials/profile_bets.html https://github.com/ericmarcos/dareyoo-web/pull/3/files#diff-15 (3)
Patch Links:
- https://github.com/ericmarcos/dareyoo-web/pull/3.patch
- https://github.com/ericmarcos/dareyoo-web/pull/3.diff
— Reply to this email directly or view it on GitHub https://github.com/ericmarcos/dareyoo-web/pull/3.
Hey @ericmarcos, disculpeu que hagi trigat tant ...
Se m'han juntat moltes coses, però no em vull excusar massa, m'ha costat trobar la energia per a posar-m'hi.
Per fi crec que ho he enllesstit, però no te'n refiïs massa si-us-plau. Dona una ullada a veure com ho veus.
Qualsevol cosa ho comentem ;) !