Iss3342 - #3509

Closed

s-tikhomirov wants to merge 730 commits into

openedx:masterfrom

smartdec:iss3342

This pull request is big! We're only showing the most recent 250 commits

Commits on Oct 28, 2013

fix compile bug
PYushchenko
committed
babe796
l10n and script for merge po files
PYushchenko
committed
c7aa502
fixes dependency
root
committed
4c6e86b
Fix issue #1820
Lenar Safin
committed
c2dc054

Commits on Oct 29, 2013

Merge branch 'select/release' into tmp
PYushchenko
committed
733ba17
fixes time display
PYushchenko
committed
235434a
fixes
root
committed
d4953a2
fixes
root
committed
d11d2c2
fixes
PYushchenko
committed
81bc01f
Merge remote-tracking branch 'origin/select/devel' into select/release
PYushchenko
committed
dd842c3
Merge branch 'feature/chapter-progress' into select/release
PYushchenko
committed
b1d66f2
Merge branch 'feature/i18n-datetime' into select/release
PYushchenko
committed
e5ba843
add i18n to sending e-mail after un-enroled
jkorvin
committed
8d3d555

Commits on Oct 30, 2013

add option to course
PYushchenko
committed
230fd03
Fix issue #2031
Lenar Safin
committed
458bc46
Merge branch 'select/devel' of https://github.com/smartdec/edx-platform into select/devel
Lenar Safin
committed
9dd16cc
added to Django admin editor for forum permitions #1956
PYushchenko
committed
001143d
fixes #2051 #2043
PYushchenko
committed
47a24a0
Merge remote-tracking branch 'origin/select/devel' into select/release
PYushchenko
committed
cba33ac
Merge branch 'feature/chapter-progress' into select/release
PYushchenko
committed
39ef892
fixes
PYushchenko
committed
20884cb
Merge branch 'feature/chapter-progress' into select/release
PYushchenko
committed
8b1aa2a
fixes #2037 #2038
PYushchenko
committed
b169b69
fixes
PYushchenko
committed
e4fdea3
fixes
PYushchenko
committed
7de9121
Fix issue #1839
Lenar Safin
committed
853b97a
Fix issue #1789
Lenar Safin
committed
a112e5c
Updated po files
root
committed
16330e1
l10n
PYushchenko
committed
b3f4419
...
Lenar Safin
committed
325f1ed
Fix issue #1998
Lenar Safin
committed
f6d5fd8
fixes #1632
PYushchenko
committed
8e2cb5f

Commits on Oct 31, 2013

Move max_enrollment_instr_buttons to course settings
Lenar Safin
committed
8dc080c
Fix issue #2012
Lenar Safin
committed
76bb843
Merge remote-tracking branch 'origin/select/devel' into select/release
PYushchenko
committed
31933ac
fixes
root
committed
6a5e0cf
Merge branch 'select/release' of https://github.com/Man2Life/edx-platform into select/release
root
committed
ea08653
Merge remote-tracking branch 'origin/select/devel' into select/release
PYushchenko
committed
775ef63
Merge branch 'select/release' of https://github.com/Man2Life/edx-platform into select/release
root
committed
b956513
Fix course grading script bug
Lenar Safin
committed
cb40396
Merge branch 'select/release' of https://github.com/Man2Life/edx-platform into select/release
root
committed
f821c0c

Commits on Nov 1, 2013

added django-partial to merge
PYushchenko
committed
8a4876d
Merge branch 'select/release' of github.com:Man2Life/edx-platform into select/release
PYushchenko
committed
3648e20
Merge branch 'select/release' of https://github.com/Man2Life/edx-platform into select/release
root
committed
f867e62
updated po
root
committed
de8bd23
l10n
PYushchenko
committed
688293a
fixes #2054 #2055
PYushchenko
committed
134c760
fix #2010
jkorvin
committed
edb62eb
Fix issue #2011
Lenar Safin
committed
979c76a
i18n few words
jkorvin
committed
fe315b4
#2009 part 3) -done
jkorvin
committed
0666876
Fix "Download CSV of Answer Distributions" button functionality
Lenar Safin
committed
de4880b
rename module into object
jkorvin
committed
dd3df43

Commits on Nov 5, 2013

fix #2007
jkorvin
committed
026abc7
fixes datepicker for #1632
PYushchenko
committed
50313ef
Merge branch 'select/release' of github.com:Man2Life/edx-platform into select/release
PYushchenko
committed
f085051
fix mistake in i18n
jkorvin
committed
6913178
i18n some words in forum
jkorvin
committed
42fbe50
Fix issue #2012
Lenar Safin
committed
3e0c636
Try to workaround an assertion
Lenar Safin
committed
52b7894
Merge pull request #3 from smartdec/feature/i18n_in_forum
PYushchenko
committed
a976af7
fix #1761 and #1648
jkorvin
committed
b80a49c
i18n title in some placeholder
jkorvin
committed
c76ab58
Fix missed message for issue #1777
Lenar Safin
committed
9ddb7d9

