edumed.git
10 years agoMark field for Submission, setting marks api on Submission object
Aleksander Łukasz [Wed, 6 Nov 2013 11:37:12 +0000 (12:37 +0100)]
Mark field for Submission, setting marks api on Submission object

10 years agoSubmission string representation in admin
Aleksander Łukasz [Wed, 6 Nov 2013 11:36:13 +0000 (12:36 +0100)]
Submission string representation in admin

10 years agoAssignment string representation for admin
Aleksander Łukasz [Wed, 6 Nov 2013 09:59:58 +0000 (10:59 +0100)]
Assignment string representation for admin

10 years agoOnly one assignment record per user
Aleksander Łukasz [Wed, 6 Nov 2013 09:59:17 +0000 (10:59 +0100)]
Only one assignment record per user

10 years agoSending exercise ids when submitting the contest form
Aleksander Łukasz [Wed, 6 Nov 2013 09:53:32 +0000 (10:53 +0100)]
Sending exercise ids when submitting the contest form

10 years agoAssign exercises to a user via admin
Aleksander Łukasz [Wed, 6 Nov 2013 09:19:40 +0000 (10:19 +0100)]
Assign exercises to a user via admin

10 years agoSending emails with contest keys
Aleksander Łukasz [Tue, 5 Nov 2013 13:23:53 +0000 (14:23 +0100)]
Sending emails with contest keys

10 years agoSending keys wip: up to point of actually sending an email
Aleksander Łukasz [Tue, 5 Nov 2013 12:13:18 +0000 (13:13 +0100)]
Sending keys wip: up to point of actually sending an email

10 years agoSome additional info while generating keys
Aleksander Łukasz [Tue, 5 Nov 2013 12:12:32 +0000 (13:12 +0100)]
Some additional info while generating keys

10 years agofix in key generation
Aleksander Łukasz [Tue, 5 Nov 2013 12:12:07 +0000 (13:12 +0100)]
fix in key generation

10 years agorefactor
Aleksander Łukasz [Tue, 5 Nov 2013 12:11:52 +0000 (13:11 +0100)]
refactor

10 years agoBackdoor testing url for contest form
Aleksander Łukasz [Tue, 5 Nov 2013 11:22:07 +0000 (12:22 +0100)]
Backdoor testing url for contest form

10 years agoHandle form page before/after contest
Aleksander Łukasz [Tue, 5 Nov 2013 11:21:27 +0000 (12:21 +0100)]
Handle form page before/after contest

10 years agowtem: generating submissions from contact forms
Aleksander Łukasz [Mon, 4 Nov 2013 15:20:51 +0000 (16:20 +0100)]
wtem: generating submissions from contact forms

10 years agowip: some additional exercises
Aleksander Łukasz [Mon, 4 Nov 2013 11:40:25 +0000 (12:40 +0100)]
wip: some additional exercises

10 years agowip: saving submission with file attachments
Aleksander Łukasz [Mon, 4 Nov 2013 09:34:27 +0000 (10:34 +0100)]
wip: saving submission with file attachments

10 years agoSerializing answers to form field
Aleksander Łukasz [Thu, 31 Oct 2013 12:51:32 +0000 (13:51 +0100)]
Serializing answers to form field

10 years agoAdding instructions
Aleksander Łukasz [Thu, 31 Oct 2013 12:34:15 +0000 (13:34 +0100)]
Adding instructions

10 years agoExercise of type uporzadkuj
Aleksander Łukasz [Thu, 31 Oct 2013 12:08:55 +0000 (13:08 +0100)]
Exercise of type uporzadkuj

10 years agotrue/false exercise
Aleksander Łukasz [Thu, 31 Oct 2013 11:56:24 +0000 (12:56 +0100)]
true/false exercise

10 years agowip: open question sample
Aleksander Łukasz [Thu, 31 Oct 2013 11:06:36 +0000 (12:06 +0100)]
wip: open question sample

