Aleksander Łukasz [Tue, 22 Oct 2013 10:04:16 +0000 (12:04 +0200)]
Merge branch 'mil' into 'master'
Aleksander Łukasz [Tue, 22 Oct 2013 10:01:14 +0000 (12:01 +0200)]
Fix contact pages
Aleksander Łukasz [Tue, 22 Oct 2013 07:48:34 +0000 (09:48 +0200)]
kontakt/contact page accessible under katalog.* domain.
Aleksander Łukasz [Fri, 18 Oct 2013 14:06:01 +0000 (16:06 +0200)]
Separate sponsors for katalog subdomain
Aleksander Łukasz [Fri, 18 Oct 2013 14:05:32 +0000 (16:05 +0200)]
Serve media files in debug mode under katalog subdomain
Aleksander Łukasz [Fri, 18 Oct 2013 13:09:06 +0000 (15:09 +0200)]
mil form titles
Aleksander Łukasz [Fri, 18 Oct 2013 12:46:25 +0000 (14:46 +0200)]
Fixing contact form to work with katalog subdomain
Aleksander Łukasz [Fri, 18 Oct 2013 12:07:55 +0000 (14:07 +0200)]
Wording fix
Aleksander Łukasz [Fri, 18 Oct 2013 12:05:25 +0000 (14:05 +0200)]
Some mil form fields are not required
Aleksander Łukasz [Fri, 18 Oct 2013 12:03:34 +0000 (14:03 +0200)]
Translation for curriculum app
Aleksander Łukasz [Fri, 18 Oct 2013 11:10:46 +0000 (13:10 +0200)]
Fix form translations
Aleksander Łukasz [Fri, 18 Oct 2013 11:06:04 +0000 (13:06 +0200)]
typo in translation
Aleksander Łukasz [Fri, 18 Oct 2013 11:04:43 +0000 (13:04 +0200)]
Changing link to contact informations in english version
Aleksander Łukasz [Fri, 18 Oct 2013 10:56:29 +0000 (12:56 +0200)]
Contact form for mil
Aleksander Łukasz [Fri, 18 Oct 2013 09:25:49 +0000 (11:25 +0200)]
Fixing url in mil base template
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
Aleksander Łukasz [Fri, 18 Oct 2013 07:42:15 +0000 (09:42 +0200)]
Use Django flatpages mechanism for mil home page
Aleksander Łukasz [Wed, 16 Oct 2013 10:40:18 +0000 (12:40 +0200)]
Filter comment documents by current language
Aleksander Łukasz [Wed, 16 Oct 2013 10:05:30 +0000 (12:05 +0200)]
Browsing and showing comment documents
Aleksander Łukasz [Wed, 16 Oct 2013 08:33:46 +0000 (10:33 +0200)]
Support for English language in the curriculum app
Aleksander Łukasz [Tue, 15 Oct 2013 12:09:37 +0000 (14:09 +0200)]
Actually using home_mil template
Aleksander Łukasz [Tue, 15 Oct 2013 12:11:40 +0000 (14:11 +0200)]
English version wip - urls, navigation
Aleksander Łukasz [Tue, 15 Oct 2013 11:59:59 +0000 (13:59 +0200)]
template fix
Aleksander Łukasz [Tue, 15 Oct 2013 09:35:22 +0000 (11:35 +0200)]
Separate 404 page for mil site
Aleksander Łukasz [Tue, 15 Oct 2013 09:08:41 +0000 (11:08 +0200)]
Fixing base_super url reversing
Aleksander Łukasz [Tue, 15 Oct 2013 08:49:12 +0000 (10:49 +0200)]
Missing mil navigation urls
Aleksander Łukasz [Tue, 15 Oct 2013 08:43:22 +0000 (10:43 +0200)]
Refactoring - we don't actually need separate mil app
Aleksander Łukasz [Tue, 15 Oct 2013 08:27:46 +0000 (10:27 +0200)]
Move cirruculum app to mil site
Aleksander Łukasz [Tue, 15 Oct 2013 08:07:19 +0000 (10:07 +0200)]
Extend mil base from super_base template
Aleksander Łukasz [Mon, 14 Oct 2013 15:06:05 +0000 (17:06 +0200)]
Starting with mil app
Aleksander Łukasz [Tue, 8 Oct 2013 09:48:42 +0000 (11:48 +0200)]
Merge branch 'forum'
Radek Czajka [Tue, 8 Oct 2013 09:19:18 +0000 (11:19 +0200)]
Display structs in contact form nicely.
Radek Czajka [Mon, 7 Oct 2013 13:55:19 +0000 (15:55 +0200)]
fix
Radek Czajka [Mon, 7 Oct 2013 13:37:34 +0000 (15:37 +0200)]
Menu change.
Radek Czajka [Mon, 7 Oct 2013 13:37:24 +0000 (15:37 +0200)]
Add formsets to contact forms, add WTEM form.
Aleksander Łukasz [Tue, 10 Sep 2013 14:22:02 +0000 (16:22 +0200)]
Hide category names on forum index page
Aleksander Łukasz [Tue, 10 Sep 2013 13:34:08 +0000 (15:34 +0200)]
Merge branch 'master' into forum
Conflicts:
edumed/templates/home.html
Aleksander Łukasz [Thu, 5 Sep 2013 12:20:40 +0000 (14:20 +0200)]
Logout link
Aleksander Łukasz [Thu, 5 Sep 2013 12:08:38 +0000 (14:08 +0200)]
Non authenticated users aren't allowed to use forum for now
Aleksander Łukasz [Wed, 4 Sep 2013 15:43:08 +0000 (17:43 +0200)]
Hide polls from post form for non superusers
Aleksander Łukasz [Wed, 4 Sep 2013 15:42:30 +0000 (17:42 +0200)]
Allow for authenticated non super users to create posts and topics
Aleksander Łukasz [Wed, 4 Sep 2013 15:30:08 +0000 (17:30 +0200)]
Link to a forum
Aleksander Łukasz [Wed, 4 Sep 2013 11:35:03 +0000 (13:35 +0200)]
Forum search
Aleksander Łukasz [Mon, 2 Sep 2013 15:24:17 +0000 (17:24 +0200)]
Forum: Missing translation
Aleksander Łukasz [Mon, 2 Sep 2013 15:18:51 +0000 (17:18 +0200)]
Forum: Making subject input field wider
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.
Aleksander Łukasz [Mon, 2 Sep 2013 08:25:24 +0000 (10:25 +0200)]
Additional link
Aleksander Łukasz [Thu, 29 Aug 2013 14:55:30 +0000 (16:55 +0200)]
Forum: Grouping lessons by their section on the forum post form
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
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
Aleksander Łukasz [Thu, 29 Aug 2013 08:29:38 +0000 (10:29 +0200)]
Forum: styling topic view
Aleksander Łukasz [Thu, 29 Aug 2013 09:01:47 +0000 (11:01 +0200)]
First take on connecting lessons to forum topics
Aleksander Łukasz [Mon, 26 Aug 2013 08:28:41 +0000 (10:28 +0200)]
Links to infographics info page
Aleksander Łukasz [Tue, 13 Aug 2013 10:52:53 +0000 (12:52 +0200)]
Merge branch 'master' into forum
Radek Czajka [Fri, 9 Aug 2013 12:52:35 +0000 (14:52 +0200)]
Make forum somewhat usable, display Libravatars.
Radek Czajka [Wed, 7 Aug 2013 14:02:58 +0000 (16:02 +0200)]
Don't build student PDF for project.
Radek Czajka [Wed, 7 Aug 2013 13:09:01 +0000 (15:09 +0200)]
Need lxml>3.0 for handling Unicode in PySolr nicely.
Radek Czajka [Wed, 7 Aug 2013 12:02:32 +0000 (14:02 +0200)]
Add some white border.
Radek Czajka [Wed, 7 Aug 2013 11:37:44 +0000 (13:37 +0200)]
Merge branch 'infographics'
Radek Czajka [Wed, 7 Aug 2013 11:37:17 +0000 (13:37 +0200)]
Project list on project page.
Radek Czajka [Tue, 30 Jul 2013 14:13:48 +0000 (16:13 +0200)]
Fixes #2908: projects.
Radek Czajka [Tue, 30 Jul 2013 13:53:59 +0000 (15:53 +0200)]
Fixes #2904: Infographics support.
Radek Czajka [Tue, 30 Jul 2013 12:59:39 +0000 (14:59 +0200)]
Starting with forum.
Radek Czajka [Mon, 22 Jul 2013 09:00:54 +0000 (11:00 +0200)]
Add project lesson template.
Radek Czajka [Mon, 22 Jul 2013 08:56:31 +0000 (10:56 +0200)]
Add project as course type.
Radek Czajka [Thu, 18 Jul 2013 13:35:44 +0000 (15:35 +0200)]
Move to Django 1.5
Radek Czajka [Fri, 21 Jun 2013 11:34:27 +0000 (13:34 +0200)]
minor fix
Radek Czajka [Fri, 21 Jun 2013 10:59:17 +0000 (12:59 +0200)]
Fix error in a name.
Radek Czajka [Fri, 21 Jun 2013 10:55:10 +0000 (12:55 +0200)]
add lesson stubs
Radek Czajka [Thu, 20 Jun 2013 13:27:34 +0000 (15:27 +0200)]
link good practices
Radek Czajka [Thu, 20 Jun 2013 13:09:07 +0000 (15:09 +0200)]
minor fix
Radek Czajka [Thu, 20 Jun 2013 13:06:59 +0000 (15:06 +0200)]
photo on main
Radek Czajka [Thu, 20 Jun 2013 12:53:36 +0000 (14:53 +0200)]
auto-count on main
Radek Czajka [Thu, 20 Jun 2013 12:42:24 +0000 (14:42 +0200)]
fix for non-sectioned lessons nav
Radek Czajka [Thu, 20 Jun 2013 12:17:14 +0000 (14:17 +0200)]
Various minor changes
Radek Czajka [Thu, 20 Jun 2013 10:11:18 +0000 (12:11 +0200)]
Overdue fixes.
Radek Czajka [Fri, 5 Apr 2013 12:11:02 +0000 (14:11 +0200)]
add privacy link, another contact form
Radek Czajka [Fri, 15 Mar 2013 09:18:18 +0000 (10:18 +0100)]
Start annoying.
Radek Czajka [Thu, 21 Feb 2013 09:15:34 +0000 (10:15 +0100)]
html5shiv for ie8
Radek Czajka [Wed, 20 Feb 2013 14:26:09 +0000 (15:26 +0100)]
disable unused carousel
Radek Czajka [Wed, 20 Feb 2013 14:00:51 +0000 (15:00 +0100)]
add cache
Radek Czajka [Wed, 20 Feb 2013 13:45:09 +0000 (14:45 +0100)]
minor changes
Radek Czajka [Wed, 20 Feb 2013 13:13:12 +0000 (14:13 +0100)]
add a contact form
Radek Czajka [Wed, 20 Feb 2013 12:52:23 +0000 (13:52 +0100)]
repair build_*
Radek Czajka [Wed, 20 Feb 2013 11:39:47 +0000 (12:39 +0100)]
a@name to @id
Radek Czajka [Wed, 20 Feb 2013 11:27:00 +0000 (12:27 +0100)]
form change
Radek Czajka [Wed, 20 Feb 2013 10:49:53 +0000 (11:49 +0100)]
Contact forms.
Radek Czajka [Wed, 20 Feb 2013 09:39:08 +0000 (10:39 +0100)]
random fixes
Radek Czajka [Tue, 19 Feb 2013 14:36:11 +0000 (15:36 +0100)]
lesson number, photo attribution
Radek Czajka [Tue, 19 Feb 2013 13:51:02 +0000 (14:51 +0100)]
caption spacing
Radek Czajka [Tue, 19 Feb 2013 13:38:25 +0000 (14:38 +0100)]
allow competence sections in dc
Radek Czajka [Tue, 19 Feb 2013 12:19:22 +0000 (13:19 +0100)]
style instructions
Radek Czajka [Tue, 19 Feb 2013 12:00:19 +0000 (13:00 +0100)]
exercises fix
Radek Czajka [Tue, 19 Feb 2013 11:15:17 +0000 (12:15 +0100)]
change carousel layout
Radek Czajka [Tue, 19 Feb 2013 09:45:53 +0000 (10:45 +0100)]
allow longer slugs
Radek Czajka [Mon, 18 Feb 2013 15:49:20 +0000 (16:49 +0100)]
layout fix for info
Radek Czajka [Mon, 18 Feb 2013 12:25:41 +0000 (13:25 +0100)]
add materials to lesson pack
Radek Czajka [Fri, 15 Feb 2013 15:56:10 +0000 (16:56 +0100)]
fix relative paths issue in import; two kinds of pdf
Radek Czajka [Thu, 14 Feb 2013 16:12:28 +0000 (17:12 +0100)]
fix
Radek Czajka [Thu, 14 Feb 2013 16:09:57 +0000 (17:09 +0100)]
donwload links
fnp / edumed.git / log