Commit Graph

254 Commits

Author SHA1 Message Date
Trever Fischer
d9d0b3170b badmerge-- 2012-03-05 01:08:12 -05:00
Trever Fischer
75cab27046 Move the login form context out of the profiles app 2012-03-05 00:44:45 -05:00
Trever Fischer
d6704d981b migration crash-- 2012-03-05 00:31:27 -05:00
Trever Fischer
4d5637eebd Use caminus theme for admin pages 2012-03-05 00:16:27 -05:00
Trever Fischer
868e38896e Use django's auth code for login/logout instead of rolling our own 2012-03-04 23:42:02 -05:00
Trever Fischer
93ba20c538 Fix api import 2012-03-04 23:35:46 -05:00
Trever Fischer
8fc7372bbe Move quote model into local app 2012-03-04 23:34:01 -05:00
Trever Fischer
82222860c9 Merge branch 'master' of dev.camin.us:www
Conflicts:
	profiles/models.py
	profiles/views.py
	templates/base_full.html
2012-03-04 23:22:47 -05:00
Trever Fischer
e0957c2dab Move MinecraftProfile from the profiles app into the minecraft app, and stop using the auth profiles feature.
Might go back to auth profiles if a suitable use can be found.
2012-03-04 23:18:00 -05:00
Trever Fischer
832b6127e7 Add invites to the admin pages 2012-03-04 22:10:16 -05:00
Trever Fischer
75ac4ebbdd Use django builtin auth views, and add a password reset link 2012-03-04 22:04:04 -05:00
Trever Fischer
060c964e95 Add readme 2012-03-04 18:27:33 -05:00
Trever Fischer
06a6dc693d Restructure and rename the currency model table 2012-03-04 18:23:47 -05:00
Trever Fischer
d7dccf9904 use base_simple in some old templates 2012-03-04 14:39:21 -05:00
Trever Fischer
234b2f129a Prevent crash when creating account 2012-03-04 14:39:07 -05:00
Trever Fischer
e82bb7b340 Set default account status 2012-03-04 14:38:52 -05:00
Trever Fischer
eeba88f838 fix login form css 2012-03-04 13:53:24 -05:00
Trever Fischer
927af328e8 Restyle epicenter links 2012-03-04 13:53:14 -05:00
Trever Fischer
172a5ab9d9 Tweak profile page 2012-03-04 13:50:32 -05:00
Trever Fischer
754d6c2fe3 Move the time display 2012-03-04 13:40:52 -05:00
Trever Fischer
3d317ad0b3 Add dynmap time queries through api, and add a time widget 2012-03-04 10:57:37 -05:00
Trever Fischer
e0c9e9775c Use only uppercase invites 2012-03-04 09:37:07 -05:00
Trever Fischer
34567bf695 Use minecraft avatars 2012-03-03 22:09:40 -05:00
Trever Fischer
8687e034ac Add api to query server info 2012-03-03 18:29:24 -05:00
Trever Fischer
dda78c0711 crack--; reduce cache time from 120s to 10s 2012-03-03 18:29:10 -05:00
Trever Fischer
9f1acfb70c Implement JQuery polling of user balance on page 2012-03-03 18:12:54 -05:00
Trever Fischer
11788ecb34 Export grist balance to the api 2012-03-03 17:58:48 -05:00
Trever Fischer
c2bdc1e87a Display grist balance on website 2012-03-03 17:53:32 -05:00
Trever Fischer
b9ffa0ec05 Use a OneToOneField instead of ForeignKey 2012-03-03 17:53:21 -05:00
Trever Fischer
fc4ba5c4a1 crash-- 2012-03-03 17:32:05 -05:00
Trever Fischer
3319620d2b Make admin for currencyaccount easier 2012-03-03 17:27:52 -05:00
Trever Fischer
8aeca57795 Implement a 'local' app for caminus-specific bits 2012-03-03 17:15:45 -05:00
Trever Fischer
e80cfd9e7d Remove the django comments app 2012-03-03 17:09:48 -05:00
Trever Fischer
45159b8f95 Make mc_username unique 2012-03-03 17:09:35 -05:00
Trever Fischer
0d2b9f7c11 Fix password import bug 2012-03-03 16:48:59 -05:00
Trever Fischer
2976830bf6 Add a user list 2012-03-02 21:19:56 -05:00
Trever Fischer
b246ac8910 Display user avatar in epicenter 2012-03-02 21:19:39 -05:00
Trever Fischer
a6399c1305 Handle duplicate minecraft registrations 2012-03-02 20:41:51 -05:00
Trever Fischer
c02d354bb0 Restyle the invite display 2012-03-02 16:45:55 -05:00
Trever Fischer
6b1daeafa7 Add minecraft font 2012-03-02 15:25:41 -05:00
Trever Fischer
cea5a93167 Move map links 2012-03-02 15:07:09 -05:00
Trever Fischer
871eb69d73 Implement the new design 2012-03-02 14:51:20 -05:00
Trever Fischer
d87095fe2c Move all the player queries into the server model object 2012-03-02 14:51:05 -05:00
Trever Fischer
c2e9eff169 Convert minecraft app to south 2012-03-02 13:24:08 -05:00
Trever Fischer
c23de7051c Add a command to import from drupal 2012-03-02 12:56:20 -05:00
Trever Fischer
171bca132d Implement petition app 2012-03-02 11:45:57 -05:00
Trever Fischer
5194d95d75 Import local_settings only if it already exists 2012-03-02 11:16:49 -05:00
Trever Fischer
faf039a269 crash-- 2012-03-02 10:06:17 -05:00
Trever Fischer
74ec83c8f1 Implement our own commenting system for simplicity 2012-03-02 10:06:08 -05:00
Trever Fischer
22eb2a63e7 typo-- 2012-02-27 19:00:40 -05:00