Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Settings refactor #48

Closed
wants to merge 55 commits into from
Closed

Settings refactor #48

wants to merge 55 commits into from

Conversation

epicserve
Copy link

Refactored the Django settings so you can override the default settings for adding in apps like Django debug toolbar. Also did some code clean up to make the code more PEP 8 compliant. I've also included all the changes from pull request #47. All unit tests pass.

@bartekgorny
Added optional weekcal js view (read-only for now)
68a3613
@bartekgorny
something works - editing occurrences through dialogs
d997c5a
@bartekgorny
bugfix - wrong dates
efe8bbc
@bartekgorny
externalized generic js into library
4e7dba5
@bartekgorny
pass weekcal parameters in a civilised way
374eadb
@bartekgorny
impl. drag and resize
5a01ff8
@bartekgorny
fixed a problem of current week's boxes rendered twice
fa050f7
@bartekgorny
code formatting and cleanup
c471d4e
@bartekgorny
added view dialog for read-only events
7bad7f1
@bartekgorny
deleting (cancelling) occurrences
87bed5b
@bartekgorny
err... forgot to classify occurrences...
5eacf57
@bartekgorny
pass info about recurrence and persistence to UI
adfb07e
@bartekgorny
show which events are parts of recurrence chain
88a5cee
@bartekgorny
we have to return the new object so that we update its id and persist…
5472140 
…ence/recurrence info
@bartekgorny
creating simple non-recurring events
5739754
@bartekgorny
improved error handling and communication (JSON only)
43c92e0
@bartekgorny
deleting a non-recurring event
2b25779
@bartekgorny
bugfix; also saving event when non-recurring
d72860f
@bartekgorny
blocked event creation for anonymous users
38b09f5
@bartekgorny
fixed url name
bbf5601
@bartekgorny
half-way to editing recurring events and their occurrences
220c00a
@bartekgorny
refresh all after deleting an event (it could be recurring)
16bc218
@bartekgorny
cleanup and todo
d82abbe
@bartekgorny
getting events for editing by separate method
e1bb5ea
@bartekgorny
support for event start and end_recurring_date (with datepicker)
58a374a
@bartekgorny
removed unused dialogs
bc5b46e
@bartekgorny
removed unused arg
884a761
@bartekgorny
bugfix - options were getting longer every time a dialog was open
08aeb64
@bartekgorny
bugfix - for some reason the standard jquery find failed on the first…
ed27a20 
… run
@bartekgorny
no dialog for read-only events
670dff0
bartekgorny and others added 25 commits November 3, 2009 22:33
@bartekgorny
escape linebreak in description
572416a
@bartekgorny
moved styling to css file; improved marking of recurring events;
3ed7ab3
@bartekgorny
cleanup (use simple inclusion instead of those ugly hacks)
ee0ccf0
@bartekgorny
moved weekcal configuration to a separate script
8c451fd
@bartekgorny
Merge branch 'master' into ajax_ui
7ccea4f
@bartekgorny
Merge branch 'master' into ajax_ui
84d77c5
@bartekgorny
bugfix - 'None' broke json parser
e765f8d
@bartekgorny
hide dialog templates
67473c8
@bartekgorny
fixed bugs in setting start/end time; simplified the code a bit to ma…
6534cc2 
…ke it faster;
@bartekgorny
moved weekcal configuration to a separate script (missing hunks)
d23dc04
@bartekgorny
Merge branch 'ajax_ui' of [email protected]:thauber/django-schedule into…
ee98da4 
… ajax_ui
@bartekgorny
removed debugging func - firebug console does the job much better
0b682ca
@bartekgorny
fixed bug in event serialization (end_recurring_date would not show up)
4c9c0ba
@bartekgorny
fixed a tricky bug (a deprecated feature in javascript - parseInt tre…
98b0455 
…ats a string beginning with '0' as octal)
@bartekgorny
Fixed handling of start date in event creation
e25290c
@bartekgorny
some things have been done
2ab9294
conf folder not present in MANIFEST.Inserted the entry for the conf f…
36823a9 
…older
@Natim
Make it Django 1.4 compatible
b272d2c
@Natim
Move fixtures directory so tests can find it
d641155 
--HG--
rename : schedule/models/fixtures/schedule.json => schedule/fixtures/schedule.json
@Natim
Make get_object compliant with django.contrib.syndication.Feed
7b90923
@Natim
Merge kabirkukreti patch
265b5a3
@epicserve
Did some code cleanup
3f4ccb1
@epicserve
Merge branch 'code_cleanup' into ajax_ui
0b0e0b0 
Conflicts:
	project_sample/settings.py
	project_sample/urls.py
	schedule/templates/schedule/_dialogs.html
	schedule/templatetags/scheduletags.py
	schedule/urls.py
@epicserve
Refactored Django settings
f63618e
@epicserve
Fixed image paths in the CSS so they don't 404.
07a2502 
Also removed the links to `jquery.tooltip.css` and `jquery.tooltip.js` because they were 404ing.
@epicserve epicserve closed this Oct 31, 2012
jrutila pushed a commit to jrutila/django-schedule that referenced this pull request Apr 13, 2014
@llazzaro
Fix issue thauber#48
df4c0bf
jrutila pushed a commit to jrutila/django-schedule that referenced this pull request Apr 13, 2014
@llazzaro
fix issue thauber#48
1a279ee
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@epicserve @bartekgorny @Natim