Datasets:
numerata
/
diffs

Dataset card Data Studio Files
xet
 Community
1
repo
string
commit
string
message
string
diff
string
makevoid/voidtools
5da52b18b264f77363bf7a3474f12bbccadf3bc3
fixed view helpers
diff --git a/lib/voidtools/sinatra/view_helpers.rb b/lib/voidtools/sinatra/view_helpers.rb index ff09c13..e633653 100644 --- a/lib/voidtools/sinatra/view_helpers.rb +++ b/lib/voidtools/sinatra/view_helpers.rb @@ -1,50 +1,50 @@ module Voidtools module Sinatra module ViewHelpers - require 'voidtools...
makevoid/voidtools
6fa5b68edafd6822c0d6c2b26819c92cf2216b72
forgot to require
diff --git a/lib/voidtools/sinatra/view_helpers.rb b/lib/voidtools/sinatra/view_helpers.rb index 9513671..bb6eb44 100644 --- a/lib/voidtools/sinatra/view_helpers.rb +++ b/lib/voidtools/sinatra/view_helpers.rb @@ -1,49 +1,50 @@ module Voidtools module Sinatra module ViewHelpers + require 'voidtools...
makevoid/voidtools
7a7c5f007da51a12b34a7ca11a76db6c4d945686
added some paginable doc and fixed pagination links
diff --git a/lib/voidtools/dm/paginable.rb b/lib/voidtools/dm/paginable.rb index 24451da..da288cb 100644 --- a/lib/voidtools/dm/paginable.rb +++ b/lib/voidtools/dm/paginable.rb @@ -1,27 +1,59 @@ +# Paginable +# +# Usage: +# +# in your model add: +# require 'voidtools/dm/paginable' +# inclu...
makevoid/voidtools
74b01064836b585cdb9dab32709901c86209be9c
check if env is not dev
diff --git a/lib/voidtools/sinatra/tracking.rb b/lib/voidtools/sinatra/tracking.rb index b1d7cf9..9fd0df1 100644 --- a/lib/voidtools/sinatra/tracking.rb +++ b/lib/voidtools/sinatra/tracking.rb @@ -1,48 +1,74 @@ +# Voidtools::Tracking + +# Usage: +# +# :javascript +# #{crazyegg} +# #{gauges("id")} + + module...
makevoid/voidtools
63dcc8e47ca247d16d6cb4458be5b2d9558d6673
bad quote
diff --git a/lib/voidtools/sinatra/tracking.rb b/lib/voidtools/sinatra/tracking.rb index efe2204..b1d7cf9 100644 --- a/lib/voidtools/sinatra/tracking.rb +++ b/lib/voidtools/sinatra/tracking.rb @@ -1,48 +1,48 @@ module Voidtools module Tracking def analytics(id, domain) # before the end of head tag <<-FUN ...
makevoid/voidtools
a0c1aeed39796c088f40c54e4c7116a1b008823d
added tracking helpers even for rails3
diff --git a/lib/voidtools.rb b/lib/voidtools.rb index 2bb18dd..024c943 100644 --- a/lib/voidtools.rb +++ b/lib/voidtools.rb @@ -1,33 +1,35 @@ module Voidtools # namespace our plugin and inherit from Rails::Railtie # to get our plugin into the initialization process if defined?(Rails) class Railtie <...
makevoid/voidtools
b511a4ab7a099ee9acc69bb68f03ee2208c30a1c
added tracking helpers
diff --git a/lib/voidtools/sinatra/tracking.rb b/lib/voidtools/sinatra/tracking.rb new file mode 100644 index 0000000..246f743 --- /dev/null +++ b/lib/voidtools/sinatra/tracking.rb @@ -0,0 +1,50 @@ +module Voidtools +module Sinatra +module Tracking + def analytics(id, domain) # before the end of head tag + <<-FUN +...
makevoid/voidtools
61dcae09580177b14815361096a6bd9674095526
added body_class params to css helper
diff --git a/lib/voidtools/sinatra/view_helpers.rb b/lib/voidtools/sinatra/view_helpers.rb index 2ca8899..932bd5f 100644 --- a/lib/voidtools/sinatra/view_helpers.rb +++ b/lib/voidtools/sinatra/view_helpers.rb @@ -1,40 +1,46 @@ module Voidtools module Sinatra module ViewHelpers def link_to(label, path="j...
makevoid/voidtools
2e6d24a7c37e383fbd8b055fc71148aeb238ad06
fixed pagination api
diff --git a/README.md b/README.md index 765c8f6..2c5df9c 100644 --- a/README.md +++ b/README.md @@ -1,36 +1,32 @@ # Voidtools -#### growing toolset for Rails 3 dm+jquery+haml+warden setup flavored with: - - -### building the gem locally and installing it in one line (for trying things and stuff): - -gem build voidtoo...
makevoid/voidtools
d09587c6fafb124996242b20bc9cb651b792538c
added defaults paths for css and js
diff --git a/lib/voidtools/sinatra/view_helpers.rb b/lib/voidtools/sinatra/view_helpers.rb index f2d4658..2ca8899 100644 --- a/lib/voidtools/sinatra/view_helpers.rb +++ b/lib/voidtools/sinatra/view_helpers.rb @@ -1,40 +1,40 @@ module Voidtools module Sinatra module ViewHelpers def link_to(label, path="j...
makevoid/voidtools
282d31a77d79ff95e2b08d1f6801530f229d3a0e
added inclued_js and include_css for sinatra
diff --git a/lib/voidtools/sinatra/view_helpers.rb b/lib/voidtools/sinatra/view_helpers.rb index acfa340..f2d4658 100644 --- a/lib/voidtools/sinatra/view_helpers.rb +++ b/lib/voidtools/sinatra/view_helpers.rb @@ -1,19 +1,40 @@ module Voidtools module Sinatra module ViewHelpers def link_to(label, path="j...
makevoid/voidtools
eb2a9e29a93f80ac2f73615925b6db4e68c1bcda
added deploy and concept
diff --git a/lib/voidtools/cap/deploy.rb b/lib/voidtools/cap/deploy.rb new file mode 100644 index 0000000..69f3cff --- /dev/null +++ b/lib/voidtools/cap/deploy.rb @@ -0,0 +1,152 @@ + +set :application, "thorrents" + +#set :domain, "krikri.makevoid.com" +set :domain, "ovh.makevoid.com" + +# git + +# #set :repo...
makevoid/voidtools
0dcc0007492b7bb14f398839ae4c7d0e8a592a19
generate method broke in two (really)
diff --git a/lib/voidtools/dm/name_url.rb b/lib/voidtools/dm/name_url.rb index 314d703..dd860ff 100644 --- a/lib/voidtools/dm/name_url.rb +++ b/lib/voidtools/dm/name_url.rb @@ -1,27 +1,27 @@ module Voidtools module NameUrl - def generate_url_from_name(name) + def generate_url_from_name name.gsub(/\./, ...
makevoid/voidtools
f53fe6e906f5541ec531258ab97ad174c30de93d
generate method broke in two
diff --git a/lib/voidtools/dm/name_url.rb b/lib/voidtools/dm/name_url.rb index 7747aa0..314d703 100644 --- a/lib/voidtools/dm/name_url.rb +++ b/lib/voidtools/dm/name_url.rb @@ -1,16 +1,27 @@ module Voidtools module NameUrl + def generate_url_from_name(name) + name.gsub(/\./, '').gsub(/'|"/, ' ').gsub(/\s+/,...
makevoid/voidtools
86ce124aac85bf3c9863ab68d1884098aee54a26
added dm not_found controller mixin
diff --git a/README.md b/README.md index e23a890..765c8f6 100644 --- a/README.md +++ b/README.md @@ -1,30 +1,36 @@ # Voidtools #### growing toolset for Rails 3 dm+jquery+haml+warden setup flavored with: + +### building the gem locally and installing it in one line (for trying things and stuff): + +gem build voidtoo...
makevoid/voidtools
fbbf788cf84adab90af1f2650c9605758daa8749
version bump
diff --git a/lib/voidtools/version.rb b/lib/voidtools/version.rb index bcc5dc5..3f16aad 100644 --- a/lib/voidtools/version.rb +++ b/lib/voidtools/version.rb @@ -1,3 +1,3 @@ module Voidtools - VERSION = "0.2.0" + VERSION = "0.2.1" end \ No newline at end of file
makevoid/voidtools
d24d7342712d908f5b371c9bf486779a4428f256
link_to changed: second parameter is now optional
diff --git a/lib/voidtools/sinatra/view_helpers.rb b/lib/voidtools/sinatra/view_helpers.rb index e4e1e1f..9609fb2 100644 --- a/lib/voidtools/sinatra/view_helpers.rb +++ b/lib/voidtools/sinatra/view_helpers.rb @@ -1,16 +1,16 @@ module Voidtools module Sinatra module ViewHelpers - def link_to(label, path) +...
makevoid/voidtools
f551a5c341878aaecf102248c720ab2250e9c804
newline fix
diff --git a/lib/voidtools/sinatra/view_helpers.rb b/lib/voidtools/sinatra/view_helpers.rb index 77362ba..e4e1e1f 100644 --- a/lib/voidtools/sinatra/view_helpers.rb +++ b/lib/voidtools/sinatra/view_helpers.rb @@ -1,15 +1,16 @@ module Voidtools module Sinatra module ViewHelpers def link_to(label, path) -...
makevoid/voidtools
7d9ebb90c8d8629382696f00afbbf8b01ec0b69e
rolling back
diff --git a/lib/voidtools.rb b/lib/voidtools.rb index 9d978c7..2bb18dd 100644 --- a/lib/voidtools.rb +++ b/lib/voidtools.rb @@ -1,37 +1,33 @@ -if defined?(Rails) - module Voidtools - # namespace our plugin and inherit from Rails::Railtie - # to get our plugin into the initialization process - +module Voidtools ...
makevoid/voidtools
fd73d3d3408ccafca1f2d72fe29836812c923b76
changes
diff --git a/lib/voidtools.rb b/lib/voidtools.rb index 2bb18dd..9d978c7 100644 --- a/lib/voidtools.rb +++ b/lib/voidtools.rb @@ -1,33 +1,37 @@ -module Voidtools - - # namespace our plugin and inherit from Rails::Railtie - # to get our plugin into the initialization process - if defined?(Rails) +if defined?(Rails) ...
makevoid/voidtools
0a5c31c54e8124b834f02a3c7b51c4bd502822ee
version bump
diff --git a/lib/voidtools/version.rb b/lib/voidtools/version.rb index e3e5c22..bcc5dc5 100644 --- a/lib/voidtools/version.rb +++ b/lib/voidtools/version.rb @@ -1,3 +1,3 @@ module Voidtools - VERSION = "0.1.2" + VERSION = "0.2.0" end \ No newline at end of file
makevoid/voidtools
d9533c3b297cf71b892af24df287fbb8866d2b31
voidtools 4 sinatra fixed
diff --git a/lib/voidtools.rb b/lib/voidtools.rb index b0ec0c4..2bb18dd 100644 --- a/lib/voidtools.rb +++ b/lib/voidtools.rb @@ -1,29 +1,33 @@ module Voidtools # namespace our plugin and inherit from Rails::Railtie # to get our plugin into the initialization process if defined?(Rails) class Railtie <...
makevoid/voidtools
fb7af87a35547ddcf5cebd624d072b2a0ce81f95
check if is a rails app
diff --git a/lib/voidtools.rb b/lib/voidtools.rb index 1d8b6b1..b0ec0c4 100644 --- a/lib/voidtools.rb +++ b/lib/voidtools.rb @@ -1,27 +1,29 @@ module Voidtools # namespace our plugin and inherit from Rails::Railtie # to get our plugin into the initialization process - class Railtie < Rails::Railtie + if de...
makevoid/voidtools
9980b689b52f580383495d68d4b1c5549427f9cf
added view helpers for sinatra
diff --git a/lib/voidtools/sinatra/view_helpers.rb b/lib/voidtools/sinatra/view_helpers.rb new file mode 100644 index 0000000..7b97578 --- /dev/null +++ b/lib/voidtools/sinatra/view_helpers.rb @@ -0,0 +1,13 @@ +module VoidTools + module ViewHelpers + def link_to(label, path) + haml_tag :a, { href: path } do + ...
makevoid/voidtools
141e3485f5438b26378ffa09a6dca1095437b877
renamed datamapper to dm
diff --git a/lib/voidtools.rb b/lib/voidtools.rb index 505e2e4..a8a001f 100644 --- a/lib/voidtools.rb +++ b/lib/voidtools.rb @@ -1,25 +1,25 @@ module Voidtools # namespace our plugin and inherit from Rails::Railtie # to get our plugin into the initialization process class Railtie < Rails::Railtie ...
makevoid/voidtools
787e1f23a15663da3382283e5216fca0c0b106fc
housekeeping
diff --git a/lib/voidtools/version.rb b/lib/voidtools/version.rb index d8984e4..e3e5c22 100644 --- a/lib/voidtools/version.rb +++ b/lib/voidtools/version.rb @@ -1,3 +1,3 @@ module Voidtools - VERSION = "0.1" + VERSION = "0.1.2" end \ No newline at end of file diff --git a/voidtools-0.1.gem b/voidtools-0.1.gem delet...
makevoid/voidtools
9b471b9262c1432a112c870987b58809f5b1dd55
name url
diff --git a/lib/voidtools/datamapper/name_url.rb b/lib/voidtools/datamapper/name_url.rb index cb15b24..cf9d391 100644 --- a/lib/voidtools/datamapper/name_url.rb +++ b/lib/voidtools/datamapper/name_url.rb @@ -1,14 +1,14 @@ module NameUrl def generate_name_url - name_url = name.gsub(/'|"/, ' ').gsub(/\s+/, '_').d...
makevoid/voidtools
f1353e9c2d281f99908eeb4a9dd817f98995dcb2
name url fix
diff --git a/lib/voidtools/datamapper/name_url.rb b/lib/voidtools/datamapper/name_url.rb index cb34161..cb15b24 100644 --- a/lib/voidtools/datamapper/name_url.rb +++ b/lib/voidtools/datamapper/name_url.rb @@ -1,13 +1,14 @@ module NameUrl def generate_name_url - update(name_url: name.gsub(/'|"/, ' ').gsub(/\s+/, ...
makevoid/voidtools
cfd2aec0775d52bc729a2a90da286606f875c6c6
added name url basic module (move outside datamapper)
diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..06de90a --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +.bundle \ No newline at end of file diff --git a/lib/voidtools/datamapper/name_url.rb b/lib/voidtools/datamapper/name_url.rb new file mode 100644 index 0000000..cb34161 --- /dev/null +++ b/lib/...
dreamer/zapisy_zosia
a5996d977ec91e9cc2b3b560c206368e6e376412
filtry
diff --git a/newrooms/admin.py b/newrooms/admin.py index 67b4799..80f1677 100644 --- a/newrooms/admin.py +++ b/newrooms/admin.py @@ -1,15 +1,17 @@ from django.contrib import admin from models import * class NewroomsAdmin(admin.ModelAdmin): list_display = ['number','capacity','locators'] def locator...
dreamer/zapisy_zosia
939e17f3a81413c23a424fd1d402afaab66c3534
program fix
diff --git a/lectures/templates/program.html b/lectures/templates/program.html index cd110fd..3402cde 100644 --- a/lectures/templates/program.html +++ b/lectures/templates/program.html @@ -1,324 +1,324 @@ {% extends "index.html"%} {% load i18n %} {% load markup %} {% block css %} .lecture p, #lecture_abstract ...
dreamer/zapisy_zosia
ee4975613fffae55ae6bc9fdb8f6db58d908fee8
różne poprawki
diff --git a/common/helpers.py b/common/helpers.py index 3489a7b..fa63960 100644 --- a/common/helpers.py +++ b/common/helpers.py @@ -1,68 +1,68 @@ # -*- coding: UTF-8 -*- from datetime import datetime, timedelta from registration.models import UserPreferences from common.models import ZosiaDefinition from django.h...
dreamer/zapisy_zosia
032528dc4e88729caed78ada9426fa8e6294a60c
program
diff --git a/lectures/templates/program.html b/lectures/templates/program.html index 3b2ac32..9e1eb55 100644 --- a/lectures/templates/program.html +++ b/lectures/templates/program.html @@ -1,268 +1,318 @@ {% extends "index.html"%} {% load i18n %} {% load markup %} {% block css %} .lecture p, #lecture_abstract ...
dreamer/zapisy_zosia
b66b1cb4989f5803b75420fa71fc81d577db728f
wyłączenie zmiany autubusu
diff --git a/registration/forms.py b/registration/forms.py index d65a941..d3211e0 100644 --- a/registration/forms.py +++ b/registration/forms.py @@ -1,175 +1,175 @@ # -*- coding: UTF-8 -*- from django import forms from django.forms.models import ModelForm from models import SHIRT_SIZE_CHOICES, SHIRT_TYPES_CHOICES...
dreamer/zapisy_zosia
8eac97f3feb819b21999ef3670f986416824db23
fix na zapisy
diff --git a/common/helpers.py b/common/helpers.py index 5b4e498..3489a7b 100644 --- a/common/helpers.py +++ b/common/helpers.py @@ -1,64 +1,68 @@ # -*- coding: UTF-8 -*- from datetime import datetime, timedelta from registration.models import UserPreferences from common.models import ZosiaDefinition from django.h...
dreamer/zapisy_zosia
f25034b395b37fc25dde661e515bd16d4fab101b
regulamin
diff --git a/registration/templates/change_preferences.html b/registration/templates/change_preferences.html index 81900c8..be8b236 100644 --- a/registration/templates/change_preferences.html +++ b/registration/templates/change_preferences.html @@ -1,274 +1,276 @@ {% extends "index.html"%} {% load i18n %} {% block...
dreamer/zapisy_zosia
e7acdc2dd2a4f2292086afeee819719aa10adae6
pokoje
diff --git a/registration/templatetags/time_block_helpers.py b/registration/templatetags/time_block_helpers.py index e713ec8..f510672 100644 --- a/registration/templatetags/time_block_helpers.py +++ b/registration/templatetags/time_block_helpers.py @@ -1,23 +1,22 @@ # -*- coding: UTF-8 -*- from django import templa...
dreamer/zapisy_zosia
858460fdae5d11a1ce53c82fae1700722bbac62c
import pokoi
diff --git a/newrooms/management/__init__.py b/newrooms/management/__init__.py new file mode 100644 index 0000000..7fa60ba --- /dev/null +++ b/newrooms/management/__init__.py @@ -0,0 +1 @@ +__author__ = 'maciek' diff --git a/newrooms/management/commands/__init__.py b/newrooms/management/commands/__init__.py new file mo...
dreamer/zapisy_zosia
ba0a0b2d5c604f3e338ef871c44a74d9aea68bce
goooogle
diff --git a/blog/templates/blog.html b/blog/templates/blog.html index 3586fbf..2c7265d 100644 --- a/blog/templates/blog.html +++ b/blog/templates/blog.html @@ -1,76 +1,76 @@ {% extends "index.html" %} {% load cache %} {% cache 120 blog_template %} {% load markup %} {% load blurb_edit %} {% block content %} ...
dreamer/zapisy_zosia
327c8fe686867375b098bf1ed58817eb9de37ebd
change preferences fix
diff --git a/registration/views.py b/registration/views.py index 3a5a542..f7bdc5a 100644 --- a/registration/views.py +++ b/registration/views.py @@ -1,308 +1,310 @@ # -*- coding: UTF-8 -*- from django.shortcuts import render_to_response, HttpResponse from django.http import HttpResponseRedirect, Http404 from djan...
dreamer/zapisy_zosia
8a66696b780f90cb87972bc9847fc68598e1c38e
bus_hour validator
diff --git a/registration/forms.py b/registration/forms.py index 7b4d385..d65a941 100644 --- a/registration/forms.py +++ b/registration/forms.py @@ -1,175 +1,175 @@ # -*- coding: UTF-8 -*- from django import forms from django.forms.models import ModelForm from models import SHIRT_SIZE_CHOICES, SHIRT_TYPES_CHOICES...
dreamer/zapisy_zosia
c03e20dcdcc72487614e3c14bfc0354a115349f4
fix bus_hour validator
diff --git a/registration/forms.py b/registration/forms.py index c5f872d..7b4d385 100644 --- a/registration/forms.py +++ b/registration/forms.py @@ -1,167 +1,175 @@ # -*- coding: UTF-8 -*- from django import forms from django.forms.models import ModelForm from models import SHIRT_SIZE_CHOICES, SHIRT_TYPES_CHOICES...
dreamer/zapisy_zosia
b98e7b1cc1ca689b03155876b0f48f94b773cffc
limit autocars
diff --git a/registration/forms.py b/registration/forms.py index 8b0007a..c5f872d 100644 --- a/registration/forms.py +++ b/registration/forms.py @@ -1,148 +1,167 @@ # -*- coding: UTF-8 -*- from django import forms from django.forms.models import ModelForm from models import SHIRT_SIZE_CHOICES, SHIRT_TYPES_CHOICES...
dreamer/zapisy_zosia
0753e526659f30381c10274640a11d16059fca98
sposorzy
diff --git a/blog/templates/blog.html b/blog/templates/blog.html index 2c7265d..3586fbf 100644 --- a/blog/templates/blog.html +++ b/blog/templates/blog.html @@ -1,76 +1,76 @@ {% extends "index.html" %} {% load cache %} {% cache 120 blog_template %} {% load markup %} {% load blurb_edit %} {% block content %} ...
dreamer/zapisy_zosia
6f1bfe6b8cb0a42e0d0942cf8d0aca5dcaed489c
sposorzy
diff --git a/blog/templates/blog.html b/blog/templates/blog.html index c48c2fc..2c7265d 100644 --- a/blog/templates/blog.html +++ b/blog/templates/blog.html @@ -1,76 +1,76 @@ {% extends "index.html" %} {% load cache %} {% cache 120 blog_template %} {% load markup %} {% load blurb_edit %} {% block content %} ...
dreamer/zapisy_zosia
d1acd7af25bfee1a758276404ee035679f975403
sponsorzy
diff --git a/blog/templates/blog.html b/blog/templates/blog.html index cf567a7..c48c2fc 100644 --- a/blog/templates/blog.html +++ b/blog/templates/blog.html @@ -1,75 +1,76 @@ {% extends "index.html" %} {% load cache %} {% cache 120 blog_template %} {% load markup %} {% load blurb_edit %} {% block content %} ...
dreamer/zapisy_zosia
2c31ed4b67c7fe12088172a41a0e8afb78cfd501
sponsorzy
diff --git a/blog/templates/blog.html b/blog/templates/blog.html index 6df82db..cf567a7 100644 --- a/blog/templates/blog.html +++ b/blog/templates/blog.html @@ -1,76 +1,75 @@ {% extends "index.html" %} {% load cache %} {% cache 120 blog_template %} {% load markup %} {% load blurb_edit %} {% block content %} ...
dreamer/zapisy_zosia
93ebee0ba25681e16c21925a092bfc60ed7647a4
aktualizacja wygladu|
diff --git a/blog/templates/blog.html b/blog/templates/blog.html index a1329cf..6df82db 100644 --- a/blog/templates/blog.html +++ b/blog/templates/blog.html @@ -1,87 +1,76 @@ -{% extends "index.html"%} +{% extends "index.html" %} {% load cache %} {% cache 120 blog_template %} {% load markup %} {% load blurb_edit ...
dreamer/zapisy_zosia
4d64b3312571870ece004f44a3925b192af7dc18
images
diff --git a/blog/templates/blog.html b/blog/templates/blog.html index 470ee0a..a1329cf 100644 --- a/blog/templates/blog.html +++ b/blog/templates/blog.html @@ -1,83 +1,87 @@ {% extends "index.html"%} {% load cache %} {% cache 120 blog_template %} {% load markup %} {% load blurb_edit %} {% block content %} {...
dreamer/zapisy_zosia
c7ac31c97c8fbd517eb96902e92cab09a353d6f5
correct email
diff --git a/blog/templates/blog.html b/blog/templates/blog.html index 9b9a5e4..470ee0a 100644 --- a/blog/templates/blog.html +++ b/blog/templates/blog.html @@ -1,83 +1,83 @@ {% extends "index.html"%} {% load cache %} {% cache 120 blog_template %} {% load markup %} {% load blurb_edit %} {% block content %} {...
dreamer/zapisy_zosia
489593f9f38e616037894c1c738dcf66aa59bd98
forms fix
diff --git a/registration/forms.py b/registration/forms.py index 0b8a1e4..8b0007a 100644 --- a/registration/forms.py +++ b/registration/forms.py @@ -1,148 +1,148 @@ # -*- coding: UTF-8 -*- from django import forms from django.forms.models import ModelForm from models import SHIRT_SIZE_CHOICES, SHIRT_TYPES_CHOICES...
dreamer/zapisy_zosia
46be5a395c125e30f5969646368cfc2429d36e8f
registration fix
diff --git a/registration/forms.py b/registration/forms.py index 7a12b51..0b8a1e4 100644 --- a/registration/forms.py +++ b/registration/forms.py @@ -1,167 +1,148 @@ # -*- coding: UTF-8 -*- -from django import forms +from django import forms +from django.forms.models import ModelForm from models import SHIRT_SIZE_C...
dreamer/zapisy_zosia
a17ceda59b2655f671ab3bb8f80e70b26392e0b6
registration fix
diff --git a/registration/forms.py b/registration/forms.py index d55e55c..7a12b51 100644 --- a/registration/forms.py +++ b/registration/forms.py @@ -1,162 +1,167 @@ # -*- coding: UTF-8 -*- from django import forms from models import SHIRT_SIZE_CHOICES, SHIRT_TYPES_CHOICES, BUS_HOUR_CHOICES from models import get...
dreamer/zapisy_zosia
b51c19d27b88b62d0524776832a5a1a51b3f9ae2
better ChangePrefsForm
diff --git a/registration/forms.py b/registration/forms.py index 16ad223..d55e55c 100644 --- a/registration/forms.py +++ b/registration/forms.py @@ -1,170 +1,162 @@ # -*- coding: UTF-8 -*- from django import forms from models import SHIRT_SIZE_CHOICES, SHIRT_TYPES_CHOICES, BUS_HOUR_CHOICES from models import get...
dreamer/zapisy_zosia
1a20744f0a10bab8ae7fdd615dccb01ec8f9af73
longer account number
diff --git a/common/models.py b/common/models.py index 1d4d7cd..e2d0e19 100644 --- a/common/models.py +++ b/common/models.py @@ -1,35 +1,35 @@ # -*- coding: UTF-8 -*- from django.db import models from datetime import datetime class ZosiaDefinition(models.Model): active_definition = models.BooleanField() ...
dreamer/zapisy_zosia
4bc61d5bce1cc7558b1b3336b9a920247de5e5b6
More E -> M
diff --git a/registration/templates/regulations.html b/registration/templates/regulations.html index fcece74..799ff76 100644 --- a/registration/templates/regulations.html +++ b/registration/templates/regulations.html @@ -1,84 +1,84 @@ {% extends "index.html" %} {% load i18n %} {% block css %} ol ol { list-style-...
dreamer/zapisy_zosia
ac76da0c15ae308ce2a99865752323350255cce1
E for date formatting doesn't work with Django 1.1
diff --git a/registration/templates/regulations.html b/registration/templates/regulations.html index fd8d878..fcece74 100644 --- a/registration/templates/regulations.html +++ b/registration/templates/regulations.html @@ -1,84 +1,84 @@ {% extends "index.html" %} {% load i18n %} {% block css %} ol ol { list-style-...
dreamer/zapisy_zosia
87bb0c84c2dc8a055635a2c66df03a734011a32f
Fixed password input pattern
diff --git a/registration/templates/register_form.html b/registration/templates/register_form.html index 6b04bdc..d181242 100644 --- a/registration/templates/register_form.html +++ b/registration/templates/register_form.html @@ -1,266 +1,266 @@ {% extends "index.html"%} {% load i18n %} {% block css %} #register_n...
dreamer/zapisy_zosia
9a55100498f18f26bbff024c9e51c44e8172b23b
Revert "Show me if payment is ok in this moment"
diff --git a/registration/templates/change_preferences.html b/registration/templates/change_preferences.html index f221f17..8e9d1c9 100644 --- a/registration/templates/change_preferences.html +++ b/registration/templates/change_preferences.html @@ -1,284 +1,283 @@ {% extends "index.html"%} {% load i18n %} {% block...
dreamer/zapisy_zosia
525885542adae93ec88d4d1ef673bd0621a1a340
Show me if payment is ok in this moment
diff --git a/registration/templates/change_preferences.html b/registration/templates/change_preferences.html index 8e9d1c9..f221f17 100644 --- a/registration/templates/change_preferences.html +++ b/registration/templates/change_preferences.html @@ -1,283 +1,284 @@ {% extends "index.html"%} {% load i18n %} {% block...
dreamer/zapisy_zosia
33a8ce4114745ce53afdff83e5cf8a8d32bd45fd
Quick fix for unnecessary bus hour
diff --git a/registration/forms.py b/registration/forms.py index f50940a..16ad223 100644 --- a/registration/forms.py +++ b/registration/forms.py @@ -1,170 +1,170 @@ # -*- coding: UTF-8 -*- from django import forms from models import SHIRT_SIZE_CHOICES, SHIRT_TYPES_CHOICES, BUS_HOUR_CHOICES from models import get...
dreamer/zapisy_zosia
1abb07eb389a79c99580f7793563c4dd2b1e2247
fine with Django 1.1
diff --git a/registration/models.py b/registration/models.py index e5e9e2a..26649e0 100644 --- a/registration/models.py +++ b/registration/models.py @@ -1,115 +1,115 @@ # -*- coding: UTF-8 -*- from django.db import models from django.contrib.auth.models import User from django.utils.translation import ugettext as...
dreamer/zapisy_zosia
3cb1a24e412aaa2cbc775d36b6bd79f4356e49f0
no more hardcoded data
diff --git a/README b/README index 4b873a9..a7196cd 100644 --- a/README +++ b/README @@ -1,150 +1,149 @@ LEGAL STUFF "THE BEER/PIZZA-WARE LICENSE" (Revision 42): <dreamer.tan@gmail.com> wrote this file. As long as you retain this notice you can do whatever you want with this stuff. If we meet some day, and you th...
dreamer/zapisy_zosia
ffe5da554a1431116e9256dfbab426608a33092f
no more hardcoded data
diff --git a/README b/README index ef033da..4b873a9 100644 --- a/README +++ b/README @@ -1,149 +1,150 @@ LEGAL STUFF "THE BEER/PIZZA-WARE LICENSE" (Revision 42): <dreamer.tan@gmail.com> wrote this file. As long as you retain this notice you can do whatever you want with this stuff. If we meet some day, and you th...
dreamer/zapisy_zosia
c9e9d72d421e54308f915ab3648e2cad45237b1d
no more hardcoded data
diff --git a/scripts/rooms_csv_to_json.py b/scripts/rooms_csv_to_json.py new file mode 100644 index 0000000..92c7eb2 --- /dev/null +++ b/scripts/rooms_csv_to_json.py @@ -0,0 +1,2 @@ +__author__ = 'dominika' + \ No newline at end of file
dreamer/zapisy_zosia
04c95ed4b95fd260da0ffb6de2c84b3780e87731
Changes in preparation for 2012
diff --git a/blog/templates/blog.html b/blog/templates/blog.html index 673180a..10ae36e 100644 --- a/blog/templates/blog.html +++ b/blog/templates/blog.html @@ -1,82 +1,83 @@ {% extends "index.html"%} {% load cache %} {% cache 120 blog_template %} {% load markup %} {% load blurb_edit %} {% block content %} {...
dreamer/zapisy_zosia
e1d794f7a84743c355479fa5eb7071372126454d
favicon at last :)
diff --git a/static_media/images/favicon.png b/static_media/images/favicon.png new file mode 100644 index 0000000..b7a583e Binary files /dev/null and b/static_media/images/favicon.png differ diff --git a/templates/index.html b/templates/index.html index 88cfd8e..bdf51ae 100644 --- a/templates/index.html +++ b/templates...
dreamer/zapisy_zosia
6eff8350594bd2fd42b92703310f413bd6bbdceb
Fix django 1.0 admin urls
diff --git a/urls.py b/urls.py index 23d126d..6acad32 100644 --- a/urls.py +++ b/urls.py @@ -1,90 +1,90 @@ import os from django.conf.urls.defaults import * from django.contrib import admin import registration.views import blog.views import lectures.views import newrooms.views import common.views from blog...
dreamer/zapisy_zosia
8622f2d0495db9eab38389b3f4145f0250d5da3e
Few changes
diff --git a/lectures/templates/program.html b/lectures/templates/program.html index 7a54711..3b2ac32 100644 --- a/lectures/templates/program.html +++ b/lectures/templates/program.html @@ -1,268 +1,268 @@ {% extends "index.html"%} {% load i18n %} {% load markup %} {% block css %} .lecture p, #lecture_abstract ...
dreamer/zapisy_zosia
1907c0dfd1e3a26924b4bdd16bb90a7a20de587f
Few changes
diff --git a/lectures/templates/program.html b/lectures/templates/program.html index 496ab97..7a54711 100644 --- a/lectures/templates/program.html +++ b/lectures/templates/program.html @@ -1,268 +1,268 @@ {% extends "index.html"%} {% load i18n %} {% load markup %} {% block css %} .lecture p, #lecture_abstract ...
dreamer/zapisy_zosia
e0320978cd837df0afe48296ffaeda0f787d28a6
Few changes
diff --git a/lectures/templates/program.html b/lectures/templates/program.html index 393da0d..496ab97 100644 --- a/lectures/templates/program.html +++ b/lectures/templates/program.html @@ -1,268 +1,268 @@ {% extends "index.html"%} {% load i18n %} {% load markup %} {% block css %} .lecture p, #lecture_abstract ...
dreamer/zapisy_zosia
a67af8ae8d211ee9cc1a31362e478fb3ab25d44c
Few changes
diff --git a/lectures/templates/program.html b/lectures/templates/program.html index 2d3afe0..ee74a4a 100644 --- a/lectures/templates/program.html +++ b/lectures/templates/program.html @@ -1,266 +1,268 @@ {% extends "index.html"%} {% load i18n %} {% load markup %} {% block css %} .lecture p, #lecture_abstract ...
dreamer/zapisy_zosia
1d5d46eae2521b875d182d8b81527b54d97d7d3a
my lecture
diff --git a/lectures/templates/program.html b/lectures/templates/program.html index 2d3afe0..06688a0 100644 --- a/lectures/templates/program.html +++ b/lectures/templates/program.html @@ -1,266 +1,266 @@ {% extends "index.html"%} {% load i18n %} {% load markup %} {% block css %} .lecture p, #lecture_abstract ...
dreamer/zapisy_zosia
9e97ff517d021678eb58b90d73ec1be787f81327
Few changes
diff --git a/lectures/templates/lectures.html b/lectures/templates/lectures.html index f20b2c9..f631521 100644 --- a/lectures/templates/lectures.html +++ b/lectures/templates/lectures.html @@ -1,212 +1,213 @@ {% extends "index.html"%} {% load i18n %} {% load markup %} {% block css %} .lecture p, #lecture_abstr...
dreamer/zapisy_zosia
6c6b58548492e457ccf6adfd2266d92abdfdd71f
Few changes
diff --git a/lectures/templates/program.html b/lectures/templates/program.html index 288fc44..2d3afe0 100644 --- a/lectures/templates/program.html +++ b/lectures/templates/program.html @@ -1,247 +1,266 @@ {% extends "index.html"%} {% load i18n %} {% load markup %} {% block css %} .lecture p, #lecture_abstract ...
dreamer/zapisy_zosia
3ed54863696bad4072ba95a959bcdecae8c7d3e1
Few changes
diff --git a/lectures/templates/program.html b/lectures/templates/program.html index 0681189..288fc44 100644 --- a/lectures/templates/program.html +++ b/lectures/templates/program.html @@ -1,219 +1,247 @@ {% extends "index.html"%} {% load i18n %} {% load markup %} {% block css %} .lecture p, #lecture_abstract ...
dreamer/zapisy_zosia
0b62acb04585931fdab9d2827579f7cdeb290d77
Few changes
diff --git a/lectures/templates/program.html b/lectures/templates/program.html index a8c6b01..0681189 100644 --- a/lectures/templates/program.html +++ b/lectures/templates/program.html @@ -1,219 +1,219 @@ {% extends "index.html"%} {% load i18n %} {% load markup %} {% block css %} .lecture p, #lecture_abstract ...
dreamer/zapisy_zosia
dff4432730ef5b030f72d0e55ac939d88ee287ce
Few changes
diff --git a/lectures/templates/program.html b/lectures/templates/program.html index 1e2511b..a8c6b01 100644 --- a/lectures/templates/program.html +++ b/lectures/templates/program.html @@ -1,215 +1,219 @@ {% extends "index.html"%} {% load i18n %} {% load markup %} {% block css %} .lecture p, #lecture_abstract ...
dreamer/zapisy_zosia
1b37a5e35a3ec8df4ab10318b9109ccf90babe7e
Few changes
diff --git a/lectures/templates/program.html b/lectures/templates/program.html index d5e421f..1e2511b 100644 --- a/lectures/templates/program.html +++ b/lectures/templates/program.html @@ -1,232 +1,215 @@ {% extends "index.html"%} {% load i18n %} {% load markup %} {% block css %} .lecture p, #lecture_abstract ...
dreamer/zapisy_zosia
31eec9e985607eac89080a6a69f52f019d0572e1
Few changes
diff --git a/lectures/templates/lectures.html b/lectures/templates/lectures.html index bea929d..f20b2c9 100644 --- a/lectures/templates/lectures.html +++ b/lectures/templates/lectures.html @@ -1,212 +1,212 @@ {% extends "index.html"%} {% load i18n %} {% load markup %} {% block css %} .lecture p, #lecture_abstr...
dreamer/zapisy_zosia
eba05ab10afe7661ae4b4628186bb496850b3e0b
Ending records
diff --git a/common/helpers.py b/common/helpers.py index 233455b..8cccf33 100644 --- a/common/helpers.py +++ b/common/helpers.py @@ -1,46 +1,46 @@ # -*- coding: UTF-8 -*- from datetime import datetime, timedelta from registration.models import UserPreferences # TODO: this module should be replaced by calls to dat...
dreamer/zapisy_zosia
8028a66bec0d3cd88c3ca6891c9645cc442dfc1e
Few changes
diff --git a/lectures/templates/lectures.html b/lectures/templates/lectures.html index d3a183d..bea929d 100644 --- a/lectures/templates/lectures.html +++ b/lectures/templates/lectures.html @@ -1,213 +1,212 @@ {% extends "index.html"%} {% load i18n %} {% load markup %} {% block css %} .lecture p, #lecture_abstr...
dreamer/zapisy_zosia
4520bb227d35902a0f5c657963fa3c1b55a34d2b
Few changes
diff --git a/lectures/templates/program.html b/lectures/templates/program.html index 390bc13..bfb2b0a 100644 --- a/lectures/templates/program.html +++ b/lectures/templates/program.html @@ -1,232 +1,232 @@ {% extends "index.html"%} {% load i18n %} {% load markup %} {% block css %} .lecture p, #lecture_abstract ...
dreamer/zapisy_zosia
503df88f48d22dd831949d53ac5e0a99539a1007
Few changes
diff --git a/lectures/templates/lectures.html b/lectures/templates/lectures.html index faadc6f..d3a183d 100644 --- a/lectures/templates/lectures.html +++ b/lectures/templates/lectures.html @@ -1,192 +1,213 @@ {% extends "index.html"%} {% load i18n %} {% load markup %} {% block css %} .lecture p, #lecture_abstr...
dreamer/zapisy_zosia
09b0f78dc74bb556bf3a87afe938b6fca096fbbd
Few changes
diff --git a/lectures/templates/program.html b/lectures/templates/program.html index e43e5e9..ae2c6fc 100644 --- a/lectures/templates/program.html +++ b/lectures/templates/program.html @@ -1,211 +1,214 @@ {% extends "index.html"%} {% load i18n %} {% load markup %} {% block css %} .lecture p, #lecture_abstract ...
dreamer/zapisy_zosia
e2aeb55aa618d582f66ce7e610c99e05954c1222
Added links in /program/ for sign in users
diff --git a/lectures/views.py b/lectures/views.py index 607b306..a7ed30d 100644 --- a/lectures/views.py +++ b/lectures/views.py @@ -1,38 +1,39 @@ # -*- coding: UTF-8 -*- from django.utils.translation import ugettext as _ from django.http import * from django.template import Context from django.template.loader i...
dreamer/zapisy_zosia
420eca2a814318de2cb17fa951c54dcad41eac3e
More info about lectures and program
diff --git a/lectures/templates/lectures.html b/lectures/templates/lectures.html index 426d85a..faadc6f 100644 --- a/lectures/templates/lectures.html +++ b/lectures/templates/lectures.html @@ -1,171 +1,192 @@ {% extends "index.html"%} {% load i18n %} {% load markup %} {% block css %} .lecture p, #lecture_abstr...
dreamer/zapisy_zosia
3b3a8d95eeff731d3022ba25517d37cf39b0a1c4
Added program of zosia11
diff --git a/lectures/templates/program.html b/lectures/templates/program.html new file mode 100644 index 0000000..94084ed --- /dev/null +++ b/lectures/templates/program.html @@ -0,0 +1,206 @@ +{% extends "index.html"%} +{% load i18n %} +{% load markup %} + +{% block css %} + +.lecture p, #lecture_abstract { + text-ind...
dreamer/zapisy_zosia
62301ef1498ff6f4de9ff8a649de09b0dab60f1c
20 -> 18
diff --git a/blog/templates/blog.html b/blog/templates/blog.html index bf43c42..673180a 100644 --- a/blog/templates/blog.html +++ b/blog/templates/blog.html @@ -1,82 +1,82 @@ {% extends "index.html"%} {% load cache %} {% cache 120 blog_template %} {% load markup %} {% load blurb_edit %} {% block content %} {...
dreamer/zapisy_zosia
f7f5d3cb0f1d346ed53f20cef20957a471dd48cf
Zmien preferencje -> Moje preferencje
diff --git a/locale/pl/LC_MESSAGES/django.mo b/locale/pl/LC_MESSAGES/django.mo index dee1d77..0c5454b 100644 Binary files a/locale/pl/LC_MESSAGES/django.mo and b/locale/pl/LC_MESSAGES/django.mo differ diff --git a/locale/pl/LC_MESSAGES/django.po b/locale/pl/LC_MESSAGES/django.po index 645c9aa..b0a6b11 100644 --- a/loca...
dreamer/zapisy_zosia
19cc4b6b65d2bb8a8e6f3d6eea73aa76c16d43b7
ustawienia -> preferencje
diff --git a/locale/pl/LC_MESSAGES/django.mo b/locale/pl/LC_MESSAGES/django.mo index cd970a9..dee1d77 100644 Binary files a/locale/pl/LC_MESSAGES/django.mo and b/locale/pl/LC_MESSAGES/django.mo differ diff --git a/locale/pl/LC_MESSAGES/django.po b/locale/pl/LC_MESSAGES/django.po index 22cdc20..645c9aa 100644 --- a/loca...
sila/AtomProject
830e7260350232e0205b468d27cca7af9305089b
comment designer reference
diff --git a/Atom.Web/AutoComplete/JQAutoComplete.cs b/Atom.Web/AutoComplete/JQAutoComplete.cs index 228228f..32301aa 100644 --- a/Atom.Web/AutoComplete/JQAutoComplete.cs +++ b/Atom.Web/AutoComplete/JQAutoComplete.cs @@ -1,60 +1,60 @@ using System; using System.Collections.Generic; using System.Linq; using Sy...
sila/AtomProject
26c2da46181332b5bd01e2da9de3f41e39300d17
add instance of autocomlete control
diff --git a/Atom.Web/Atom.Web.csproj b/Atom.Web/Atom.Web.csproj index dbb1742..09aaeae 100644 --- a/Atom.Web/Atom.Web.csproj +++ b/Atom.Web/Atom.Web.csproj @@ -1,106 +1,106 @@ <?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/m...
sila/AtomProject
632c0d4b682c4caeafff7b8259e3b7a1f80501ac
add prefix for autocomplete namespace
diff --git a/Atom.Web/Atom.Web.csproj b/Atom.Web/Atom.Web.csproj index dbb1742..09aaeae 100644 --- a/Atom.Web/Atom.Web.csproj +++ b/Atom.Web/Atom.Web.csproj @@ -1,106 +1,106 @@ <?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/m...
sila/AtomProject
715bde0790be9f75051080cbe3ceacd8eb5b05ac
add base structure for JQAutocomplete
diff --git a/Atom.Web/AutoComplete/JQAutoComplete.cs b/Atom.Web/AutoComplete/JQAutoComplete.cs index 5be7392..228228f 100644 --- a/Atom.Web/AutoComplete/JQAutoComplete.cs +++ b/Atom.Web/AutoComplete/JQAutoComplete.cs @@ -1,11 +1,60 @@ using System; using System.Collections.Generic; using System.Linq; using Sy...
sila/AtomProject
9ed326b18fa91bca8c5f0c02746caa2f7ee02abe
add regions
diff --git a/Atom.Web/Progressbar/JQProgressbar.cs b/Atom.Web/Progressbar/JQProgressbar.cs index 7344ffd..28fe1f2 100644 --- a/Atom.Web/Progressbar/JQProgressbar.cs +++ b/Atom.Web/Progressbar/JQProgressbar.cs @@ -1,192 +1,353 @@ using System; using System.Collections.Generic; using System.Linq; using System.T...
sila/AtomProject
1d588805e140ef090a20159cbcd68b508b96acf7
add inherit properties
diff --git a/Atom.Web/Progressbar/JQProgressbar.cs b/Atom.Web/Progressbar/JQProgressbar.cs index 7344ffd..28fe1f2 100644 --- a/Atom.Web/Progressbar/JQProgressbar.cs +++ b/Atom.Web/Progressbar/JQProgressbar.cs @@ -1,192 +1,353 @@ using System; using System.Collections.Generic; using System.Linq; using System.T...
sila/AtomProject
d508ab437d4483e2c0329d87990c412b8998c35b
implement all properties and startup script
diff --git a/Atom.Web/DatePicker/JQDatePicker.cs b/Atom.Web/DatePicker/JQDatePicker.cs index 33a9182..e1ed928 100644 --- a/Atom.Web/DatePicker/JQDatePicker.cs +++ b/Atom.Web/DatePicker/JQDatePicker.cs @@ -1,1283 +1,1303 @@ using System; using System.Collections.Generic; using System.Linq; using System.Text; ...
sila/AtomProject
14d54f9c830a2d736a9f9b9f03abaa7d28457eb8
add asp calendar in page
diff --git a/Atom.Web/DatePicker/JQDatePicker.cs b/Atom.Web/DatePicker/JQDatePicker.cs index b6a3a57..33a9182 100644 --- a/Atom.Web/DatePicker/JQDatePicker.cs +++ b/Atom.Web/DatePicker/JQDatePicker.cs @@ -1,1052 +1,1283 @@ using System; using System.Collections.Generic; using System.Linq; using System.Text; ...
sila/AtomProject
810eac3b0be3a5efd63457a3f1206cde39a71317
add string and enum properties in startup script
diff --git a/Atom.Web/DatePicker/JQDatePicker.cs b/Atom.Web/DatePicker/JQDatePicker.cs index f9be263..42906a8 100644 --- a/Atom.Web/DatePicker/JQDatePicker.cs +++ b/Atom.Web/DatePicker/JQDatePicker.cs @@ -1,1200 +1,1283 @@ using System; using System.Collections.Generic; using System.Linq; using System.Text; ...