10 years agowip: file upload exercise
Aleksander Łukasz [Thu, 31 Oct 2013 10:57:03 +0000 (11:57 +0100)]
wip: file upload exercise

10 years agoDescription field as a list
Aleksander Łukasz [Thu, 31 Oct 2013 10:54:59 +0000 (11:54 +0100)]
Description field as a list

10 years agoFirst exercise of type przyporzadkuj
Aleksander Łukasz [Thu, 31 Oct 2013 09:50:33 +0000 (10:50 +0100)]
First exercise of type przyporzadkuj

10 years agoNumeric ids instead of string ones in exercises.json
Aleksander Łukasz [Thu, 31 Oct 2013 09:38:39 +0000 (10:38 +0100)]
Numeric ids instead of string ones in exercises.json

10 years agowip: showing first couple of questions
Aleksander Łukasz [Wed, 30 Oct 2013 15:52:44 +0000 (16:52 +0100)]
wip: showing first couple of questions

10 years agoIntroducing edumed.coffee from redakcja repository
Aleksander Łukasz [Wed, 30 Oct 2013 11:27:57 +0000 (12:27 +0100)]
Introducing edumed.coffee from redakcja repository

Source:
http://git.nowoczesnapolska.org.pl/?p=redakcja.git;a=blob;f=redakcja/static/edumed/js/edumed.coffee;h=fb8ea87246c0c14b6dce9749c1ee32e0e5a81303;hb=refs/heads/edumed

10 years agoSkelton of the contest page
Aleksander Łukasz [Wed, 30 Oct 2013 11:24:25 +0000 (12:24 +0100)]
Skelton of the contest page

10 years agoMove template reference to main compressed scripts down one level
Aleksander Łukasz [Wed, 30 Oct 2013 11:21:26 +0000 (12:21 +0100)]
Move template reference to main compressed scripts down one level

10 years agoChange JSONField implementation
Aleksander Łukasz [Wed, 15 Jan 2014 10:02:22 +0000 (11:02 +0100)]
Change JSONField implementation

10 years agoupdate fnpdjango to incorporate bug fix
Aleksander Łukasz [Tue, 14 Jan 2014 11:39:54 +0000 (12:39 +0100)]
update fnpdjango to incorporate bug fix

10 years agomil site: knowledge base support
Aleksander Łukasz [Tue, 14 Jan 2014 10:39:40 +0000 (11:39 +0100)]
mil site: knowledge base support

10 years agoVisual update of the mil site
Aleksander Łukasz [Tue, 14 Jan 2014 09:58:30 +0000 (10:58 +0100)]
Visual update of the mil site

10 years agoTranslating instructions on the MIL site
Aleksander Łukasz [Thu, 5 Dec 2013 08:57:28 +0000 (09:57 +0100)]
Translating instructions on the MIL site

11 years agoFix missing links to competencies catalogue in a lesson view
Aleksander Łukasz [Fri, 15 Nov 2013 09:09:20 +0000 (10:09 +0100)]
Fix missing links to competencies catalogue in a lesson view

11 years agoBring back competencies catalogue to the main site
Aleksander Łukasz [Fri, 15 Nov 2013 08:57:32 +0000 (09:57 +0100)]
Bring back competencies catalogue to the main site

11 years agoAdditional instructions on the MIL site (polish version)
Aleksander Łukasz [Tue, 12 Nov 2013 15:43:29 +0000 (16:43 +0100)]
Additional instructions on the MIL site (polish version)

11 years agoNINA logo for MIL site
Aleksander Łukasz [Tue, 12 Nov 2013 15:34:12 +0000 (16:34 +0100)]
NINA logo for MIL site

11 years agoExtracting contact forms data to pseudo csv format
Aleksander Łukasz [Tue, 5 Nov 2013 08:22:51 +0000 (09:22 +0100)]
Extracting contact forms data to pseudo csv format

