Merge branch 'master' into WTL_0.9

Authored by crisbal on Oct 14 2016, 7:50 PM.

Description

Merge branch 'master' into WTL_0.9

Details

Merged Changes

This commit merges a very large number of changes. Only the first 50 are shown.
CommitAuthorDetailsCommitted
ffa968559f36crisbal
Update reference to skin/WikiToLearnSkin 
Oct 14 2016
f7c4e67a0ad8atundo
Updated CourseEditor 
Oct 14 2016
69a2145fbe02tomaluca
updated to ocg 1.7.1 
Oct 14 2016
2c434d8ef0f7ruphy
bump and add ContributorsMap 
Oct 14 2016
a9b16ba8efa8ruphy
bump ContributorsMap 
Oct 14 2016
ac46ccd63180tomaluca
new OCG docker (1.7) 
Oct 13 2016
10e3450f5d40atundo
Updated WikiToLearnSkin and CourseEditor 
Oct 12 2016
1298906dc12catundo
Updated CourseEditor 
Oct 12 2016
e803e21b8f0etomaluca
bump for skins/WikiToLearnSkin 
Oct 12 2016
0b3a948b5004tomaluca
removed ContributorsMap from LocalSettings 
Oct 12 2016
7a81b18736f0ruphy
bump ContributorsMap 
Oct 12 2016
00f3e013d215ruphy
add Contributors map 
Oct 12 2016
e2a82c0b04ebcrisbal
Merge branch 'master' of https://github.com/WikiToLearn/WikiToLearn 
Oct 12 2016
03bedd173e31crisbal
Add more debug options to LocalSettings.php 
Oct 12 2016
adb103303238atundo
Merge branch 'master' of https://github.com/WikiToLearn/WikiToLearn 
Oct 11 2016
ac46e1e94f9eatundo
Updated WikiToLearnSkind and CourseEditor 
Oct 11 2016
a4f58e6ee5ebtomaluca
replaced wgUseInstantCommons with wgForeignFileRepos 
Oct 11 2016
5d628a0dfe4ctomaluca
Hack about cookies: remember me and logout works cross-domains 
Oct 11 2016
8a3dbe86a577tomaluca
removed oldpoolwiki file pool 
Oct 11 2016
7cef0de6e23fcrisbal
Update reference to skin/WikiToLearnSkin 
Oct 10 2016
be7da922144dcrisbal
Update reference to skin/WikiToLearnSkin 
Oct 10 2016
27929a082986tomaluca
update to wikitolearn/websrv:0.17 
Oct 10 2016
18b10252b20ctomaluca
Flow update: REL1_27-af307cc to REL1_27-2fb479c 
Oct 9 2016
12df896baea5tomaluca
Update dockers references to wikitolearn/websrv:0.16 and wikitolearn/restbase:0. 
Oct 9 2016
7dc161eb3219crisbal
Update reference to skin/WikiToLearnSkin 
Oct 9 2016
bea7779de378crisbal
Update reference to skin 
Oct 8 2016
067320d0344ecrisbal
Merge branch 'master' of https://github.com/WikiToLearn/WikiToLearn 
Oct 8 2016
bd2794243a89atundo
Updated WikiToLearnSkin 
Oct 8 2016
34f8887c8fbacrisbal
Update skin reference 
Oct 8 2016
c3fed7422366atundo
Updated CourseEditor and WikiToLearnSkin submodules 
Oct 8 2016
ece72d234a7batundo
Updated CourseEditor and WikiToLearnSkin 
Oct 8 2016
7a25be133bafcrisbal
Update reference 
Oct 8 2016
ff375b1b57d5atundo
Updated CourseEditor 
Oct 8 2016
b97a07973a2eatundo
Updated CourseEditor and WikiToLearnSkin 
Oct 8 2016
c1685987df54crisbal
Update skins/WikiToLearnSkin reference 
Oct 7 2016
d41a02f94d13tomaluca
updated reference to wikitolearn/restbase:0.1.10 
Oct 6 2016
0690e2048fe7atundo
Updated WikiToLearnSkin submodule 
Oct 6 2016
03c5a2a8877atomaluca
wgHiddenPrefs for math 
Oct 6 2016
726d0ebd4ed2tomaluca
New reference for restbase and parsoid 
Oct 6 2016
95ec64f91583atundo
Updated CourseEditor 
Oct 5 2016
ff3e3e012272atundo
Updated CourseEditor 
Oct 5 2016
643c7918874ccrisbal
Update reference 
Oct 5 2016
f95dad4ee1d8atundo
Updated CourseEditor and WikiToLearnSkin 
Oct 5 2016
3a3fdc71695datundo
Merge branch 'master' of https://github.com/WikiToLearn/WikiToLearn 
Oct 5 2016
dfbc8b3b67f5atundo
Update CourseEditor and WikiToLearnSkin 
Oct 5 2016
0cced2633e13ruphy
disable language preferences 
Oct 4 2016
c9863de44524tomaluca
updated to wikitolearn/haproxy:0.6.8 
Oct 3 2016
196eba8d6801atundo
Updated CourseEditor 
Oct 3 2016
ec4431c61f22atundo
Updated CourseEditor 
Oct 3 2016
e4d948810b8catundo
Updated CourseEditor submodule 
Oct 2 2016