Commits on Nov 6, 2013

Problem categories i18n
Lenar Safin
committed
c2b3b1a
Problem creation l10n
Lenar Safin
committed
2464c70
Fix a typo
Lenar Safin
committed
b373553

Commits on Nov 8, 2013

i18n word
jkorvin
committed
89e2249
#2028
jkorvin
committed
9f2754f

Commits on Nov 11, 2013

fix mistake in last commit
jkorvin
committed
dc6a868
Update l10n
root
committed
22a515d

Commits on Nov 15, 2013

fix mistake in i18n
jkorvin
committed
44f21bc
refix #1761
jkorvin
committed
e2137ba

Commits on Nov 19, 2013

Merge remote-tracking branch 'upstream/release' into select/release
PYushchenko
committed
60d4be0
Merge branch 'select/release' of github.com:Man2Life/edx-platform into select/release
PYushchenko
committed
cb9d48e
i18n

jkorvin
authored and
PYushchenko
committed
1626b0a
i18n in cappa dir

jkorvin
authored and
PYushchenko
committed
ff2b93c
bad hack for access to django ugettext in xmodule
PYushchenko
committed
1791294
some l10n
PYushchenko
committed
8552f65
Problem creation l10n

Lenar Safin
authored and
PYushchenko
committed
2b5d6d1
i18n problems

jkorvin
authored and
PYushchenko
committed
8128aeb
Merge pull request #2 from smartdec/feature/xmodule-i18n
PYushchenko
committed
781a2f1

Commits on Nov 20, 2013

Commits on Nov 21, 2013

fixes progress
root
committed
88fc4ff
Merge branch 'select/release' of https://github.com/Man2Life/edx-platform into select/release
root
committed
597e59d
fixes and merge l10n
root
committed
dafdbbc
l10n
PYushchenko
committed
69148de
Revert "Use XBlock handlers for handle_ajax in XModules"
PYushchenko
committed
0cd8ea9

Commits on Nov 25, 2013

fixes #2252
root
committed
de871f7

Commits on Nov 26, 2013

a lot of hardcode to i18n a lot of word in discussion
jkorvin
committed
17aaa3a
some i18n and fix mistake in i18n
jkorvin
committed
0f63491

Commits on Nov 28, 2013

fixes
root
committed
8e0efb7

Commits on Nov 29, 2013

l10n
PYushchenko
committed
c6c9fc5
i18n
root
committed
5dbe416
fixes #2239
PYushchenko
committed
e2b67b9
fixes, l10n
PYushchenko
committed
c116c0a
i18n forum
jkorvin
committed
5ffa0e7
i18n in master class
jkorvin
committed
b637ddc
i18n
PYushchenko
committed
8bcfb17
i18n
root
committed
c0eb5db
l10n
PYushchenko
committed
955b99e

Commits on Dec 2, 2013

update pdf.js
PYushchenko
committed
60e98cc
update pdf.js

PYushchenko
authored and
root
committed
b0493ab
Merge branch 'select/release' of github.com:Man2Life/edx-platform into select/release
PYushchenko
committed
4276143
l10n
PYushchenko
committed
9b2dae7

Commits on Dec 6, 2013

fixes 2344
PYushchenko
committed
a6b5a78
fixes 2342
PYushchenko
committed
35380c3

Commits on Dec 9, 2013

Revert "fixes 2344"
PYushchenko
committed
47aebe1
fixes 2344
PYushchenko
committed
0852047
fixes i18n
PYushchenko
committed
b65184d

Commits on Dec 13, 2013

added i18n
PYushchenko
committed
6988e47

Commits on Jan 17, 2014

Revert "Revert "Use XBlock handlers for handle_ajax in XModules""
PYushchenko
committed
ab8cd31

Commits on Jan 19, 2014

Merge remote-tracking branch 'upstream/release' into select/rc
PYushchenko
committed
0e42e6a

Commits on Jan 22, 2014

i18n
root
committed
e53196b
fixes progress
root
committed
7f5b7c6
Merge branch 'select/release' into select/rc
PYushchenko
committed
c4b27a3
Initial version
PYushchenko
committed
18c9632
Hot fixing
PYushchenko
committed
cd4fdb5
Merge pull request #6 from smartdec/select/progress-csv
PYushchenko
committed
7a417e9
Merge branch 'select/rc' into select/release
PYushchenko
committed
2075c49

Commits on Jan 23, 2014

