Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
...
Commits on May 25, 2012
@lazarm lazarm Added Google settings. 73c5128
@lazarm lazarm Added Google url patterns. a11abcf
@lazarm lazarm Added Google account parameters to User model da9d10c
@lazarm lazarm Added Google backend. cc69ee0
@lazarm lazarm Added Google views. 9f6904d
@lazarm lazarm Added Google template tag. 6af5d86
@lazarm lazarm Google login button displayed. bddca59
@lazarm lazarm Google username and profile picture are displayed b193c32
@lazarm lazarm Google login button added. b2063cd
@lazarm lazarm Google logo for login button 94e697f
Commits on May 26, 2012
@mihanovak Added urls for foursquare authentication. 6667699
@mihanovak Added settings for foursquare authentication. 5c542bf
@mihanovak Added backend for foursquare authentication. c6e7bd9
@mihanovak Corrected models. 6c0cd34
@mihanovak Added views for foursquare login and callback. 68272fc
@mihanovak Get profile picture from foursquare. fff6337
@mihanovak Added templates for foursquare authentication, login button is withou…
…t style.
2ae5f91
Commits on May 27, 2012
@mihanovak Code fixes. 354265d
@lazarm lazarm Fixed. a13236d
@lazarm lazarm Scope as constant inserted. 84b42d4
@lazarm lazarm Some more google parameters. 5b95db9
@lazarm lazarm Fixed. f8b8200
@lazarm lazarm Space removed. 244aa88
@lazarm lazarm Fixed. e6ff8f0
@lazarm lazarm Fb and google scope moved to account views. a7dd147
Commits on May 28, 2012
@lazarm lazarm Some more fixes. f1f5650
@lazarm lazarm Renamed google parameter. ee39934
@lazarm lazarm Fixed imports. f3b5989
@mihanovak Fixed code and bug. 569e155
@mihanovak Corrected field type. c7367c5
@mihanovak Merge branch 'master' into foursquare_auth
Conflicts:
	piplmesh/frontend/templates/header.html
	piplmesh/urls.py
c1766a7
@mihanovak Changed comment. bc6531c
Commits on May 30, 2012
@mihanovak Merge remote-tracking branch 'upstream/master' into foursquare_auth
Conflicts:
	piplmesh/frontend/templates/header.html
45a4c74
@mihanovak Corrected user image code and added assert. a443cf7
@mihanovak Added foursquare_user variable. 28d7264
@mihanovak Added description for foursquare_user fields. 4737379
@lazarm lazarm Merge remote-tracking branch 'upstream/master' into issue#987.
Some other fixes.

Conflicts:
	piplmesh/frontend/static/piplmesh/css/style.css
	piplmesh/frontend/templates/header.html
	piplmesh/urls.py
43f345b
boco Edit button style a0f651e
@jurebajt jurebajt Changed facebook and gravatar template tags with account tag in user.…
…html.
18589d3
@mihanovak Merge remote-tracking branch 'upstream/master' into foursquare_auth b5e5fae
@jurebajt jurebajt Changed facebook and gravatar template tags with account tag in user.…
…html.
47fe5ab
@mitar mitar Merge pull request #207 from Domen91/issue124
Edit button style
f3fafdf
@jurebajt jurebajt Removed load staticfiles tag. df46c0b
@mitar mitar Merge pull request #208 from Domen91/user_profile_image
User profile image
ad4a4af
@mitar mitar Added missing user document methods. 550cf2d
@cardawid cardawid translations updated 041c647
@cardawid cardawid minor fixes f3798ad
Commits on May 31, 2012
@cardawid cardawid Few translations added 655ad2e
@cardawid cardawid translations added e462bf9
@cardawid cardawid more translations added 0d7c9b0
@cardawid cardawid fixing translations b8c083e
@mitar mitar Merge pull request #216 from Domen91/issue#137
translations updated issue #137
2081fc9
@mitar mitar Display gender translated. 009b273
@mitar mitar Updated user document definition. eba9edf
Commits on Jun 01, 2012
@mitar mitar Added TODO. 2f5703e
@mitar mitar CSS bugfix. 838bf8a
@mitar mitar Added support for lazy users. Issue #69 aed1f7e
@mitar mitar Updated nodes API with list of all nodes. 7409d42
@mihanovak Merge remote-tracking branch 'upstream/master' into foursquare_auth
Conflicts:
	piplmesh/account/backends.py
	piplmesh/account/models.py
	piplmesh/settings.py
debe660
@mihanovak Corrected code in backends.py. bdde9dd
@mihanovak Fixed code in views.py. 06c9f75
@mitar mitar Change to nodes API, to return list of nodes. 0665dc2
@lazarm lazarm Merge remote-tracking branch 'upstream/master' into issue#987
Conflicts:
	piplmesh/account/backends.py
	piplmesh/settings.py
99f9ffe
@mihanovak Changed some code in backends.py and add condition in models.py. fded717
@mihanovak Moved fields descriptions to docstring and changed some default values. 84e57e7
@mihanovak Changed return value to constant string. 74c11ed
Commits on Jun 02, 2012
@mitar mitar Reordering settings a bit. 999c16f
Commits on Jun 03, 2012
@lazarm lazarm Merge remote-tracking branch 'upstream/master' into issue#987 5854299
@lazarm lazarm Fixes here and there. 4ea08d7
@lazarm lazarm Fix in google backend. 2a07bec
@mitar mitar Merge pull request #191 from matevzmihalic/issue#987
Authentication with Google accounts, #180
da8e0bb
@mitar mitar Cleaned up Facebook authentication. 1716aed
@mitar mitar Unifying a bit Twitter authentication. 314c39a
@mitar mitar Set profile values from Facebook values in a better way. 1771a2c
@mitar mitar More cleaning of Twitter authentication. 0527d83
@mitar mitar For now disregard `is_active` flag. 63648d8
@mitar mitar Cleaning. 54f383e
Commits on Jun 04, 2012
@mitar mitar Cleaned Google authentication. 6f2cf6f
@mitar mitar Cleaning TODOs. d586e62
@mihanovak Merge remote-tracking branch 'upstream/master' into foursquare_auth
Conflicts:
	piplmesh/account/models.py
	piplmesh/account/templates/user/login.html
	piplmesh/account/views.py
	piplmesh/settings.py
	piplmesh/urls.py
2cfec77
@mihanovak Updated Foursquare callback view. 3e27463
@mihanovak Changed foursquare authentication backend. a0c31ba
@mihanovak Changed models.py. d9d9fb0
@mihanovak More changes in foursquare backend. d02fdc8
@mihanovak Fixed bugs in get_image_url. 9e6a929
@mihanovak Some changes. 531cd1f
@mihanovak Merge remote-tracking branch 'upstream/master' into foursquare_auth 7e228f1
@mihanovak More specific description of user fields. 1e7a9ac
Commits on Jun 05, 2012
@mitar mitar Merge pull request #195 from mmiha/foursquare_auth
Foursquare authentication, #152
755e3ba
@mitar mitar Foursquare docstring. 0d17429
@mitar mitar Third-party profile data objects stored in database are dicts. 1fd1a1f
@mihanovak Merge remote-tracking branch 'upstream/master' into login_error_messages
Conflicts:
	piplmesh/account/views.py
40e7d75
Something went wrong with that request. Please try again.