Jan Szejko [Mon, 20 Jun 2016 12:43:04 +0000 (14:43 +0200)]
Merge branch 'api' into filmowa
Jan Szejko [Thu, 16 Jun 2016 13:00:56 +0000 (15:00 +0200)]
og properties for olympiad
Jan Szejko [Thu, 16 Jun 2016 09:48:47 +0000 (11:48 +0200)]
fix
Jan Szejko [Thu, 16 Jun 2016 09:47:52 +0000 (11:47 +0200)]
js on olympiad
Jan Szejko [Thu, 16 Jun 2016 09:45:15 +0000 (11:45 +0200)]
sponsors for olympiad
Jan Szejko [Thu, 16 Jun 2016 07:47:40 +0000 (09:47 +0200)]
fix logo src
Jan Szejko [Wed, 15 Jun 2016 15:04:52 +0000 (17:04 +0200)]
non-teasing teaser (digital olympiad stub)
Jan Szejko [Tue, 14 Jun 2016 12:10:47 +0000 (14:10 +0200)]
librarian update
Jan Szejko [Mon, 6 Jun 2016 14:07:34 +0000 (16:07 +0200)]
fix&simplify lesson import form
Jan Szejko [Fri, 3 Jun 2016 10:29:33 +0000 (12:29 +0200)]
use honeypot only for contact forms (not for api)
Jan Szejko [Fri, 3 Jun 2016 10:28:59 +0000 (12:28 +0200)]
missing template
Jan Szejko [Wed, 1 Jun 2016 16:09:57 +0000 (18:09 +0200)]
teaser stub
Jan Szejko [Wed, 1 Jun 2016 10:41:11 +0000 (12:41 +0200)]
api stub
Jan Szejko [Wed, 1 Jun 2016 09:39:29 +0000 (11:39 +0200)]
fix url tags for subdomain
Jan Szejko [Tue, 31 May 2016 13:30:09 +0000 (15:30 +0200)]
fix form: cybernaut trainers
Jan Szejko [Tue, 31 May 2016 12:18:34 +0000 (14:18 +0200)]
new form: cybernaut trainers
Jan Szejko [Mon, 23 May 2016 14:14:09 +0000 (16:14 +0200)]
turniej -> olimpiada
Jan Szejko [Fri, 20 May 2016 15:19:20 +0000 (17:19 +0200)]
sanitize settings
Jan Szejko [Fri, 20 May 2016 14:23:00 +0000 (16:23 +0200)]
add empty api app
Jan Szejko [Wed, 18 May 2016 12:31:52 +0000 (14:31 +0200)]
fix package building (don't add all non-standard lessons)
Jan Szejko [Tue, 10 May 2016 11:42:15 +0000 (13:42 +0200)]
csv export: natural order of columns
Jan Szejko [Tue, 10 May 2016 08:24:31 +0000 (10:24 +0200)]
csv export: comma-seperated lists (instead of semicolon)
Jan Szejko [Mon, 9 May 2016 14:43:29 +0000 (16:43 +0200)]
csv export: support for bools and lists
Jan Szejko [Mon, 9 May 2016 14:06:32 +0000 (16:06 +0200)]
fix csv export of contact forms (blind voodoo)
Jan Szejko [Mon, 9 May 2016 13:09:15 +0000 (15:09 +0200)]
fix csv export of contact forms
Jan Szejko [Mon, 9 May 2016 10:52:52 +0000 (12:52 +0200)]
turn off banner
Jan Szejko [Mon, 9 May 2016 08:58:25 +0000 (10:58 +0200)]
universal disabled form template
Jan Szejko [Mon, 9 May 2016 08:42:59 +0000 (10:42 +0200)]
disable form (cybernauts)
Jan Szejko [Tue, 26 Apr 2016 14:40:13 +0000 (16:40 +0200)]
fix attachment download
Jan Szejko [Tue, 26 Apr 2016 14:22:11 +0000 (16:22 +0200)]
fix attachment download (?)
Jan Szejko [Tue, 26 Apr 2016 09:11:07 +0000 (11:11 +0200)]
change in the WLEM form
Jan Szejko [Tue, 26 Apr 2016 08:45:02 +0000 (10:45 +0200)]
change "thanks" message after filling a form
Jan Szejko [Tue, 26 Apr 2016 08:13:12 +0000 (10:13 +0200)]
new contact form (WLEM)
Jan Szejko [Tue, 19 Apr 2016 15:04:06 +0000 (17:04 +0200)]
add data processing confirmation to CooperateForm
Jan Szejko [Mon, 18 Apr 2016 08:07:36 +0000 (10:07 +0200)]
fixes in the cybernauci form
Jan Szejko [Mon, 18 Apr 2016 07:27:10 +0000 (09:27 +0200)]
typo in translation
Jan Szejko [Wed, 13 Apr 2016 14:43:50 +0000 (16:43 +0200)]
new contact form (trenerzy-cybernauci)
Jan Szejko [Wed, 13 Apr 2016 13:25:27 +0000 (15:25 +0200)]
refactor importlessons
Jan Szejko [Wed, 23 Mar 2016 11:38:28 +0000 (12:38 +0100)]
updated email subjects
Jan Szejko [Wed, 23 Mar 2016 11:24:47 +0000 (12:24 +0100)]
https repository in requirements
Jan Szejko [Wed, 23 Mar 2016 11:24:10 +0000 (12:24 +0100)]
adapt script for sending results from csv
Jan Szejko [Wed, 23 Mar 2016 10:25:19 +0000 (11:25 +0100)]
new emails for wtem results
Jan Szejko [Tue, 22 Mar 2016 13:49:28 +0000 (14:49 +0100)]
fix banner
Jan Szejko [Tue, 22 Mar 2016 13:31:38 +0000 (14:31 +0100)]
fix in comments
cain-ish [Tue, 22 Mar 2016 13:30:46 +0000 (14:30 +0100)]
ADS System
cain-ish [Tue, 22 Mar 2016 13:30:05 +0000 (14:30 +0100)]
Merge remote-tracking branch 'origin/filmowa' into filmowa
cain-ish [Tue, 22 Mar 2016 13:29:54 +0000 (14:29 +0100)]
ADS System
Jan Szejko [Tue, 22 Mar 2016 13:20:15 +0000 (14:20 +0100)]
removed @staticmethod's that cause errors
cain-ish [Tue, 22 Mar 2016 12:59:45 +0000 (13:59 +0100)]
ADS System - banner
cain-ish [Mon, 21 Mar 2016 12:07:47 +0000 (13:07 +0100)]
ADS System
Jan Szejko [Thu, 3 Mar 2016 15:31:37 +0000 (16:31 +0100)]
code style
Jan Szejko [Thu, 3 Mar 2016 09:23:44 +0000 (10:23 +0100)]
exercises with scoring
Jan Szejko [Thu, 3 Mar 2016 09:22:35 +0000 (10:22 +0100)]
exercises with scoring
Jan Szejko [Thu, 3 Mar 2016 08:33:56 +0000 (09:33 +0100)]
add submodule librarian
Jan Szejko [Thu, 3 Mar 2016 08:33:56 +0000 (09:33 +0100)]
add submodule librarian
Jan Szejko [Mon, 29 Feb 2016 15:54:34 +0000 (16:54 +0100)]
fix fabfile
Jan Szejko [Mon, 29 Feb 2016 15:52:08 +0000 (16:52 +0100)]
dummy exercises (quick fix)
Jan Szejko [Mon, 29 Feb 2016 15:13:30 +0000 (16:13 +0100)]
exercises in .gitignore
Jan Szejko [Mon, 29 Feb 2016 11:37:21 +0000 (12:37 +0100)]
change exercises
Jan Szejko [Thu, 25 Feb 2016 16:43:07 +0000 (17:43 +0100)]
new exercises
Jan Szejko [Wed, 24 Feb 2016 14:42:40 +0000 (15:42 +0100)]
adapt templates to the current edition of WTEM
also some code style changes
Jan Szejko [Tue, 23 Feb 2016 10:42:44 +0000 (11:42 +0100)]
add dependency: django-extensions
cain-ish [Mon, 15 Feb 2016 12:45:14 +0000 (13:45 +0100)]
Split promobox into 2 + carousel height fix
cain-ish [Mon, 15 Feb 2016 12:07:47 +0000 (13:07 +0100)]
Split promobox into 2 + carousel height fix
cain-ish [Mon, 15 Feb 2016 11:09:04 +0000 (12:09 +0100)]
zmiana w menu na katalog.edukacjamedialna (compile locale)
cain-ish [Mon, 15 Feb 2016 11:07:03 +0000 (12:07 +0100)]
zmiana w menu na katalog.edukacjamedialna
Jan Szejko [Mon, 15 Feb 2016 11:05:02 +0000 (12:05 +0100)]
access to the katalog subdomain on development
cain-ish [Mon, 15 Feb 2016 10:25:17 +0000 (11:25 +0100)]
zmiana w menu na katalog.edukacjamedialna
cain-ish [Fri, 12 Feb 2016 11:03:29 +0000 (12:03 +0100)]
zmiana kolejnosci w menu
Jan Szejko [Thu, 11 Feb 2016 12:37:08 +0000 (13:37 +0100)]
local changes from the server
Radek Czajka [Fri, 28 Nov 2014 16:02:42 +0000 (17:02 +0100)]
template
Radek Czajka [Fri, 28 Nov 2014 15:50:37 +0000 (16:50 +0100)]
W trybie naglym.
Radek Czajka [Tue, 18 Nov 2014 11:09:29 +0000 (12:09 +0100)]
Update.
Radek Czajka [Thu, 13 Nov 2014 15:59:05 +0000 (16:59 +0100)]
New texts
Radek Czajka [Thu, 13 Nov 2014 15:27:15 +0000 (16:27 +0100)]
Fixes.
Radek Czajka [Mon, 5 May 2014 07:22:08 +0000 (09:22 +0200)]
Deannoy.
Radek Czajka [Mon, 31 Mar 2014 14:25:50 +0000 (16:25 +0200)]
Annoying fix.
Radek Czajka [Mon, 31 Mar 2014 14:01:12 +0000 (16:01 +0200)]
Let the annoying commence.
Radek Czajka [Mon, 10 Mar 2014 13:16:31 +0000 (14:16 +0100)]
Use BofhFileSystemStorage where file names are preset.
Radek Czajka [Wed, 26 Feb 2014 14:52:43 +0000 (15:52 +0100)]
Fixes #3307: place for infograhics miniature.
Radek Czajka [Wed, 26 Feb 2014 14:27:58 +0000 (15:27 +0100)]
Fixes #3293: methodological consultants.
Radek Czajka [Wed, 26 Feb 2014 14:10:38 +0000 (15:10 +0100)]
Support for Przyporzadkuj with short items.
Radek Czajka [Tue, 25 Feb 2014 16:02:01 +0000 (17:02 +0100)]
Fixes #3315: Lessons ordering.
Radek Czajka [Tue, 25 Feb 2014 15:50:42 +0000 (16:50 +0100)]
Fixes #3314, #3331: Various minor fixes.
Radek Czajka [Tue, 25 Feb 2014 14:47:48 +0000 (15:47 +0100)]
fixes #3287: minor styling fixes on main.
Radek Czajka [Wed, 19 Feb 2014 16:02:16 +0000 (17:02 +0100)]
Fix for Uporzadkuj.
Radek Czajka [Mon, 3 Feb 2014 13:11:23 +0000 (14:11 +0100)]
Tweaking convert options.
Radek Czajka [Mon, 3 Feb 2014 11:43:37 +0000 (12:43 +0100)]
A fix, and a video.
Radek Czajka [Fri, 31 Jan 2014 15:00:33 +0000 (16:00 +0100)]
Oh, right
Radek Czajka [Fri, 31 Jan 2014 14:51:59 +0000 (15:51 +0100)]
Merge branch 'leveling'
Conflicts:
edumed/settings.d/30-apps.py
Radek Czajka [Fri, 31 Jan 2014 11:57:43 +0000 (12:57 +0100)]
Prepared for SP 4-6.
- Main and lesson list pages overhaul.
- Lessons now inform about internet requirements and publisher.
- PDF support for <obraz> (by sorl.thumnail with ImageMagick)
- Add summary and picture for Sections, description for Lesson.
- Level slug and meta dc:audience value can be different.
- Per-level lesson packages instead of global ones.
- Lesson packages are now rebuilt after import.
- Add option for allowing incomplete sections on import.
- Django 1.6, `django-piwik` replaces `piwik`.
Aleksander Łukasz [Wed, 15 Jan 2014 10:29:44 +0000 (11:29 +0100)]
Merge WTEM support into master
Aleksander Łukasz [Mon, 16 Dec 2013 14:30:02 +0000 (15:30 +0100)]
send_results: --only-to flag
Aleksander Łukasz [Mon, 16 Dec 2013 13:55:31 +0000 (14:55 +0100)]
Sending results to students and teachers
Aleksander Łukasz [Mon, 16 Dec 2013 09:49:05 +0000 (10:49 +0100)]
Fix: missing csv field quote
Aleksander Łukasz [Fri, 22 Nov 2013 08:10:15 +0000 (09:10 +0100)]
Fix in AttachmentWidget - handling encoded urls correctly
Aleksander Łukasz [Thu, 21 Nov 2013 22:44:13 +0000 (23:44 +0100)]
Remove filtering by not having more than two assigned examiners
Aleksander Łukasz [Thu, 21 Nov 2013 21:31:32 +0000 (22:31 +0100)]
Full slicing in examiners assignment
Aleksander Łukasz [Thu, 21 Nov 2013 21:29:05 +0000 (22:29 +0100)]
Allow for assignment to submissions filtered by not having an attachment
Aleksander Łukasz [Thu, 21 Nov 2013 16:48:20 +0000 (17:48 +0100)]
Sort submission on assignment
fnp / edumed.git / log