Resolve conflicts
[idea/community.git] / python / educational-core / student / src / com / jetbrains / edu / learning / ui / StudyJavaFxToolWindow.java
2016-05-18 Valentina KiryushkinaResolve conflicts
2016-05-13 Valentina KiryushkinaMinor refactoring
2016-05-11 Elizaveta ShashkovaMerge pull request #386 fix conflict
2016-05-06 Shaverdova ElenaMerge branch 'leneshka/template-projects'
2016-05-05 nikMerge branch 'patch-1' of https://github.com/ryenus...
2016-05-04 Max MedvedevMerge remote-tracking branch 'origin/master' into medve...
2016-04-29 Dmitry AvdeevMerge branch 'merge_android_2'
2016-04-28 Vasily RomanikhinMerge branch 'master' into vromanik/doxygen
2016-04-28 Vladislav.SorokaMerge branch 'master' of https://github.com/dmitry...
2016-04-27 Vasily PisarMerge branch 'master' into daywalker/cmake_editing
2016-04-26 Andrey VlasovskikhMerge remote-tracking branch 'fitermay/pysdk-patch'
2016-04-26 Valentina KiryushkinaMinor cleanup
2016-04-25 Vladimir KrivosheevMerge remote-tracking branch 'origin/master' into IDEA...
2016-04-23 liana.bakradzeMerge remote-tracking branch 'origin/liana/course-creat...
2016-04-04 Aleksandr SamofalovMerge branches 'evagl/included-from' and 'master' of...
2016-04-04 Max MedvedevMerge remote-tracking branch 'origin/master' into medve...
2016-03-30 Vasily PisarMerge branch 'master' into daywalker/cmake_editing clion/146.1019 clion/146.1104 clion/146.960
2016-03-25 Alexey UtkinMerge branch 'master' into uta/complete-statement clion/146.850
2016-03-24 Daniil OvchinnikovMerge PR #312 (https://github.com/JetBrains/intellij...
2016-03-22 liana.bakradzenew editing mode for task description panel
2016-03-17 Valentina KiryushkinaFix #EDU-561 Always show default implementation of...
2016-03-16 Roman ShevchenkoMerge pull request #365 (https://github.com/JetBrains...
2016-03-16 Alexey UtkinMerge branch 'master' into uta/complete-statement
2016-03-15 Valentina KiryushkinaAdd ability for educational plugins to provide addition...
2016-03-03 AleksandrMerge branches 'evagl/included-from' and 'master' of... appcode/146.614
2016-03-02 Alexey UtkinMerge branch 'master' into uta/complete-statement
2016-03-01 Alexander KoshevoyMerge remote-tracking branch 'origin/akoshevoy/docker...
2016-02-29 Ivan ChirkovMerge remote-tracking branch 'origin/master'
2016-02-29 Dmitry TrofimovMerge remote-tracking branch 'origin/master'
2016-02-29 Roman ShevchenkoMerge remote-tracking branch 'origin/master'
2016-02-29 Nadya ZabrodinaMerge branch 'nz/shelveCleaning'
2016-02-29 Liana BakradzeEDU-543 IAE in StudyBrowser if several projects opened
2016-02-25 AleksandrMerge branches 'evagl/included-from' and 'master' of... appcode/146.184 appcode/146.332
2016-02-24 Alexey UshakovMerge pull request #350 (https://github.com/JetBrains...
2016-02-24 Alexander KoshevoyMerge remote-tracking branch 'origin/master' into akosh...
2016-02-18 Mikhail GolubevMerge branch 'east825/IDEA-136499'
2016-02-17 Dmitry BatkovichMerge branch 'master' into db/inspection-tool-window appcode/144.4273 clion/144.4274
2016-02-15 Mikhail GolubevMerge branch 'east825/pep484-function-type-comments'
2016-02-11 Max MedvedevMerge branch 'medvedev/OC-12584'
2016-02-11 Dmitry JemerovMerge remote-tracking branch 'origin/master' appcode/144.4024 appcode/144.4059
2016-02-11 Valentina KiryushkinaShow swing tool window if user doesn't have JavaFX...