11 years agoFix unicode display issue in contacts admin.
Radek Czajka [Thu, 31 Oct 2013 13:54:25 +0000 (14:54 +0100)]
Fix unicode display issue in contacts admin.

11 years agoFixing broken search form markup
Aleksander Łukasz [Wed, 30 Oct 2013 09:03:07 +0000 (10:03 +0100)]
Fixing broken search form markup

Broken in 3ddfdd9baf3266c0e19ada023cc2de2acc53ad85

11 years agoMerge branch 'mil' into 'master'
Aleksander Łukasz [Tue, 22 Oct 2013 10:04:16 +0000 (12:04 +0200)]
Merge branch 'mil' into 'master'

11 years agoFix contact pages mil
Aleksander Łukasz [Tue, 22 Oct 2013 10:01:14 +0000 (12:01 +0200)]
Fix contact pages

11 years agokontakt/contact page accessible under katalog.* domain.
Aleksander Łukasz [Tue, 22 Oct 2013 07:48:34 +0000 (09:48 +0200)]
kontakt/contact page accessible under katalog.* domain.

11 years agoSeparate sponsors for katalog subdomain
Aleksander Łukasz [Fri, 18 Oct 2013 14:06:01 +0000 (16:06 +0200)]
Separate sponsors for katalog subdomain

11 years agoServe media files in debug mode under katalog subdomain
Aleksander Łukasz [Fri, 18 Oct 2013 14:05:32 +0000 (16:05 +0200)]
Serve media files in debug mode under katalog subdomain

11 years agomil form titles
Aleksander Łukasz [Fri, 18 Oct 2013 13:09:06 +0000 (15:09 +0200)]
mil form titles

11 years agoFixing contact form to work with katalog subdomain
Aleksander Łukasz [Fri, 18 Oct 2013 12:46:25 +0000 (14:46 +0200)]
Fixing contact form to work with katalog subdomain

11 years agoWording fix
Aleksander Łukasz [Fri, 18 Oct 2013 12:07:55 +0000 (14:07 +0200)]
Wording fix

11 years agoSome mil form fields are not required
Aleksander Łukasz [Fri, 18 Oct 2013 12:05:25 +0000 (14:05 +0200)]
Some mil form fields are not required

11 years agoTranslation for curriculum app
Aleksander Łukasz [Fri, 18 Oct 2013 12:03:34 +0000 (14:03 +0200)]
Translation for curriculum app

11 years agoFix form translations
Aleksander Łukasz [Fri, 18 Oct 2013 11:10:46 +0000 (13:10 +0200)]
Fix form translations

11 years agotypo in translation
Aleksander Łukasz [Fri, 18 Oct 2013 11:06:04 +0000 (13:06 +0200)]
typo in translation

11 years agoChanging link to contact informations in english version
Aleksander Łukasz [Fri, 18 Oct 2013 11:04:43 +0000 (13:04 +0200)]
Changing link to contact informations in english version

11 years agoContact form for mil
Aleksander Łukasz [Fri, 18 Oct 2013 10:56:29 +0000 (12:56 +0200)]
Contact form for mil

11 years agoFixing url in mil base template
Aleksander Łukasz [Fri, 18 Oct 2013 09:25:49 +0000 (11:25 +0200)]
Fixing url in mil base template

11 years agoFix handling mil home page
Aleksander Łukasz [Fri, 18 Oct 2013 08:09:35 +0000 (10:09 +0200)]
Fix handling mil home page

Defining flat pages in urlpatterns breaks language_switcher behavior

11 years agoUse Django flatpages mechanism for mil home page
Aleksander Łukasz [Fri, 18 Oct 2013 07:42:15 +0000 (09:42 +0200)]
Use Django flatpages mechanism for mil home page

11 years agoFilter comment documents by current language
Aleksander Łukasz [Wed, 16 Oct 2013 10:40:18 +0000 (12:40 +0200)]
Filter comment documents by current language

