repo
string
commit
string
message
string
diff
string
ThomasPedersen/mattespill
0b7a5c95e7e22d5d8bf23e01a707de3a6c369c7f
Hard tabs 4 lyfe
diff --git a/main/forms.py b/main/forms.py index f498879..90551c4 100644 --- a/main/forms.py +++ b/main/forms.py @@ -1,34 +1,34 @@ from django.contrib.auth.models import User from django import forms class SignupForm(forms.Form): - Brukernavn = forms.CharField(max_length=30) - Epost = forms.EmailField(); - ...
ThomasPedersen/mattespill
b4dd9496e9805127aad040267e72aa2172282014
hook test
diff --git a/main/media/home.js b/main/media/home.js index c3122f3..8fbc63a 100644 --- a/main/media/home.js +++ b/main/media/home.js @@ -1,7 +1,7 @@ $(function() { $('.restricted_room_msg').parent().hover(function() { - $(this).find('.restricted_room_msg').fadeIn(300); + $(this).find('.restricted_room_msg').fadeIn...
ThomasPedersen/mattespill
0531cfa852d4cfa76582f8f5957d400624876dfa
Added some tests for room view.
diff --git a/main/tests.py b/main/tests.py index c9a9793..0cb6bb8 100644 --- a/main/tests.py +++ b/main/tests.py @@ -1,20 +1,44 @@ from django.test import TestCase from django.test.client import Client +from main.models import Turn class ViewsTest(TestCase): + def test_login(self): + response = self.client.pos...
ThomasPedersen/mattespill
020192b98a4eabcd37dcb22107ce456a5b8ff202
Added some basic tests for index and login.
diff --git a/main/tests.py b/main/tests.py index f9983c3..c9a9793 100644 --- a/main/tests.py +++ b/main/tests.py @@ -1,23 +1,20 @@ -""" -This file demonstrates two different styles of tests (one doctest and one -unittest). These will both pass when you run "manage.py test". - -Replace these with more appropriate tests ...
ThomasPedersen/mattespill
3f9488a89ce91005cd824a125fd4e62992eec552
Order questions by difficulty (points).
diff --git a/main/views.py b/main/views.py index 2e00151..8384343 100644 --- a/main/views.py +++ b/main/views.py @@ -1,170 +1,170 @@ # -*- coding: utf-8 -*- from django.template import RequestContext, Context, loader from django.utils import simplejson from django.http import HttpResponse, HttpResponseRedirect, H...
ThomasPedersen/mattespill
7cb2486d306164d32e25a9d8993141ef3318f5e4
Added errorface image.
diff --git a/main/media/images/errorface.gif b/main/media/images/errorface.gif new file mode 100644 index 0000000..7da4e2a Binary files /dev/null and b/main/media/images/errorface.gif differ
ThomasPedersen/mattespill
87492a2c69a6b14f5ed15a241a008aa600b0fef6
fixed a pedobear bug
diff --git a/main/media/question.js b/main/media/question.js index 7b41671..8884795 100644 --- a/main/media/question.js +++ b/main/media/question.js @@ -1,99 +1,101 @@ var bearTimer; function showBear() { $('#hintbear').css('cursor', 'pointer').click(function() { $.ajax({ type: 'POST', url: '/buyhint/'...
ThomasPedersen/mattespill
dfd0198d84abbc66b455100ca8f0a929094d8525
moar bear fix
diff --git a/main/media/question.js b/main/media/question.js index b84317b..7b41671 100644 --- a/main/media/question.js +++ b/main/media/question.js @@ -1,97 +1,99 @@ var bearTimer; function showBear() { $('#hintbear').css('cursor', 'pointer').click(function() { $.ajax({ type: 'POST', url: '/buyhint/',...
ThomasPedersen/mattespill
0d1866ea87ad81b830da4ef6bd389111107d680c
moar bear fix
diff --git a/main/media/question.js b/main/media/question.js index 9f90f2d..b84317b 100644 --- a/main/media/question.js +++ b/main/media/question.js @@ -1,100 +1,97 @@ var bearTimer; function showBear() { $('#hintbear').css('cursor', 'pointer').click(function() { $.ajax({ type: 'POST', url: '/buyhint/'...
ThomasPedersen/mattespill
ac912febb81413aeb1bfbda0f673a31c076cf4b7
bear 2 fix
diff --git a/main/media/peekbear.js b/main/media/peekbear.js index 46d9ac4..d5bdcd8 100644 --- a/main/media/peekbear.js +++ b/main/media/peekbear.js @@ -1,57 +1,57 @@ var peekbearImages = ['peekbearbottom.png', 'peekbearright.png', 'peekbearleft.png']; function showPeekbear() { var i = Math.floor(Math.random()*(p...
ThomasPedersen/mattespill
fd2e7bf41720a32233878dd272dc969a6082227f
bear normal speed
diff --git a/main/media/peekbear.js b/main/media/peekbear.js index 28139f1..46d9ac4 100644 --- a/main/media/peekbear.js +++ b/main/media/peekbear.js @@ -1,57 +1,57 @@ var peekbearImages = ['peekbearbottom.png', 'peekbearright.png', 'peekbearleft.png']; function showPeekbear() { var i = Math.floor(Math.random()*(p...
ThomasPedersen/mattespill
b2a594ff6fc61b6b20420f760f078d2507b058e7
bear at home
diff --git a/main/media/peekbear.js b/main/media/peekbear.js index 46d9ac4..28139f1 100644 --- a/main/media/peekbear.js +++ b/main/media/peekbear.js @@ -1,57 +1,57 @@ var peekbearImages = ['peekbearbottom.png', 'peekbearright.png', 'peekbearleft.png']; function showPeekbear() { var i = Math.floor(Math.random()*(p...
ThomasPedersen/mattespill
14badba7a8a7ccbcfddacd45e4945b344d2c97b5
bear at home
diff --git a/main/media/peekbear.js b/main/media/peekbear.js index d5995df..46d9ac4 100644 --- a/main/media/peekbear.js +++ b/main/media/peekbear.js @@ -1,57 +1,57 @@ var peekbearImages = ['peekbearbottom.png', 'peekbearright.png', 'peekbearleft.png']; function showPeekbear() { var i = Math.floor(Math.random()*(p...
ThomasPedersen/mattespill
11aba6235df983e5df93ebb02bf7b85f90ca13dd
pnghelvete
diff --git a/main/media/peekbear.js b/main/media/peekbear.js index ce72e87..d5995df 100644 --- a/main/media/peekbear.js +++ b/main/media/peekbear.js @@ -1,53 +1,57 @@ var peekbearImages = ['peekbearbottom.png', 'peekbearright.png', 'peekbearleft.png']; function showPeekbear() { - var i = Math.floor(Math.random()*(p...
ThomasPedersen/mattespill
05aaf028779bc75864f4132f31d0d25b7e88a21d
pnghelvete
diff --git a/main/media/peekbear.js b/main/media/peekbear.js new file mode 100644 index 0000000..ce72e87 --- /dev/null +++ b/main/media/peekbear.js @@ -0,0 +1,53 @@ +var peekbearImages = ['peekbearbottom.png', 'peekbearright.png', 'peekbearleft.png']; + +function showPeekbear() { + var i = Math.floor(Math.random()*(pee...
ThomasPedersen/mattespill
e4da85936083e285c982ff4f33618fcecf8db741
Added the peekbear so he can pop up from every angel. Awesomeness is awesome.
diff --git a/main/media/hintbearhead.png b/main/media/images/peekbearbottom.png similarity index 100% rename from main/media/hintbearhead.png rename to main/media/images/peekbearbottom.png diff --git a/main/media/images/peekbearleft.png b/main/media/images/peekbearleft.png new file mode 100644 index 0000000..3dff8e6 Bi...
ThomasPedersen/mattespill
94cfb3c360839acdf9a046a4b965a5ff3100cf7b
Added the favicon to outer.html
diff --git a/main/templates/outer.html b/main/templates/outer.html index cd08431..8af1e7d 100644 --- a/main/templates/outer.html +++ b/main/templates/outer.html @@ -1,82 +1,83 @@ <!DOCTYPE html> <html lang="no"> <head> <meta charset="utf-8" /> <title>Mattespill</title> + <link href="/media/favicon.ico" rel="icon...
ThomasPedersen/mattespill
812bfaeddc79591ec68139de472f85c5237b5336
Added favicon and peakbear in true hintbear style\!
diff --git a/main/media/favicon.ico b/main/media/favicon.ico new file mode 100644 index 0000000..b96d48f Binary files /dev/null and b/main/media/favicon.ico differ diff --git a/main/media/hintbearhead.png b/main/media/hintbearhead.png new file mode 100644 index 0000000..4830372 Binary files /dev/null and b/main/media/h...
ThomasPedersen/mattespill
cedca281491d2c894e4e636d8fea286bda716607
Forgot mimetype in JSON view.
diff --git a/main/views.py b/main/views.py index c13f512..2e00151 100644 --- a/main/views.py +++ b/main/views.py @@ -1,170 +1,170 @@ # -*- coding: utf-8 -*- from django.template import RequestContext, Context, loader from django.utils import simplejson from django.http import HttpResponse, HttpResponseRedirect, H...
ThomasPedersen/mattespill
47c15d7d3e079909f1490fe46de48efc06e96d57
Disallow buying of hints if user doesn't have enough points.
diff --git a/main/views.py b/main/views.py index 3c2eb95..c13f512 100644 --- a/main/views.py +++ b/main/views.py @@ -1,165 +1,170 @@ # -*- coding: utf-8 -*- from django.template import RequestContext, Context, loader from django.utils import simplejson from django.http import HttpResponse, HttpResponseRedirect, H...
ThomasPedersen/mattespill
39b6d036341b77842531bfd4c7324561a3b343cf
liten fix
diff --git a/main/media/question.js b/main/media/question.js index ef7a5e6..aaa9558 100644 --- a/main/media/question.js +++ b/main/media/question.js @@ -1,92 +1,92 @@ var bearTimer; function showBear() { - $('#hintbear').show().animate({ + $('#hintbear').html('Har du lyst p&aring; hjelp?<br />Klikk p&aring; meg!')....
ThomasPedersen/mattespill
da749364b213094c0ade1e882b5490798e7d9353
pedo bear + css separation question.html
diff --git a/main/media/main.css b/main/media/main.css index 85ebe6a..f986169 100644 --- a/main/media/main.css +++ b/main/media/main.css @@ -1,167 +1,167 @@ @font-face { font-family: Aller; font-weight: normal; src: url('fonts/Aller_Rg.ttf'); } @font-face { font-family: Aller; font-weight: bold; src: url...
ThomasPedersen/mattespill
1df4c95719d0196337ccc1a29ba18191ee4a2e0e
Fixed initial data. Needed --exclude=contenttypes for dumpdata.
diff --git a/initial_data.json b/initial_data.json index 1ab322c..e693889 100644 --- a/initial_data.json +++ b/initial_data.json @@ -1 +1 @@ -[{"pk": 5, "model": "contenttypes.contenttype", "fields": {"model": "contenttype", "name": "content type", "app_label": "contenttypes"}}, {"pk": 2, "model": "contenttypes.content...
ThomasPedersen/mattespill
6123fbde5bf3edf3753c86862c4164c8490cd8ca
Added view for buying hints.
diff --git a/main/models.py b/main/models.py index 916d985..22bdc3c 100644 --- a/main/models.py +++ b/main/models.py @@ -1,69 +1,69 @@ from django.db import models from django.contrib.auth.models import User from django.db.models.signals import post_save class UserProfile(models.Model): user = models.ForeignKe...
ThomasPedersen/mattespill
53cceafa9a8d611352a729be346f611a89743572
Added view for buying hints. Added cost to hint model
diff --git a/main/models.py b/main/models.py index 2fb7637..916d985 100644 --- a/main/models.py +++ b/main/models.py @@ -1,68 +1,69 @@ from django.db import models from django.contrib.auth.models import User from django.db.models.signals import post_save class UserProfile(models.Model): user = models.ForeignKe...
ThomasPedersen/mattespill
fbb8a3046c02212b38d5189e4b8ffba11c9e5c95
pedobear
diff --git a/main/media/images/hintbear.png b/main/media/images/hintbear.png new file mode 100644 index 0000000..b3ccf7f Binary files /dev/null and b/main/media/images/hintbear.png differ diff --git a/main/media/question.js b/main/media/question.js index 17c46b3..44f7928 100644 --- a/main/media/question.js +++ b/main/m...
ThomasPedersen/mattespill
cb233ace729fae2f293c2b72ace91e6a9930138b
Cleanup (comments etc.)
diff --git a/main/views.py b/main/views.py index 82044b9..17eadca 100644 --- a/main/views.py +++ b/main/views.py @@ -1,151 +1,149 @@ # -*- coding: utf-8 -*- from django.template import RequestContext, Context, loader from django.utils import simplejson from django.http import HttpResponse from django.http import...
ThomasPedersen/mattespill
b9bf43ea1e0f1b15b1a1e56deffb8be37f8342ea
Added model for hints. Updated initial data.
diff --git a/initial_data.json b/initial_data.json index 03a7c65..ad62339 100644 --- a/initial_data.json +++ b/initial_data.json @@ -1 +1 @@ -[{"pk": 5, "model": "contenttypes.contenttype", "fields": {"model": "contenttype", "name": "content type", "app_label": "contenttypes"}}, {"pk": 2, "model": "contenttypes.content...
ThomasPedersen/mattespill
89d73b7002914290d232569dcff2be6fb60a1343
Added a basic stats page.
diff --git a/main/templates/home.html b/main/templates/home.html index 25dc664..9ea61ae 100644 --- a/main/templates/home.html +++ b/main/templates/home.html @@ -1,123 +1,124 @@ {% extends "outer.html" %} {% block head %} <script src="/media/home.js" type="text/javascript"></script> <style type="text/css"> #right...
ThomasPedersen/mattespill
4c8a3383269441dea4d3c1cfd1e202326e641705
OMG FIXED!
diff --git a/main/views.py b/main/views.py index eba831d..a6233e6 100644 --- a/main/views.py +++ b/main/views.py @@ -1,143 +1,143 @@ # -*- coding: utf-8 -*- from django.template import RequestContext, Context, loader from django.utils import simplejson from django.http import HttpResponse from django.http import...
ThomasPedersen/mattespill
5bed0d6afbb7564dd97bc20ba2653835f873b4e7
chrome eyllow outline remove
diff --git a/main/media/main.css b/main/media/main.css index 0734270..85ebe6a 100644 --- a/main/media/main.css +++ b/main/media/main.css @@ -1,164 +1,167 @@ @font-face { font-family: Aller; font-weight: normal; src: url('fonts/Aller_Rg.ttf'); } @font-face { font-family: Aller; font-weight: bold; src: url...
ThomasPedersen/mattespill
3cf3e13132e09697d76b9bbba20e7425f0a13a7c
Fixed question count
diff --git a/main/views.py b/main/views.py index 9d2f679..eba831d 100644 --- a/main/views.py +++ b/main/views.py @@ -1,143 +1,143 @@ # -*- coding: utf-8 -*- from django.template import RequestContext, Context, loader from django.utils import simplejson from django.http import HttpResponse from django.http import...
ThomasPedersen/mattespill
258dca02fc914786268ee790ae9eac934f6dadfb
autofocus bugfix
diff --git a/main/media/question.js b/main/media/question.js index 8ce3998..17c46b3 100644 --- a/main/media/question.js +++ b/main/media/question.js @@ -1,47 +1,47 @@ $(function() { $('.start_button').click(function() { if ($.trim($('input[name=answer]').val()) == '') { alert('Du må skrive inn noe!'); $(...
ThomasPedersen/mattespill
98b33c60de4061de25db9e01249568277d254323
autocomplete off
diff --git a/main/templates/question.html b/main/templates/question.html index 4eb6328..c8eb651 100644 --- a/main/templates/question.html +++ b/main/templates/question.html @@ -1,67 +1,67 @@ {% extends "outer.html" %} {% block head %} <style type="text/css"> #correct_answer { background-color: #afa; } #wrong_...
ThomasPedersen/mattespill
31ea1b0a787ef17c813d21599904532eb2dac8f3
Order by Turn by date_start after ordering by total_points
diff --git a/main/views.py b/main/views.py index 976c040..9d2f679 100644 --- a/main/views.py +++ b/main/views.py @@ -1,142 +1,143 @@ # -*- coding: utf-8 -*- from django.template import RequestContext, Context, loader from django.utils import simplejson from django.http import HttpResponse from django.http import...
ThomasPedersen/mattespill
6049fd027edce0b31bdde4c8ac72779b97a93eee
Lagt til spørsmål!
diff --git a/initial_data.json b/initial_data.json index 4905039..4fbe8d5 100644 --- a/initial_data.json +++ b/initial_data.json @@ -1 +1 @@ -[{"pk": 5, "model": "contenttypes.contenttype", "fields": {"model": "contenttype", "name": "content type", "app_label": "contenttypes"}}, {"pk": 2, "model": "contenttypes.content...
ThomasPedersen/mattespill
3f9c94b7f548f7c9649bc0ba80032c6cd0d4eae9
fixed homepage logics
diff --git a/main/templates/home.html b/main/templates/home.html index 87a087f..25dc664 100644 --- a/main/templates/home.html +++ b/main/templates/home.html @@ -1,123 +1,123 @@ {% extends "outer.html" %} {% block head %} <script src="/media/home.js" type="text/javascript"></script> <style type="text/css"> #right...
ThomasPedersen/mattespill
f6862adfecec5523deb7e8e9adb5d54c9fc061d1
Randomize questions
diff --git a/main/views.py b/main/views.py index fbcc305..976c040 100644 --- a/main/views.py +++ b/main/views.py @@ -1,142 +1,142 @@ # -*- coding: utf-8 -*- from django.template import RequestContext, Context, loader from django.utils import simplejson from django.http import HttpResponse from django.http import...
ThomasPedersen/mattespill
6e9710bbb6e9902e962bd3b902584696e931c2d5
Redirect to room when refresh happens at the end of a turn
diff --git a/main/views.py b/main/views.py index 5f3d310..fbcc305 100644 --- a/main/views.py +++ b/main/views.py @@ -1,138 +1,142 @@ # -*- coding: utf-8 -*- from django.template import RequestContext, Context, loader from django.utils import simplejson from django.http import HttpResponse from django.http import...
michaelansel/dukenow
998d233a143afd8f807178ce7f8de7d800237b25
Optimize iPhone-Places layout
diff --git a/app/views/layouts/places.iphone.erb b/app/views/layouts/places.iphone.erb index 421fb1b..dc5948c 100644 --- a/app/views/layouts/places.iphone.erb +++ b/app/views/layouts/places.iphone.erb @@ -1,92 +1,60 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD...
michaelansel/dukenow
5ee5c6fc8e38a8c9e58577178a64ec9385a3f5c2
Add additional database indexes
diff --git a/db/migrate/20090801004614_dining_extension_indexes.rb b/db/migrate/20090801004614_dining_extension_indexes.rb new file mode 100644 index 0000000..880e938 --- /dev/null +++ b/db/migrate/20090801004614_dining_extension_indexes.rb @@ -0,0 +1,9 @@ +class DiningExtensionIndexes < ActiveRecord::Migration + def ...
michaelansel/dukenow
14cc3d6f9f93eba90548a8032417ff15a4f40419
Bugfix: Explicit table/column names in find(:conditions) required when using PostgreSQL
diff --git a/app/models/operating_time.rb b/app/models/operating_time.rb index fa55b13..b57eaca 100644 --- a/app/models/operating_time.rb +++ b/app/models/operating_time.rb @@ -1,244 +1,246 @@ class OperatingTime < ActiveRecord::Base belongs_to :place acts_as_taggable_on :operating_time_tags validates_presenc...
michaelansel/dukenow
f3a2acb44dd5d3779402cbd6668f4e46cace60b3
Add labels to Place index schedules
diff --git a/app/models/place.rb b/app/models/place.rb index b266d8c..6de59d5 100644 --- a/app/models/place.rb +++ b/app/models/place.rb @@ -1,262 +1,261 @@ class Place < ActiveRecord::Base DEBUG = false has_many :operating_times has_one :dining_extension acts_as_taggable_on :tags validates_presence_o...
michaelansel/dukenow
68a14ddb616a95ab61c1c66092c99d56fb3004db
Bugfix: Incorrect day names on graphic (weekly) schedule
diff --git a/app/views/places/show.html.erb b/app/views/places/show.html.erb index 6b8770d..3b830f2 100644 --- a/app/views/places/show.html.erb +++ b/app/views/places/show.html.erb @@ -1,239 +1,239 @@ <p> <b>Name:</b> <%=h @place.name %> </p> <p> <b>Location:</b> <%=h @place.location %> </p> <p> ...
michaelansel/dukenow
d89845e7ddf675cc0e94c1360d8e901db7ce5d90
Bugfix: XML Schema inconsistent for <schedule on="...">
diff --git a/app/models/place.rb b/app/models/place.rb index 41c99b8..b266d8c 100644 --- a/app/models/place.rb +++ b/app/models/place.rb @@ -1,262 +1,262 @@ class Place < ActiveRecord::Base DEBUG = false has_many :operating_times has_one :dining_extension acts_as_taggable_on :tags validates_presence_o...
michaelansel/dukenow
584f303b3b3b6d9ec60b69c308df8bfe33685f8f
Add option to truncate times at boundaries when scheduling
diff --git a/TODO b/TODO index 8010228..fdc02e7 100644 --- a/TODO +++ b/TODO @@ -1,115 +1,116 @@ vim:set syntax=todo: Database Places - -- has_one :dining_extension + \- has_one :dining_extension \- name (string) -- location (lat/long) -- ?GeoKit Plugin? \- phone_number (string) DiningExt...
michaelansel/dukenow
b998c800406da2a386c158b41517bfaa98505d95
Use named_scopes for OperatingTime database queries
diff --git a/app/models/operating_time.rb b/app/models/operating_time.rb index 14a651a..fa55b13 100644 --- a/app/models/operating_time.rb +++ b/app/models/operating_time.rb @@ -1,238 +1,244 @@ class OperatingTime < ActiveRecord::Base belongs_to :place acts_as_taggable_on :operating_time_tags validates_presenc...
michaelansel/dukenow
273262199cdb27944a4f04d9f735be7d1ae92d9a
Upgrade to Rails 2.3.2
diff --git a/app/controllers/application.rb b/app/controllers/application_controller.rb similarity index 100% rename from app/controllers/application.rb rename to app/controllers/application_controller.rb diff --git a/config/boot.rb b/config/boot.rb index 0a51688..0ad0f78 100644 --- a/config/boot.rb +++ b/config/boot.r...
michaelansel/dukenow
102c9dfaa647014194fa86be929382b625a1de85
Minimal fixes for OperatingTimes views
diff --git a/app/views/operating_times/_entryform.html.erb b/app/views/operating_times/_entryform.html.erb index 2f06e22..e352275 100644 --- a/app/views/operating_times/_entryform.html.erb +++ b/app/views/operating_times/_entryform.html.erb @@ -1,74 +1,74 @@ <p> <%= f.label :place %><br /> <%= f.collection...
michaelansel/dukenow
0451aa18baf59f1a8907defc22d73be8170fb836
Convert from/to Time objects to XML schema instead of String
diff --git a/app/models/place.rb b/app/models/place.rb index 08dc86a..c92fa85 100644 --- a/app/models/place.rb +++ b/app/models/place.rb @@ -1,246 +1,246 @@ class Place < ActiveRecord::Base DEBUG = false has_many :operating_times has_one :dining_extension acts_as_taggable_on :tags validates_presence_o...
michaelansel/dukenow
7aa3100cec46caf939f6274188695c91b6878588
Minor bugfixes
diff --git a/app/controllers/places_controller.rb b/app/controllers/places_controller.rb index af9cf31..1930e53 100644 --- a/app/controllers/places_controller.rb +++ b/app/controllers/places_controller.rb @@ -1,192 +1,191 @@ class PlacesController < ApplicationController ActionView::Base.send :include, TagsHelper ...
michaelansel/dukenow
bc0397e4d24605c304eaf017fd4ab3c50ed8bd99
Add basic API versioning
diff --git a/config/environment.rb b/config/environment.rb index 15305cd..d5d6455 100644 --- a/config/environment.rb +++ b/config/environment.rb @@ -1,78 +1,81 @@ # Be sure to restart your server when you modify this file # Uncomment below to force Rails into production mode when # you don't control web/app server...
michaelansel/dukenow
26bc92525de10da460ff187af16ce2fec8900ef0
Minimal required changes to get Place views working again
diff --git a/app/controllers/places_controller.rb b/app/controllers/places_controller.rb index ebd4ae6..af9cf31 100644 --- a/app/controllers/places_controller.rb +++ b/app/controllers/places_controller.rb @@ -1,192 +1,192 @@ class PlacesController < ApplicationController ActionView::Base.send :include, TagsHelper ...
michaelansel/dukenow
d79abe56a4323e165d80de6c3a7bee1ab9e1cd06
Rename OperatingTime.opensAt to ".start"
diff --git a/app/models/operating_time.rb b/app/models/operating_time.rb index e0f9230..14a651a 100644 --- a/app/models/operating_time.rb +++ b/app/models/operating_time.rb @@ -1,279 +1,238 @@ class OperatingTime < ActiveRecord::Base belongs_to :place acts_as_taggable_on :operating_time_tags validates_presenc...
michaelansel/dukenow
728d86bf5cb52e190052e6bd25cf6eb8b18dacff
Scheduling spec fixes
diff --git a/app/models/place.rb b/app/models/place.rb index b0a2b14..08dc86a 100644 --- a/app/models/place.rb +++ b/app/models/place.rb @@ -1,235 +1,246 @@ class Place < ActiveRecord::Base DEBUG = false has_many :operating_times has_one :dining_extension acts_as_taggable_on :tags validates_presence_o...
michaelansel/dukenow
d84a316d4d0cdbd2c9a1393ef6666b7587e9c0ac
Extend specs and fix bug when overridding to close a location all day which is normally open
diff --git a/app/models/place.rb b/app/models/place.rb index 4e609d2..b0a2b14 100644 --- a/app/models/place.rb +++ b/app/models/place.rb @@ -1,215 +1,235 @@ class Place < ActiveRecord::Base DEBUG = false has_many :operating_times has_one :dining_extension acts_as_taggable_on :tags validates_presence_o...
michaelansel/dukenow
2045eefefb064c2cd0b13d3b09d2c7b32c06dc41
Rework DiningExtensions XML to be more flexible; Bugfix in OperatingTime.to_xml
diff --git a/app/models/dining_extension.rb b/app/models/dining_extension.rb index 4e0e0c7..5ad0089 100644 --- a/app/models/dining_extension.rb +++ b/app/models/dining_extension.rb @@ -1,16 +1,24 @@ class DiningExtension < ActiveRecord::Base belongs_to :place def to_xml(options = {}) options[:indent] ||= ...
michaelansel/dukenow
79cb37e482e836898eec38bc5fc1a96936678193
Bugfix: OperatingTime.to_xml arity incorrect
diff --git a/app/models/operating_time.rb b/app/models/operating_time.rb index 2896551..7076def 100644 --- a/app/models/operating_time.rb +++ b/app/models/operating_time.rb @@ -1,278 +1,278 @@ class OperatingTime < ActiveRecord::Base belongs_to :place acts_as_taggable_on :operating_time_tags validates_presenc...
michaelansel/dukenow
2099559544725b60ac997b7b7e7dd51aa23fa377
daysOfWeek -> days_of_week ; "dasherize" all XML elements to be consistent with default ActiveRecord serializer
diff --git a/app/controllers/operating_times_controller.rb b/app/controllers/operating_times_controller.rb index 59266ea..4509e79 100644 --- a/app/controllers/operating_times_controller.rb +++ b/app/controllers/operating_times_controller.rb @@ -1,138 +1,138 @@ class OperatingTimesController < ApplicationController ...
michaelansel/dukenow
f3dff0f5fdb93109cda99f9a0efa93f5cd42834d
XML bugfix and new parameter alias for Places controller (:on => :schedule_for_date)
diff --git a/app/controllers/places_controller.rb b/app/controllers/places_controller.rb index 50776a4..ebd4ae6 100644 --- a/app/controllers/places_controller.rb +++ b/app/controllers/places_controller.rb @@ -1,192 +1,192 @@ class PlacesController < ApplicationController ActionView::Base.send :include, TagsHelper ...
michaelansel/dukenow
9b037651453ae6f93713fd6a9509f3681ddb4f31
Pass scheduling params to XML builder for Place.show
diff --git a/app/controllers/places_controller.rb b/app/controllers/places_controller.rb index 2272269..50776a4 100644 --- a/app/controllers/places_controller.rb +++ b/app/controllers/places_controller.rb @@ -1,192 +1,192 @@ class PlacesController < ApplicationController ActionView::Base.send :include, TagsHelper ...
michaelansel/dukenow
119817e57d259ec04b4f4c7b08127b2243029fd8
Add API support for arbitrary schedule boundaries in request parameters
diff --git a/app/controllers/places_controller.rb b/app/controllers/places_controller.rb index 7a64ac8..2272269 100644 --- a/app/controllers/places_controller.rb +++ b/app/controllers/places_controller.rb @@ -1,172 +1,192 @@ class PlacesController < ApplicationController ActionView::Base.send :include, TagsHelper ...
michaelansel/dukenow
517afd035e72802d8ece4da699b8255b9306b361
Make operating_times model helper database agnostic
diff --git a/app/models/place.rb b/app/models/place.rb index 52113cc..042ea24 100644 --- a/app/models/place.rb +++ b/app/models/place.rb @@ -1,200 +1,200 @@ class Place < ActiveRecord::Base DEBUG = false has_many :operating_times has_one :dining_extension acts_as_taggable_on :tags validates_presence_o...
michaelansel/dukenow
caa15f245733a567b2feed13639e2271c37d1efb
Add gem manifest for Heroku
diff --git a/.gems b/.gems new file mode 100644 index 0000000..d28eed0 --- /dev/null +++ b/.gems @@ -0,0 +1,2 @@ +mbleigh-acts-as-taggable-on --source http://gems.github.com +sqlite3-ruby
michaelansel/dukenow
534c0e25913c210a475d9a55841a32a99338939a
Add DiningExtensions and include in Place XML
diff --git a/TODO b/TODO index 6a9a698..8010228 100644 --- a/TODO +++ b/TODO @@ -1,115 +1,115 @@ vim:set syntax=todo: Database Places -- has_one :dining_extension \- name (string) -- location (lat/long) -- ?GeoKit Plugin? \- phone_number (string) DiningExtensions -- acts_as_taggable_o...
michaelansel/dukenow
75f086f24dede310ce229dcde8f38248ca351bdc
Add building_id field to Place model
diff --git a/app/models/place.rb b/app/models/place.rb index b7cab2a..2f87c94 100644 --- a/app/models/place.rb +++ b/app/models/place.rb @@ -1,192 +1,197 @@ class Place < ActiveRecord::Base DEBUG = false has_many :operating_times acts_as_taggable_on :tags validates_presence_of :name def special_oper...
michaelansel/dukenow
4098a9fdcb10d0f3165cbd92ce01de8eaf2aa64b
Add tags to XML for Place and OperatingTime
diff --git a/app/models/operating_time.rb b/app/models/operating_time.rb index 8d22e93..e45e977 100644 --- a/app/models/operating_time.rb +++ b/app/models/operating_time.rb @@ -1,284 +1,277 @@ class OperatingTime < ActiveRecord::Base belongs_to :place acts_as_taggable_on :operating_time_tags validates_presenc...
michaelansel/dukenow
7e7e7232da93f0f5c1a871c0ecda41d1a5d46482
Add tagging capabilities to OperatingTime model (no specs)
diff --git a/app/models/operating_time.rb b/app/models/operating_time.rb index f45e00f..8d22e93 100644 --- a/app/models/operating_time.rb +++ b/app/models/operating_time.rb @@ -1,260 +1,284 @@ class OperatingTime < ActiveRecord::Base belongs_to :place + acts_as_taggable_on :operating_time_tags validates_presenc...
michaelansel/dukenow
961067d11b860b90d61f87c251dafdce06a3da94
Bugfix that was causing an infinite loop in OperatingTime.next_times
diff --git a/app/models/operating_time.rb b/app/models/operating_time.rb index 18af8a4..f45e00f 100644 --- a/app/models/operating_time.rb +++ b/app/models/operating_time.rb @@ -1,260 +1,260 @@ class OperatingTime < ActiveRecord::Base belongs_to :place validates_presence_of :place_id, :endDate, :startDate vali...
michaelansel/dukenow
401a0688d40e5dda5234821ba7738a7ea37c813d
Customize XML builders; Add schedule caching
diff --git a/app/models/operating_time.rb b/app/models/operating_time.rb index 55232c3..18af8a4 100644 --- a/app/models/operating_time.rb +++ b/app/models/operating_time.rb @@ -1,226 +1,260 @@ class OperatingTime < ActiveRecord::Base belongs_to :place validates_presence_of :place_id, :endDate, :startDate vali...
michaelansel/dukenow
08ef7773e09ccdcb1553f531b4352e3f841ccbc7
Add backwards compatibility fixes to migrations for existing data (does not affect a fresh database)
diff --git a/app/models/operating_time.rb b/app/models/operating_time.rb index 71fff80..55232c3 100644 --- a/app/models/operating_time.rb +++ b/app/models/operating_time.rb @@ -1,226 +1,226 @@ class OperatingTime < ActiveRecord::Base belongs_to :place - validates_presence_of :place_id + validates_presence_of :pla...
michaelansel/dukenow
17b1ce2e2888e4544c8737c840dd58e4ff760f31
Finish out scheduling specs and fix Places model
diff --git a/app/models/operating_time.rb b/app/models/operating_time.rb index 6f5eac9..71fff80 100644 --- a/app/models/operating_time.rb +++ b/app/models/operating_time.rb @@ -1,224 +1,226 @@ class OperatingTime < ActiveRecord::Base belongs_to :place validates_presence_of :place_id validates_associated :plac...
michaelansel/dukenow
3ee98b9ee1ea2b34965fcfbe7f88d255008161bd
Expand scheduling specs; Move Place extensions into spec_helper; Remove pre-Capabilities specs; Add "offset" method to Date,Time, and DateTime; Fix scheduling errors in Place model
diff --git a/app/models/place.rb b/app/models/place.rb index e225209..f92404e 100644 --- a/app/models/place.rb +++ b/app/models/place.rb @@ -1,129 +1,140 @@ class Place < ActiveRecord::Base DEBUG = defined? DEBUG ? DEBUG : false has_many :operating_times acts_as_taggable_on :tags validates_presence_of :n...
michaelansel/dukenow
7eccd0ef99386cc703eca6c59d4a42d8498a2b17
Minor refactoring and spec fixes for OperatingTime and Place
diff --git a/app/models/operating_time.rb b/app/models/operating_time.rb index 35da623..6f5eac9 100644 --- a/app/models/operating_time.rb +++ b/app/models/operating_time.rb @@ -1,229 +1,224 @@ class OperatingTime < ActiveRecord::Base belongs_to :place validates_presence_of :place_id validates_associated :plac...
michaelansel/dukenow
e3b0b5f24f705e6f1ecc1e6322e7b003061962ba
Move all scheduling specs into a separate file from Place model specs
diff --git a/spec/models/place_spec.rb b/spec/models/place_spec.rb index 7ac59f9..1377418 100644 --- a/spec/models/place_spec.rb +++ b/spec/models/place_spec.rb @@ -1,537 +1,256 @@ require File.expand_path(File.dirname(__FILE__) + '/../spec_helper') - -ConstraintDebugging = defined? ConstraintDebugging ? ConstraintDeb...
michaelansel/dukenow
fe240ca97c86a70a3033a3abc2e3e079af40f267
Extensive changes to scheduling logic and specs
diff --git a/TODO b/TODO index 9503715..6a9a698 100644 --- a/TODO +++ b/TODO @@ -1,112 +1,115 @@ vim:set syntax=todo: Database Places -- has_one :dining_extension \- name (string) -- location (lat/long) -- ?GeoKit Plugin? \- phone_number (string) DiningExtensions -- acts_as_taggable_o...
michaelansel/dukenow
a74c21e8a76e27bd0d41bfb4ea41d7a5579a7f2f
Minor model refactoring; Massive rewrite of scheduling specs for Place model using new RSpec "capabilities"
diff --git a/app/models/place.rb b/app/models/place.rb index 3d1ba65..63062ad 100644 --- a/app/models/place.rb +++ b/app/models/place.rb @@ -1,115 +1,110 @@ class Place < ActiveRecord::Base has_many :operating_times acts_as_taggable_on :tags validates_presence_of :name def special_operating_times - Op...
michaelansel/dukenow
f4139650dff37442e9854292c8c77e1f3d9aafc3
Bugfix to RSpec capabilities addon
diff --git a/spec/capabilities.rb b/spec/capabilities.rb index 30e5113..7bb0784 100644 --- a/spec/capabilities.rb +++ b/spec/capabilities.rb @@ -1,50 +1,52 @@ require 'rubygems' require 'spec' module Spec module Example module ExampleGroupMethods - def it_can(*capabilities) capabilities.e...
michaelansel/dukenow
4df280b89d09342a016d4e9734004527c57fdac9
Add 'capabilities' to RSpec DSL and include in spec_helper
diff --git a/spec/capabilities.rb b/spec/capabilities.rb new file mode 100644 index 0000000..30e5113 --- /dev/null +++ b/spec/capabilities.rb @@ -0,0 +1,50 @@ +require 'rubygems' +require 'spec' + +module Spec + module Example + module ExampleGroupMethods + + def it_can(*capabilities) + capabilities.e...
michaelansel/dukenow
a5aca8b7bb4b15a23326c5f7845fa82cbd3b297a
Start adding specs for Place.schedule and fixing model as necessary
diff --git a/app/models/place.rb b/app/models/place.rb index 00d480d..3d1ba65 100644 --- a/app/models/place.rb +++ b/app/models/place.rb @@ -1,119 +1,115 @@ class Place < ActiveRecord::Base has_many :operating_times acts_as_taggable_on :tags validates_presence_of :name def special_operating_times Op...
michaelansel/dukenow
381ef728a477b65fc292e2aadf6acb9c000eb838
Implement and test OperatingTime.to_times
diff --git a/app/models/operating_time.rb b/app/models/operating_time.rb index 1ef3a01..0d41aa0 100644 --- a/app/models/operating_time.rb +++ b/app/models/operating_time.rb @@ -1,186 +1,184 @@ class OperatingTime < ActiveRecord::Base belongs_to :place validates_presence_of :place_id validates_associated :plac...
michaelansel/dukenow
56f9db6c189f0742eb097b8b4d230ec62d23b360
Make errors more descriptive
diff --git a/app/models/operating_time.rb b/app/models/operating_time.rb index 9ff4933..1ef3a01 100644 --- a/app/models/operating_time.rb +++ b/app/models/operating_time.rb @@ -1,186 +1,186 @@ class OperatingTime < ActiveRecord::Base belongs_to :place validates_presence_of :place_id validates_associated :plac...
michaelansel/dukenow
d4663269dd40fcb1346062e04d05030798117f73
OperatingTime model: Add stricter argument handling for override and daysOfWeek; Add appropriate specs
diff --git a/app/models/operating_time.rb b/app/models/operating_time.rb index 6fa84aa..9ff4933 100644 --- a/app/models/operating_time.rb +++ b/app/models/operating_time.rb @@ -1,170 +1,186 @@ class OperatingTime < ActiveRecord::Base belongs_to :place validates_presence_of :place_id validates_associated :plac...
michaelansel/dukenow
6642ca3ef3ca949c1da9631678589380a5ffe974
OperatingTimes model: Add validations, Reimplement "override" and "daysOfWeek", Seperate all deprecated methods
diff --git a/app/models/operating_time.rb b/app/models/operating_time.rb index 4eb7d5e..6fa84aa 100644 --- a/app/models/operating_time.rb +++ b/app/models/operating_time.rb @@ -1,155 +1,170 @@ class OperatingTime < ActiveRecord::Base belongs_to :place validates_presence_of :place_id validates_associated :plac...
michaelansel/dukenow
23b77654d532f2c59da1210e456f46c1783232a3
Renamed OperatingTimes column "days_of_week" to "daysOfWeek" and updated model to make specs pass
diff --git a/app/models/operating_time.rb b/app/models/operating_time.rb index 4cc67aa..4eb7d5e 100644 --- a/app/models/operating_time.rb +++ b/app/models/operating_time.rb @@ -1,155 +1,155 @@ class OperatingTime < ActiveRecord::Base belongs_to :place validates_presence_of :place_id validates_associated :plac...
michaelansel/dukenow
76b37ff3adc18e814bf02475b333df7ed338fd8a
Add minor fixes so specs will pass following OperatingTimes migration (flags => override,days_of_week)
diff --git a/TODO b/TODO index da82102..9503715 100644 --- a/TODO +++ b/TODO @@ -1,112 +1,112 @@ vim:set syntax=todo: Database Places -- has_one :dining_extension \- name (string) -- location (lat/long) -- ?GeoKit Plugin? \- phone_number (string) DiningExtensions -- acts_as_taggable_o...
michaelansel/dukenow
f25ed21a28a5bed64c54a2a83c0b5a44ea89a2ee
Added migration for new OperatingTimes schema (override and days_of_week columns instead of flags)
diff --git a/db/migrate/20090626212057_override_and_days_of_week_flags.rb b/db/migrate/20090626212057_override_and_days_of_week_flags.rb new file mode 100644 index 0000000..5e40402 --- /dev/null +++ b/db/migrate/20090626212057_override_and_days_of_week_flags.rb @@ -0,0 +1,28 @@ +class OverrideAndDaysOfWeekFlags < Activ...
michaelansel/dukenow
1f6f7c42cd7bd5887862695c3c11801f74fc6b4e
Added spec outline for Places model
diff --git a/spec/models/place_spec.rb b/spec/models/place_spec.rb index 211457f..0fbb4fd 100644 --- a/spec/models/place_spec.rb +++ b/spec/models/place_spec.rb @@ -1,45 +1,71 @@ require File.expand_path(File.dirname(__FILE__) + '/../spec_helper') # TODO Create mocks for OperatingTime so we can test the scheduling ...
michaelansel/dukenow
faa047308e95340ce69db18175187d0ff4494fc6
Add spec outlines for schedules and OperatingTimes; Temporarily disable some known-bad view specs until model logic complete
diff --git a/spec/models/operating_time_spec.rb b/spec/models/operating_time_spec.rb index 62ca71d..fa0fed0 100644 --- a/spec/models/operating_time_spec.rb +++ b/spec/models/operating_time_spec.rb @@ -1,14 +1,21 @@ require File.expand_path(File.dirname(__FILE__) + '/../spec_helper') describe OperatingTime do bef...
michaelansel/dukenow
a977700168d4892d76c1447b5b84dc58dc226c08
Continue to rework OperatingTimes to be completely Time based and handle midnight rollovers gracefully
diff --git a/app/models/operating_time.rb b/app/models/operating_time.rb index 54d3ea2..d0c89bc 100644 --- a/app/models/operating_time.rb +++ b/app/models/operating_time.rb @@ -1,153 +1,149 @@ class OperatingTime < ActiveRecord::Base belongs_to :place validates_presence_of :place_id validates_associated :plac...
michaelansel/dukenow
812e6a0d4a9aea16a9cd0188d50fa782fac4a8c6
Set up milestones for database changes
diff --git a/TODO b/TODO index bf2bf63..da82102 100644 --- a/TODO +++ b/TODO @@ -1,80 +1,112 @@ vim:set syntax=todo: Database Places -- has_one :dining_extension \- name (string) -- location (lat/long) -- ?GeoKit Plugin? \- phone_number (string) DiningExtensions -- acts_as_taggable_on...
michaelansel/dukenow
50d00d90a3ab106ca9b2989c42a56e9b439fbf4a
Set up ToDo list for DB schema changes
diff --git a/TODO b/TODO new file mode 100644 index 0000000..bf2bf63 --- /dev/null +++ b/TODO @@ -0,0 +1,80 @@ +vim:set syntax=todo: + +Database + Places + -- has_one :dining_extension + \- name (string) + -- location (lat/long) -- ?GeoKit Plugin? + \- phone_number (string) + DiningExtensions + -- acts...
michaelansel/dukenow
7aa056329cc442461822a0b459aeb13a98e2fdf5
Added ResetDatabase migration to clean up RunCodeRun test database
diff --git a/db/migrate/20090101000000_reset_database.rb b/db/migrate/20090101000000_reset_database.rb new file mode 100644 index 0000000..e7752c9 --- /dev/null +++ b/db/migrate/20090101000000_reset_database.rb @@ -0,0 +1,15 @@ +class ResetDatabase < ActiveRecord::Migration + def self.up + execute 'DELETE FROM sche...
michaelansel/dukenow
fc7277aeba6d64aaa4768ecf1c65f6b27cd640d0
Finish cleanup of Eateries & Regular/SpecialOperatingTimes
diff --git a/db/migrate/20090312163647_create_places.rb b/db/migrate/20090312163647_create_places.rb index 118e4b4..8b1c915 100644 --- a/db/migrate/20090312163647_create_places.rb +++ b/db/migrate/20090312163647_create_places.rb @@ -1,16 +1,15 @@ class CreatePlaces < ActiveRecord::Migration def self.up create_...
michaelansel/dukenow
c53515b588b1a6aa661f673f70ba7e7528cec3c5
Added Place model specs
diff --git a/app/models/place.rb b/app/models/place.rb index 73cbecb..5ba65ad 100644 --- a/app/models/place.rb +++ b/app/models/place.rb @@ -1,103 +1,92 @@ class Place < ActiveRecord::Base has_many :operating_times acts_as_taggable_on :tags + validates_presence_of :name def special_operating_times Ope...
michaelansel/dukenow
981e75312ef06822f787c686020b91e82f83403d
Fixed RSpec scaffolds to at least pass
diff --git a/app/controllers/operating_times_controller.rb b/app/controllers/operating_times_controller.rb index 638b231..59266ea 100644 --- a/app/controllers/operating_times_controller.rb +++ b/app/controllers/operating_times_controller.rb @@ -1,137 +1,138 @@ class OperatingTimesController < ApplicationController ...
michaelansel/dukenow
028321a2a54dea42fb205ba3ecec2774cc1fdfc5
Added RSpec scaffolds (broken)
diff --git a/.autotest b/.autotest deleted file mode 100644 index 3f63d3f..0000000 --- a/.autotest +++ /dev/null @@ -1,31 +0,0 @@ -#vim:set syntax=ruby: -require 'autotest/redgreen.rb' - - - -module Autotest::GnomeNotify - - # Time notification will be displayed before disappearing automatically - EXPIRATION_IN_SECON...
michaelansel/dukenow
8b3bcc11cd492b62d4739b88de801195bfa25218
Manipulate OperatingTimes as Time objects everywhere possible instead of using midnight offsets; Fix unit tests to run between 11PM and 1AM
diff --git a/app/helpers/places_helper.rb b/app/helpers/places_helper.rb index b3d39f6..cf09357 100644 --- a/app/helpers/places_helper.rb +++ b/app/helpers/places_helper.rb @@ -1,139 +1,147 @@ module PlacesHelper # TODO: clean and remove def settimes - @startTime = 0 # hard coded midnight start time for windo...
michaelansel/dukenow
75b4afaa6c38c0270b84a0eced3fef79c984e857
Break up RelativeTimes module because it is not reusable code; Monkey patch in "midnight" method for Date, Time, and DateTime
diff --git a/app/controllers/operating_times_controller.rb b/app/controllers/operating_times_controller.rb index 53a24a2..638b231 100644 --- a/app/controllers/operating_times_controller.rb +++ b/app/controllers/operating_times_controller.rb @@ -1,105 +1,137 @@ class OperatingTimesController < ApplicationController - ...
trek/red-sample-apps
f85cad97d006b3de18e8f4cf1c32cf41bd4cb72e
Sample ribbons app (ruby style)
diff --git a/ribbon_notes/NOTES b/ribbon_notes/NOTES new file mode 100644 index 0000000..249263d --- /dev/null +++ b/ribbon_notes/NOTES @@ -0,0 +1,14 @@ +We'll include and always load a reset.sass + +Generators + model + controller + view + directory with behavior.red, style.sass, structure.haml + + +Build ...