Commit graph

1146 commits

Author SHA1 Message Date
Tomislav R
b8824b3f46 fixed CustomUser 2016-03-07 18:39:24 +01:00
Tomislav R
5c6e0cf7c6 fixed CustomUser 2016-03-07 18:39:24 +01:00
Tomislav R
3157db235a test 2016-03-07 17:49:02 +01:00
Tomislav R
e7f11e9556 test 2016-03-07 17:49:02 +01:00
Your Name
268c3ebdbb Merge branch 'master' of https://github.com/ungleich/dynamicweb 2016-03-05 20:15:44 +00:00
Your Name
3d34acc884 Merge branch 'master' of https://github.com/ungleich/dynamicweb 2016-03-05 20:15:44 +00:00
Your Name
8f4dd038bd Merge remote-tracking branch 'refs/remotes/origin/master'
mmit.
2016-03-05 19:57:41 +00:00
Your Name
de875f80de Merge remote-tracking branch 'refs/remotes/origin/master'
mmit.
2016-03-05 19:57:41 +00:00
Your Name
958ed9572b added python path
Signed-off-by: Your Name <you@example.com>
2016-03-05 19:49:22 +00:00
Your Name
b3c40bd20d added python path
Signed-off-by: Your Name <you@example.com>
2016-03-05 19:49:22 +00:00
Your Name
ec789b625e changes on prod - master 2016-03-05 19:46:46 +00:00
Your Name
e99f23551b changes on prod - master 2016-03-05 19:46:46 +00:00
Sanghee Kim
530ca19556 Import cal + css from Jiyoun 2016-03-04 21:15:48 +01:00
Sanghee Kim
ba554deca1 Import cal + css from Jiyoun 2016-03-04 21:15:48 +01:00
3ec565c178 Merge pull request #6 from tmslav/update_django_version
Update django version
2016-03-04 13:06:43 -06:00
062afb392f Merge pull request #6 from tmslav/update_django_version
Update django version
2016-03-04 13:06:43 -06:00
Tomislav R
9f944ca1ed init membership 2016-03-03 22:55:23 +01:00
Tomislav R
6bb092a101 init membership 2016-03-03 22:55:23 +01:00
Tomislav R
9eed348b62 Merge branch 'master' into update_django_version 2016-03-03 22:32:36 +01:00
Tomislav R
88a5825c8c Merge branch 'master' into update_django_version 2016-03-03 22:32:36 +01:00
Tomislav R
bfaa88e774 test 2016-03-03 22:22:37 +01:00
Tomislav R
850a0e7f85 test 2016-03-03 22:22:37 +01:00
Sanghee Kim
c7a9eb1e59 error button added 2016-03-02 20:06:31 +01:00
Sanghee Kim
13be0d6d74 error button added 2016-03-02 20:06:31 +01:00
Sanghee Kim
5606421739 text change 2016-03-02 19:42:39 +01:00
Sanghee Kim
b571ff834b text change 2016-03-02 19:42:39 +01:00
Sanghee Kim
1fef3c0b90 button color 2016-03-02 18:00:55 +01:00
Sanghee Kim
b1d7beac15 button color 2016-03-02 18:00:55 +01:00
Sanghee Kim
c929823c2b button color 2016-03-02 00:18:52 +01:00
Sanghee Kim
3f1ae15e64 button color 2016-03-02 00:18:52 +01:00
Sanghee Kim
b2e62b1fd7 button color 2016-03-02 00:16:00 +01:00
Sanghee Kim
fcd0754506 button color 2016-03-02 00:16:00 +01:00
Sanghee Kim
fa5c914c40 button color 2016-03-02 00:09:14 +01:00
Sanghee Kim
618121641e button color 2016-03-02 00:09:14 +01:00
상희 김
6cd443c568 color changes 2016-03-01 21:52:04 +01:00
상희 김
3c4f646d5e color changes 2016-03-01 21:52:04 +01:00
Tomislav R
5fbde4878d update 2016-03-01 21:24:51 +01:00
Tomislav R
7936e5dfe5 update 2016-03-01 21:24:51 +01:00
Tomislav R
abbc2982e3 django version update #3 2016-02-29 23:28:31 +01:00
Tomislav R
0558d6e396 django version update #3 2016-02-29 23:28:31 +01:00
66d042dbe7 one column supporters 2016-02-14 11:52:05 -06:00
ed8a8c96e1 one column supporters 2016-02-14 11:52:05 -06:00
24df1a4dfc Merge branch 'release/supporters-widget' 2016-02-14 10:11:06 -06:00
5297c5cfd7 Merge branch 'release/supporters-widget' 2016-02-14 10:11:06 -06:00
8392ed521f Merge branch 'feature/supporters' into develop 2016-02-14 09:47:15 -06:00
aee3251098 Merge branch 'feature/supporters' into develop 2016-02-14 09:47:15 -06:00
f25a4f3d57 added supporters plugin
Signed-off-by: rscnt <rascnt@gmail.com>
2016-02-14 09:47:07 -06:00
d6ddbc31ce added supporters plugin
Signed-off-by: rscnt <rascnt@gmail.com>
2016-02-14 09:47:07 -06:00
d1c1882831 added supporters plugin
Signed-off-by: rscnt <rascnt@gmail.com>
2016-02-13 14:28:46 -06:00
30b1e5f9c3 added supporters plugin
Signed-off-by: rscnt <rascnt@gmail.com>
2016-02-13 14:28:46 -06:00