11 years agoBrowsing and showing comment documents
Aleksander Łukasz [Wed, 16 Oct 2013 10:05:30 +0000 (12:05 +0200)]
Browsing and showing comment documents

11 years agoSupport for English language in the curriculum app
Aleksander Łukasz [Wed, 16 Oct 2013 08:33:46 +0000 (10:33 +0200)]
Support for English language in the curriculum app

11 years agoActually using home_mil template
Aleksander Łukasz [Tue, 15 Oct 2013 12:09:37 +0000 (14:09 +0200)]
Actually using home_mil template

11 years agoEnglish version wip - urls, navigation
Aleksander Łukasz [Tue, 15 Oct 2013 12:11:40 +0000 (14:11 +0200)]
English version wip - urls, navigation

11 years agotemplate fix
Aleksander Łukasz [Tue, 15 Oct 2013 11:59:59 +0000 (13:59 +0200)]
template fix

11 years agoSeparate 404 page for mil site
Aleksander Łukasz [Tue, 15 Oct 2013 09:35:22 +0000 (11:35 +0200)]
Separate 404 page for mil site

11 years agoFixing base_super url reversing
Aleksander Łukasz [Tue, 15 Oct 2013 09:08:41 +0000 (11:08 +0200)]
Fixing base_super url reversing

11 years agoMissing mil navigation urls
Aleksander Łukasz [Tue, 15 Oct 2013 08:49:12 +0000 (10:49 +0200)]
Missing mil navigation urls

11 years agoRefactoring - we don't actually need separate mil app
Aleksander Łukasz [Tue, 15 Oct 2013 08:43:22 +0000 (10:43 +0200)]
Refactoring - we don't actually need separate mil app

11 years agoMove cirruculum app to mil site
Aleksander Łukasz [Tue, 15 Oct 2013 08:27:46 +0000 (10:27 +0200)]
Move cirruculum app to mil site

11 years agoExtend mil base from super_base template
Aleksander Łukasz [Tue, 15 Oct 2013 08:07:19 +0000 (10:07 +0200)]
Extend mil base from super_base template

11 years agoStarting with mil app
Aleksander Łukasz [Mon, 14 Oct 2013 15:06:05 +0000 (17:06 +0200)]
Starting with mil app

11 years agoMerge branch 'forum'
Aleksander Łukasz [Tue, 8 Oct 2013 09:48:42 +0000 (11:48 +0200)]
Merge branch 'forum'

11 years agoDisplay structs in contact form nicely.
Radek Czajka [Tue, 8 Oct 2013 09:19:18 +0000 (11:19 +0200)]
Display structs in contact form nicely.

11 years agofix
Radek Czajka [Mon, 7 Oct 2013 13:55:19 +0000 (15:55 +0200)]
fix

11 years agoMenu change.
Radek Czajka [Mon, 7 Oct 2013 13:37:34 +0000 (15:37 +0200)]
Menu change.

11 years agoAdd formsets to contact forms, add WTEM form.
Radek Czajka [Mon, 7 Oct 2013 13:37:24 +0000 (15:37 +0200)]
Add formsets to contact forms, add WTEM form.

11 years agoHide category names on forum index page forum
Aleksander Łukasz [Tue, 10 Sep 2013 14:22:02 +0000 (16:22 +0200)]
Hide category names on forum index page

11 years agoMerge branch 'master' into forum
Aleksander Łukasz [Tue, 10 Sep 2013 13:34:08 +0000 (15:34 +0200)]
Merge branch 'master' into forum

Conflicts:
edumed/templates/home.html

11 years agoLogout link
Aleksander Łukasz [Thu, 5 Sep 2013 12:20:40 +0000 (14:20 +0200)]
Logout link

11 years agoNon authenticated users aren't allowed to use forum for now
Aleksander Łukasz [Thu, 5 Sep 2013 12:08:38 +0000 (14:08 +0200)]
Non authenticated users aren't allowed to use forum for now

