Merge branch 'master' into WTL_0.9
Description
Description
Details
Details
- Committed
crisbal Oct 14 2016, 7:50 PM - Parents
- R192:ffa968559f36: Update reference to skin/WikiToLearnSkin
R192:a4bc3a3446fd: Merge branch 'master' into WTL_0.9 - Branches
- Unknown
- Tags
- References
- tag: 0.9.3
Merged Changes
Merged Changes
Commit | Author | Details | Committed | |||
---|---|---|---|---|---|---|
ffa968559f36 | crisbal | Update reference to skin/WikiToLearnSkin | Oct 14 2016 | |||
f7c4e67a0ad8 | atundo | Updated CourseEditor | Oct 14 2016 | |||
69a2145fbe02 | tomaluca | updated to ocg 1.7.1 | Oct 14 2016 | |||
2c434d8ef0f7 | ruphy | bump and add ContributorsMap | Oct 14 2016 | |||
a9b16ba8efa8 | ruphy | bump ContributorsMap | Oct 14 2016 | |||
ac46ccd63180 | tomaluca | new OCG docker (1.7) | Oct 13 2016 | |||
10e3450f5d40 | atundo | Updated WikiToLearnSkin and CourseEditor | Oct 12 2016 | |||
1298906dc12c | atundo | Updated CourseEditor | Oct 12 2016 | |||
e803e21b8f0e | tomaluca | bump for skins/WikiToLearnSkin | Oct 12 2016 | |||
0b3a948b5004 | tomaluca | removed ContributorsMap from LocalSettings | Oct 12 2016 | |||
7a81b18736f0 | ruphy | bump ContributorsMap | Oct 12 2016 | |||
00f3e013d215 | ruphy | add Contributors map | Oct 12 2016 | |||
e2a82c0b04eb | crisbal | Merge branch 'master' of https://github.com/WikiToLearn/WikiToLearn | Oct 12 2016 | |||
03bedd173e31 | crisbal | Add more debug options to LocalSettings.php | Oct 12 2016 | |||
adb103303238 | atundo | Merge branch 'master' of https://github.com/WikiToLearn/WikiToLearn | Oct 11 2016 | |||
ac46e1e94f9e | atundo | Updated WikiToLearnSkind and CourseEditor | Oct 11 2016 | |||
a4f58e6ee5eb | tomaluca | replaced wgUseInstantCommons with wgForeignFileRepos | Oct 11 2016 | |||
5d628a0dfe4c | tomaluca | Hack about cookies: remember me and logout works cross-domains | Oct 11 2016 | |||
8a3dbe86a577 | tomaluca | removed oldpoolwiki file pool | Oct 11 2016 | |||
7cef0de6e23f | crisbal | Update reference to skin/WikiToLearnSkin | Oct 10 2016 | |||
be7da922144d | crisbal | Update reference to skin/WikiToLearnSkin | Oct 10 2016 | |||
27929a082986 | tomaluca | update to wikitolearn/websrv:0.17 | Oct 10 2016 | |||
18b10252b20c | tomaluca | Flow update: REL1_27-af307cc to REL1_27-2fb479c | Oct 9 2016 | |||
12df896baea5 | tomaluca | Update dockers references to wikitolearn/websrv:0.16 and wikitolearn/restbase:0. | Oct 9 2016 | |||
7dc161eb3219 | crisbal | Update reference to skin/WikiToLearnSkin | Oct 9 2016 | |||
bea7779de378 | crisbal | Update reference to skin | Oct 8 2016 | |||
067320d0344e | crisbal | Merge branch 'master' of https://github.com/WikiToLearn/WikiToLearn | Oct 8 2016 | |||
bd2794243a89 | atundo | Updated WikiToLearnSkin | Oct 8 2016 | |||
34f8887c8fba | crisbal | Update skin reference | Oct 8 2016 | |||
c3fed7422366 | atundo | Updated CourseEditor and WikiToLearnSkin submodules | Oct 8 2016 | |||
ece72d234a7b | atundo | Updated CourseEditor and WikiToLearnSkin | Oct 8 2016 | |||
7a25be133baf | crisbal | Update reference | Oct 8 2016 | |||
ff375b1b57d5 | atundo | Updated CourseEditor | Oct 8 2016 | |||
b97a07973a2e | atundo | Updated CourseEditor and WikiToLearnSkin | Oct 8 2016 | |||
c1685987df54 | crisbal | Update skins/WikiToLearnSkin reference | Oct 7 2016 | |||
d41a02f94d13 | tomaluca | updated reference to wikitolearn/restbase:0.1.10 | Oct 6 2016 | |||
0690e2048fe7 | atundo | Updated WikiToLearnSkin submodule | Oct 6 2016 | |||
03c5a2a8877a | tomaluca | wgHiddenPrefs for math | Oct 6 2016 | |||
726d0ebd4ed2 | tomaluca | New reference for restbase and parsoid | Oct 6 2016 | |||
95ec64f91583 | atundo | Updated CourseEditor | Oct 5 2016 | |||
ff3e3e012272 | atundo | Updated CourseEditor | Oct 5 2016 | |||
643c7918874c | crisbal | Update reference | Oct 5 2016 | |||
f95dad4ee1d8 | atundo | Updated CourseEditor and WikiToLearnSkin | Oct 5 2016 | |||
3a3fdc71695d | atundo | Merge branch 'master' of https://github.com/WikiToLearn/WikiToLearn | Oct 5 2016 | |||
dfbc8b3b67f5 | atundo | Update CourseEditor and WikiToLearnSkin | Oct 5 2016 | |||
0cced2633e13 | ruphy | disable language preferences | Oct 4 2016 | |||
c9863de44524 | tomaluca | updated to wikitolearn/haproxy:0.6.8 | Oct 3 2016 | |||
196eba8d6801 | atundo | Updated CourseEditor | Oct 3 2016 | |||
ec4431c61f22 | atundo | Updated CourseEditor | Oct 3 2016 | |||
e4d948810b8c | atundo | Updated CourseEditor submodule | Oct 2 2016 |