|
|
3e7fe43d35
|
Merge branch 'master' of 195.113.26.193:/akce/MaM/MaMweb/mamweb
|
2015-09-12 14:45:16 +02:00 |
|
|
|
0864de1fca
|
Autori novinek vpravo.
|
2015-09-12 14:44:25 +02:00 |
|
Aneta
|
9b9d30e25a
|
Opětovný pokus o zrušení úloh.
A.
|
2015-09-12 14:44:05 +02:00 |
|
Aneta
|
15616546c9
|
Zrušení položky Úlohy v submenu zadání.
A.
|
2015-09-12 14:32:24 +02:00 |
|
Matěj Kocián
|
52fc4cd1ea
|
utf pro settings_prod.py
|
2015-09-12 13:36:23 +02:00 |
|
Matěj Kocián
|
380254b877
|
Přidání se mezi adminy
|
2015-09-12 13:25:02 +02:00 |
|
Aneta
|
b9b6e2feb7
|
Přidání lomítka u odkazu na odeslat řešení v menu.
|
2015-09-12 12:56:08 +02:00 |
|
Aneta
|
5e68a7d3db
|
Odkomentování odkazu pro odeslat řešení a smazání zmrtvýchvstalého
souboru menu.html.
|
2015-09-12 12:51:33 +02:00 |
|
|
|
51046e8ee8
|
Merge branch 'master' of 195.113.26.193:/akce/MaM/MaMweb/mamweb
|
2015-09-12 12:34:31 +02:00 |
|
|
|
7828f34315
|
Nezobrazovat nazev stranky na zacatku textu.
|
2015-09-12 12:33:38 +02:00 |
|
Aneta
|
d64cd84e6a
|
Merge branch 'master' of atrey.karlin.mff.cuni.cz:/akce/MaM/MaMweb/mamweb
Conflicts:
mamweb/templates/menu.html
seminar/templates/seminar/novinky.html
seminar/views.py
|
2015-09-12 12:31:15 +02:00 |
|
Aneta
|
347b3e07e2
|
Smazání komentáře u odkazu v menu.
A.
|
2015-09-12 12:27:38 +02:00 |
|
Matěj Kocián
|
993a9df4a8
|
Odkaz na titulní stranu z hlavičky
|
2015-09-12 11:14:21 +02:00 |
|
Bc. Petr Pecha
|
85ca7d602b
|
Podbarveni submenu archiv
|
2015-09-11 18:36:57 +02:00 |
|
Bc. Petr Pecha
|
a5f816240c
|
Podbarveni menu clanky
|
2015-09-11 18:36:57 +02:00 |
|
Bc. Petr Pecha
|
8fa661a8ac
|
Podbarveni menu zadani
|
2015-09-11 18:36:57 +02:00 |
|
Bc. Petr Pecha
|
ccd63ae756
|
Podbarveni submenu soustredeni
|
2015-09-11 18:36:57 +02:00 |
|
Bc. Petr Pecha
|
0f4044d7c0
|
Podbarveni submenu uvod
|
2015-09-11 18:36:57 +02:00 |
|
Bc. Petr Pecha
|
92fad5e1f0
|
Podbarvovani menu ve flatpages
|
2015-09-11 18:36:57 +02:00 |
|
Bc. Petr Pecha
|
fd98e13d41
|
Priprava na podbarvovani menu
Menu nemuze byt includovane,
jinak to nefunguje.
|
2015-09-11 18:36:57 +02:00 |
|
Matěj Kocián
|
f2133cc50a
|
MathJax
|
2015-09-11 17:19:36 +02:00 |
|
Jan Musílek
|
1c9ae330dd
|
CSS podle Anet -- 1. verze
|
2015-09-11 04:29:18 +02:00 |
|
Matěj Kocián
|
150505a1be
|
Nastavení APPEND_SLASH = True
|
2015-09-10 23:40:09 +02:00 |
|
Bc. Petr Pecha
|
dd67c977b8
|
Oprava dvojjakosti nadpisu
|
2015-09-10 12:11:28 +02:00 |
|
Bc. Petr Pecha
|
789817362a
|
Pridani do hlavniho nadpisu 404 a 500
|
2015-09-04 20:50:36 +02:00 |
|
Bc. Petr Pecha
|
0dc661f013
|
templaty 404 a 500
|
2015-09-04 20:39:51 +02:00 |
|
Bc. Petr Pecha
|
36b9883491
|
404 | obrazek
+ podklady
|
2015-09-04 20:26:14 +02:00 |
|
Bc. Petr Pecha
|
d131600c69
|
500 | obrazek
|
2015-09-04 17:38:21 +02:00 |
|
Bc. Petr Pecha
|
4ce05750c5
|
Pridani se mezi adminy
|
2015-09-03 19:45:53 +02:00 |
|
Bc. Petr Pecha
|
2a8d542d1e
|
Deaktivace odeslat reseni v menu
|
2015-09-02 21:39:01 +02:00 |
|
Bc. Petr Pecha
|
e9364682e9
|
Odstraneni horniho pruhu pro neprihlasene
Po prihlaseni se pruh objevuje.
Je potreba zobrazovat jen pro prihlasene organizatory.
|
2015-09-02 21:20:27 +02:00 |
|
Bc. Petr Pecha
|
a25c249ad3
|
Nadpis 1. urovne na navrzene misto
|
2015-08-16 15:31:10 +02:00 |
|
Tomas Gavenciak
|
454ff1fdb7
|
Pridany django_extensions do settings_prod
|
2015-07-29 11:47:08 +02:00 |
|
Tomas Gavenciak
|
35d9f0ccd1
|
Oprava nastaveni posilani chybovych mailu
|
2015-07-23 22:50:36 +02:00 |
|
Tomas Gavenciak
|
99bb7da096
|
Posilani chyb emailem (zatim jen gaventovi)
|
2015-07-23 22:22:32 +02:00 |
|
Jan Musílek
|
78f97835d1
|
Merge branch 'master' of atrey.karlin.mff.cuni.cz:/akce/MaM/MaMweb/mamweb
|
2015-07-05 15:41:47 +02:00 |
|
Jan Musílek
|
66c92b4520
|
První hrubý nástřel vzhledu.
|
2015-07-05 15:41:30 +02:00 |
|
Tomas Gavenciak
|
da64ec12a0
|
Fix: vraceni nastaveni lokalni DB
|
2015-07-03 19:09:10 +02:00 |
|
Tomas Gavenciak
|
7542adb996
|
Fix cislo URL
|
2015-07-03 17:50:35 +02:00 |
|
Bc. Petr Pecha
|
93bc61607c
|
I18N zapnuta
|
2015-07-01 11:05:11 +02:00 |
|
Bc. Petr Pecha
|
58301b8b44
|
Odkaz v hlavnim menu na soustredeni poradne pres {% url %}
|
2015-06-30 09:03:10 +02:00 |
|
Bc. Petr Pecha
|
f71ea2db1a
|
Soustredeni | seznam soustredeni
Casy se nezobrazuji cesky
|
2015-06-29 17:51:18 +02:00 |
|
Bc. Petr Pecha
|
7ea86db1b1
|
Zpetny odkaz na titulni stranku
|
2015-06-04 10:59:04 +02:00 |
|
Bc. Petr Pecha
|
d03298fb86
|
Premisteni archivniho menu do archivu
|
2015-06-04 10:13:52 +02:00 |
|
Bc. Petr Pecha
|
b01f1cf232
|
Dodelano zobrazovani submenu
|
2015-06-04 09:46:15 +02:00 |
|
Bc. Petr Pecha
|
cf83fb0593
|
struktura menu + submenu Co je M&M
|
2015-06-03 14:16:30 +02:00 |
|
Bc. Petr Pecha
|
cb50f06840
|
admin | pridani odkazu na stranky
|
2015-06-02 21:52:26 +02:00 |
|
Tomas Gavenciak
|
e5f95d5bda
|
Plna podpora "statickych stranek" (vcetne '/') - flatpages
|
2015-05-27 00:12:41 +02:00 |
|
Tomas Gavenciak
|
57315766d0
|
Update nastaveni logu
|
2015-05-26 14:14:52 +02:00 |
|
Tomas Gavenciak
|
7ad8a8f88b
|
Update db nastaveni pro -test a -prod
|
2015-05-26 13:35:14 +02:00 |
|
Tomas Gavenciak
|
2b38042798
|
Added full threaded comments (to Problem for now)
|
2015-05-26 10:20:42 +02:00 |
|
Tomas Gavenciak
|
8e1e30e672
|
Priprava autocomplete tagu a pod., vzhled adminu
|
2015-05-21 22:17:46 +02:00 |
|
Tomas Gavenciak
|
74bf1afafe
|
Favicon (ikona webu) ze starého webu
|
2015-05-21 21:33:53 +02:00 |
|
Tomas Gavenciak
|
d55b3ad3a9
|
Autocomplete pro Skola (a pozdeji pro dalsi)
|
2015-05-17 07:28:55 +02:00 |
|
Tomas Gavenciak
|
1a6000f0e2
|
Tagy (MFIO) k problemum
|
2015-05-15 15:28:00 +02:00 |
|
Tomas Gavenciak
|
14b678f111
|
Vetsi bezpecnost tajneho session key
|
2015-05-14 02:46:15 +02:00 |
|
Tomas Gavenciak
|
b14b92c5eb
|
Docasny prechod na sqlite v PROD
|
2015-05-14 02:31:14 +02:00 |
|
Tomas Gavenciak
|
1af3db27b8
|
Fix syntax typo
|
2015-05-14 02:22:21 +02:00 |
|
Tomas Gavenciak
|
c891d1b194
|
Pridan externi django secret key soubor
|
2015-05-14 02:19:00 +02:00 |
|
Tomas Gavenciak
|
76a574c484
|
WSGI updating python path
|
2015-05-14 01:47:57 +02:00 |
|
Tomas Gavenciak
|
63bc158e54
|
Uprava zakladnich template - pridava se "admin bar"
|
2015-05-14 00:52:29 +02:00 |
|
Tomas Gavenciak
|
5d24b33d65
|
Update routing, urls, verejne url, ...
|
2015-05-11 12:58:21 +02:00 |
|
Tomas Gavenciak
|
7a88ce8006
|
Simple homepage
|
2015-04-02 00:26:28 +02:00 |
|
Tomas Gavenciak
|
b6003c4094
|
Tagy pro menu
|
2015-04-02 00:09:54 +02:00 |
|
Tomas Gavenciak
|
c5602f31bd
|
Uprava pro test deployment
|
2015-04-02 00:05:48 +02:00 |
|
Tomas Gavenciak
|
8d9de45514
|
Statické soubory mamwebu
|
2015-04-02 00:03:39 +02:00 |
|
Tomas Gavenciak
|
467c7c53b3
|
Nove sketche views pro seminar
|
2015-04-01 14:01:13 +02:00 |
|
Tomas Gavenciak
|
cd3097ba5c
|
Integrate reversion to seminar, add admin-tools
|
2015-03-16 11:36:26 +01:00 |
|
Tomas Gavenciak
|
4b855c6f77
|
Update templates (remove CMS), improve testdata gen
|
2015-03-14 23:31:29 +01:00 |
|
Tomas Gavenciak
|
0b88b8022c
|
Add CKEditor +configure, first tests, test data generation
|
2015-03-14 22:27:04 +01:00 |
|
Tomas Gavenciak
|
b209344e87
|
Remove allauth, add 'make run', clean config, add Nastaveni
|
2015-03-14 15:41:29 +01:00 |
|
Tomas Gavenciak
|
cacc5e4c87
|
Update / refresh settings
|
2015-03-14 14:53:49 +01:00 |
|
Tomas Gavenciak
|
b10ad7f435
|
Add awesome debugging tools
|
2015-03-14 01:19:30 +01:00 |
|
Tomas Gavenciak
|
568f4e9fd8
|
Fix settings import
|
2015-03-14 00:40:55 +01:00 |
|
Tomas Gavenciak
|
8262864be9
|
Remove feincms, revert some experiments
|
2015-03-14 00:33:35 +01:00 |
|
Tomas Gavenciak
|
f6fde3aaa6
|
Flush temporary changes
|
2015-03-13 20:08:18 +01:00 |
|
Tomas Gavenciak
|
f409521498
|
Re-initialised MaMweb with DJ 1.7, backport settings
|
2015-03-07 12:09:28 +01:00 |
|
Tomas Gavenciak
|
492919e3a1
|
Update settings - experiments
|
2014-11-17 12:04:57 +01:00 |
|
Tomas Gavenciak
|
7fced7cbae
|
Initialised with djangocms-installer for Dj 1.6
|
2014-11-05 15:13:59 +01:00 |
|