fixes double header
PYushchenko
committed
20747c7
revert login.html
PYushchenko
committed
5f6cf51
ss
PYushchenko
committed
bf88df5
fixes
PYushchenko
committed
bf4b5dd
added loader
PYushchenko
committed
584d811
fixes
PYushchenko
committed
bad1ebd
fixes
PYushchenko
committed
f71de5e
fixes
PYushchenko
committed
8ecd743
fixes
PYushchenko
committed
a472729
fixes
PYushchenko
committed
ae76730

Commits on Jan 24, 2014

hot fixes
root
committed
11f6b7f
update i18n
root
committed
cdb5034

Commits on Jan 30, 2014

first version
PYushchenko
committed
a30a54d
Merge pull request #8 from smartdec/select/course_list
PYushchenko
committed
9534b08
update i18n
root
committed
ae25f2c
l10n
PYushchenko
committed
752605e
l10n
PYushchenko
committed
b5fe4de

Commits on Jan 31, 2014

fixes attempts
PYushchenko
committed
4f0c2fd
fixes destiny
PYushchenko
committed
1bc7818
alphabet order
PYushchenko
committed
5a4af53

Commits on Feb 7, 2014

l10n
root
committed
401702d
fixes
root
committed
cbd383f

Commits on Mar 4, 2014

hot fixing
root
committed
30563b7

Commits on Mar 6, 2014

fixes #2987
PYushchenko
committed
e6dda1c

Commits on Mar 9, 2014

fixes #2734
root
committed
0dd8ba2
Merge branch 'select/release' of github.com:Man2Life/edx-platform into select/release
PYushchenko
committed
0a1fe1f
fixes #2770
PYushchenko
committed
f881e2f

Commits on Mar 14, 2014

fixes
root
committed
f4c67b5
refs #2996
PYushchenko
committed
90bacb1
fixes
PYushchenko
committed
64564f2
fixes
PYushchenko
committed
90f3485
fixes
PYushchenko
committed
d1f16bc
fixes
PYushchenko
committed
fb5c80b

Commits on Mar 17, 2014

refs and fixes #2995 #2784 #2932 #1797 #2980 #2994
PYushchenko
committed
2563145
added new icon
PYushchenko
committed
8082f10

Commits on Mar 18, 2014

fixes #3044 #2996
PYushchenko
committed
17c61fc
Merge remote-tracking branch 'upstream/release' into select/rc180314
PYushchenko
committed
d730692

Commits on Mar 21, 2014

Commits on Mar 24, 2014

fixes
PYushchenko
committed
216b6a6
Merge branch 'select/rc180314' into select/release
PYushchenko
committed
cab0433
fixes
root
committed
d2b176d
fixes #3044 #2304 #3081 #3054
PYushchenko
committed
9bddca6
Merge branch 'select/release' of github.com:Man2Life/edx-platform into select/release
PYushchenko
committed
34fbca7
fixes #3043
PYushchenko
committed
75ff3ca
fixes
PYushchenko
committed
39bb04f

Commits on Mar 25, 2014

fixes
PYushchenko
committed
cef1fd6
fixes
PYushchenko
committed
84d5808
i18n and fixes
PYushchenko
committed
5f553ee
fixes and i18n
PYushchenko
committed
a13b5d1
i18n
PYushchenko
committed
2756bcc

Commits on Mar 26, 2014

fixes csv and i18n
PYushchenko
committed
62b4e5c
i18n of dates
PYushchenko
committed
e1c6dd5
fixes and i18n
PYushchenko
committed
ba8fd6b
1
PYushchenko
committed
99851da

Commits on Mar 28, 2014

new
PYushchenko
committed
72353ec
i18n, new summary page
PYushchenko
committed
327d33e

Commits on Mar 31, 2014

fixes #3147
PYushchenko
committed
cf80cc1
hotfixes #3152
PYushchenko
committed
a7004a9
Merge branch 'select/new_fullstat' into select/release
PYushchenko
committed
3ded920
fixes
root
committed
afeebb2
fixes
PYushchenko
committed
6a288a0
Merge branch 'select/release' of https://github.com/smartdec/edx-platform into select/release
root
committed
80ee365

Commits on Apr 1, 2014

fixes
PYushchenko
committed
04acab2
Merge branch 'select/release' of https://github.com/smartdec/edx-platform into select/release
root
committed
79ba339

Commits on Apr 2, 2014

fixes
PYushchenko
committed
c50d36e
Merge branch 'select/release' of https://github.com/smartdec/edx-platform into select/release
root
committed
73fa1db
fixes
PYushchenko
committed
d3cfc89
Merge branch 'select/release' of https://github.com/smartdec/edx-platform into select/release
root
committed
bd7a6b7