11 years agoHide polls from post form for non superusers
Aleksander Łukasz [Wed, 4 Sep 2013 15:43:08 +0000 (17:43 +0200)]
Hide polls from post form for non superusers

11 years agoAllow for authenticated non super users to create posts and topics
Aleksander Łukasz [Wed, 4 Sep 2013 15:42:30 +0000 (17:42 +0200)]
Allow for authenticated non super users to create posts and topics

11 years agoLink to a forum
Aleksander Łukasz [Wed, 4 Sep 2013 15:30:08 +0000 (17:30 +0200)]
Link to a forum

11 years agoForum search
Aleksander Łukasz [Wed, 4 Sep 2013 11:35:03 +0000 (13:35 +0200)]
Forum search

11 years agoForum: Missing translation
Aleksander Łukasz [Mon, 2 Sep 2013 15:24:17 +0000 (17:24 +0200)]
Forum: Missing translation

11 years agoForum: Making subject input field wider
Aleksander Łukasz [Mon, 2 Sep 2013 15:18:51 +0000 (17:18 +0200)]
Forum: Making subject input field wider

11 years agoForum: Defining font in textarea and inputs
Aleksander Łukasz [Mon, 2 Sep 2013 14:36:25 +0000 (16:36 +0200)]
Forum: Defining font in textarea and inputs

Without it font would depend on the client styling too much.

11 years agoAdditional link
Aleksander Łukasz [Mon, 2 Sep 2013 08:25:24 +0000 (10:25 +0200)]
Additional link

11 years agoForum: Grouping lessons by their section on the forum post form
Aleksander Łukasz [Thu, 29 Aug 2013 14:55:30 +0000 (16:55 +0200)]
Forum: Grouping lessons by their section on the forum post form

11 years agoForum: related lesson fixes
Aleksander Łukasz [Thu, 29 Aug 2013 09:24:37 +0000 (11:24 +0200)]
Forum: related lesson fixes

- lesson should not be required
- handle missing lesson better

11 years agoTweaking last post in a topic/forum column
Aleksander Łukasz [Thu, 29 Aug 2013 08:58:38 +0000 (10:58 +0200)]
Tweaking last post in a topic/forum column

- time since instead of datetime
- showing last active user

11 years agoForum: styling topic view
Aleksander Łukasz [Thu, 29 Aug 2013 08:29:38 +0000 (10:29 +0200)]
Forum: styling topic view

11 years agoFirst take on connecting lessons to forum topics
Aleksander Łukasz [Thu, 29 Aug 2013 09:01:47 +0000 (11:01 +0200)]
First take on connecting lessons to forum topics

11 years agoLinks to infographics info page
Aleksander Łukasz [Mon, 26 Aug 2013 08:28:41 +0000 (10:28 +0200)]
Links to infographics info page

11 years agoMerge branch 'master' into forum
Aleksander Łukasz [Tue, 13 Aug 2013 10:52:53 +0000 (12:52 +0200)]
Merge branch 'master' into forum

11 years agoMake forum somewhat usable, display Libravatars.
Radek Czajka [Fri, 9 Aug 2013 12:52:35 +0000 (14:52 +0200)]
Make forum somewhat usable, display Libravatars.

11 years agoDon't build student PDF for project.
Radek Czajka [Wed, 7 Aug 2013 14:02:58 +0000 (16:02 +0200)]
Don't build student PDF for project.

11 years agoNeed lxml>3.0 for handling Unicode in PySolr nicely.
Radek Czajka [Wed, 7 Aug 2013 13:09:01 +0000 (15:09 +0200)]
Need lxml>3.0 for handling Unicode in PySolr nicely.

11 years agoAdd some white border.
Radek Czajka [Wed, 7 Aug 2013 12:02:32 +0000 (14:02 +0200)]
Add some white border.

11 years agoMerge branch 'infographics'
Radek Czajka [Wed, 7 Aug 2013 11:37:44 +0000 (13:37 +0200)]
Merge branch 'infographics'