Commits on Apr 3, 2014

refs #3031
PYushchenko
committed
5af9a41
Merge branch 'select/release' of https://github.com/smartdec/edx-platform into select/release
root
committed
119580d
fixes #3031
PYushchenko
committed
1101fef
Merge branch 'select/release' of https://github.com/smartdec/edx-platform into select/release
root
committed
c5fa31b
fixes #3031
PYushchenko
committed
4b8ef61
Merge branch 'select/release' of https://github.com/smartdec/edx-platform into select/release
root
committed
0bc9db5

Commits on Apr 10, 2014

i18n
root
committed
fa9331e
some staff
PYushchenko
committed
05c3e75
i18n
PYushchenko
committed
28153e0
fixes
PYushchenko
committed
2d04baa

Commits on Apr 11, 2014

try fix i18n
PYushchenko
committed
633de41

Commits on Apr 14, 2014

verstion 0.1b email sender
PYushchenko
committed
4338ba3
email sender add schema migration
PYushchenko
committed
6013905
Merge branch 'select/email_sender' into select/release
PYushchenko
committed
6ba7a1e
i18n
PYushchenko
committed
7652175
hotfix
PYushchenko
committed
048d877
fixes js
PYushchenko
committed
3fc24a3
hotfixes ugettext
PYushchenko
committed
11d0783
fixes model
PYushchenko
committed
f5f3450
fixes _u
PYushchenko
committed
402e380
fixes
root
committed
fed382b
Merge branch 'select/release' of https://github.com/smartdec/edx-platform into select/release
root
committed
590de3f
fixes email sending
PYushchenko
committed
67bf666
Merge branch 'select/release' of https://github.com/smartdec/edx-platform into select/release
root
committed
98de649

Commits on Apr 15, 2014

fixes #3275
PYushchenko
committed
ca27c2c
Merge branch 'select/release' of https://github.com/smartdec/edx-platform into select/release
root
committed
88907d4

Commits on Apr 16, 2014

New news fixes #3172
PYushchenko
committed
ecbb37d
fixes
root
committed
030925c
Merge branch 'select/release' of https://github.com/smartdec/edx-platform into select/release
root
committed
1170b19
fixes
PYushchenko
committed
e657757
Merge branch 'select/release' of https://github.com/smartdec/edx-platform into select/release
root
committed
2356c77
fixes
PYushchenko
committed
4e36af1
Merge branch 'select/release' of https://github.com/smartdec/edx-platform into select/release
root
committed
04407db
fixes
PYushchenko
committed
e5788c3
Merge branch 'select/release' of https://github.com/smartdec/edx-platform into select/release
root
committed
dc7f32c
fixes
PYushchenko
committed
824fc59
Merge branch 'select/release' of https://github.com/smartdec/edx-platform into select/release
root
committed
c276a7a

Commits on Apr 18, 2014

fixes
PYushchenko
committed
e3ad2f3
fixes style dep
root
committed
705cb03
fixes
root
committed
744babd
Merge branch 'select/release' of https://github.com/smartdec/edx-platform into select/release
root
committed
32ff414

Commits on Apr 21, 2014

Commits on Apr 22, 2014

refs #3262
PYushchenko
committed
d8a8a12

Commits on Apr 24, 2014

fixes and i18n
root
committed
46b4f1f
Merge remote-tracking branch 'upstream/release' into select/rc23042013
PYushchenko
committed
90032b3

Commits on Apr 28, 2014

Merge branch 'select/rc23042013' into select/release
PYushchenko
committed
efaa0b7

Commits on Apr 29, 2014

statistics page, filters for fullstat.csv

Sergey Tikhomirov
authored and
PYushchenko
committed
1f4c8d2
stat page centered (with lousy <center> tag)

Sergey Tikhomirov
authored and
PYushchenko
committed
b6c718a
access to stat only if user.is_staff

Sergey Tikhomirov
authored and
PYushchenko
committed
de0661e
account_activated filter added

Sergey Tikhomirov
authored and
PYushchenko
committed
27fcb69
Merge pull request #9 from smartdec/select/integral-stat
PYushchenko
committed
9d85215
issue 3172 fixed

Sergey Tikhomirov
authored and
PYushchenko
committed
ec57f67
iss3343 (testing needed)

Sergey Tikhomirov
authored and
PYushchenko
committed
f131b88
Merge pull request #10 from smartdec/iss3172
PYushchenko
committed
b92d24c
translation minor fixes
Sergey Tikhomirov
committed
0128526
Merge branch 'select/release' of https://github.com/smartdec/edx-platform into select/release
Sergey Tikhomirov
committed
03ea337
issue 3342 fixed (testing needed)
Sergey Tikhomirov
committed
94fc696