Review PR for Ned and Xavier - #18

Closed

martynjames wants to merge 63 commits into

nullfrom

Commits on Nov 11, 2014

Initial commit
marjev
committed
bb2c329
Iframe will not overflow, width set to 100% and aspect ratio is maintained
marjev
committed
46309a4
Set rows and columns of textarea to match textarea from which the embeded code is copied
marjev
committed
97c4a69

Commits on Nov 12, 2014

First unit test - Testing studio submit
marjev
committed
843c926

Commits on Nov 13, 2014

README.md updated with installation and testing info
marjev
committed
b96ada9

Commits on Nov 14, 2014

Enabled editing of google calendar component
marjev
committed
b22ce8a

Commits on Nov 17, 2014

Merge pull request #1 from edx-solutions/mjevtic/workbranch
Martyn James
committed
312e433

Commits on Nov 24, 2014

UI string review for google docs and calendar
mhoeber
committed
366b3c9
Merge pull request #2 from edx-solutions/markhoeber-studio-UI-review
mhoeber
committed
5f3c329

Commits on Dec 2, 2014

Reporting event for analytics
marjev
committed
7e5218d
Merge pull request #4 from edx-solutions/mjevtic/analytics-emit-events
Martyn James
committed
258ad43
Added validation for google docs

marjev
authored and
Martyn James
committed
7564990
Added validation for google calendar

marjev
authored and
Martyn James
committed
bf3fb49
URL redirection is also valid behaviour

marjev
authored and
Martyn James
committed
3cce68c
Merge pull request #5 from edx-solutions/mjevtic/validation
Martyn James
committed
38c7535

Commits on Dec 3, 2014

Fixes for width/height & test folder repositioning

marjev
authored and
Martyn James
committed
2fcd892
Some tweaks to style and javascript loading
Martyn James
committed
a5be4e1
Set correct default values
marjev
committed
f9e8653
Documention on css changes and validation
marjev
committed
906e330

Commits on Dec 4, 2014

Merge pull request #3 from edx-solutions/mjevtic/workbranch
Martyn James
committed
737debd
Update README.md
Martyn James
committed
2b6a8ac
Merge pull request #6 from edx-solutions/mjevtic/documentation
Martyn James
committed
2a3cfb2

Commits on Dec 5, 2014

Fixes for documentation on testing
marjev
committed
3ef0d90
Merge pull request #9 from edx-solutions/mjevtic/documentation-fixes
Martyn James
committed
8b8da41
Bugfix for edit not working on solutions + bugfixes for problems noticed by Xavier

marjev
authored and
Martyn James
committed
d2b622c
Fixes problem when loading document edit box
Martyn James
committed
58631fa
Scope styles within CSS, Common CSS moved to common file, removed dead code, and slight reordering for ease of reading
Martyn James
committed
cbe645c
Addresses SOL-125. Removes calendar dropdown within google calendar
Martyn James
committed
80ca9d8
Improved analytics names. displayedin attribute indicates element type in which google doc was embedded
Martyn James
committed
d9456ae
Fix event handler call
Martyn James
committed
248be18
Merge pull request #8 from edx-solutions/mjevtic/bufixes
Martyn James
committed
c5e6c70

Commits on Dec 9, 2014

Enumerated list of calendar views, status code now indicates malformed syntax, renamed eventing json_handler to a generic name
marjev
committed
7c6ab0c

Commits on Dec 10, 2014

Added title attribute to iframe/img
marjev
committed
7dc4e55
Included PublishEventMixin
marjev
committed
de1503a
Merge pull request #10 from edx-solutions/mjevtic/SOL-135
Martyn James
committed
963019b

Commits on Dec 11, 2014

Commits on Dec 15, 2014

Merge pull request #12 from edx-solutions/mjevtic/unit-tests
Martyn James
committed
31a8119

Commits on Dec 23, 2014

Renamed displayedin to displayed_in; added alt attribute instead of title for img html elements;
marjev
committed
4b76b16

Commits on Dec 24, 2014

Added option to edit alt description for images; rewrote test for that studio submit option
marjev
committed
6592899

Commits on Jan 7, 2015

Added integration tests
marjev
committed
15728ae

Commits on Jan 30, 2015

Merge pull request #13 from edx-solutions/mjevtic/analytics-fixes
Martyn James
committed
0c5718c
Clean up and reorganization
Martyn James
committed
ad86b84

Commits on Feb 2, 2015

Fixed unit tests to run on the newest version of workbench
marjev
committed
0887699

Commits on Feb 3, 2015

Updated requirements file
marjev
committed
1b6dbb6
Split long lines into two
marjev
committed
7920340
Added the YAML file for Travis; Added coverage to requirements.txt; Described how someone can get test coverage in README file
marjev
committed
39c446a
Merge pull request #15 from edx-solutions/mjevtic/SOL-299
Martyn James
committed
86f99fc

Commits on Feb 4, 2015

pep8 and pylint should be supported and runable on Travis; changed the test coverage report to only include google_drive
marjev
committed
8f39a0b
Merge pull request #16 from edx-solutions/mjevtic/SOL-299
Martyn James
committed
403dc44
Ignore duplicate-code in pylint - it is failing on 5 common lines between the 2 XBlock components herein - better to have a common pattern than to seprate out these lines. Also use virtual display …
Martyn James
committed
51e1002
Update README to show travis project status
Martyn James
committed
75c50bf
Merge pull request #14 from edx-solutions/clean_up
Martyn James
committed
90399e7

Commits on Feb 6, 2015

Changes as a result of feedback
Martyn James
committed
0a83943
Merge pull request #20 from edx-solutions/mjames/Feedback_Updates
Martyn James
committed
9d76471

Commits on Feb 19, 2015

Added integration tests for studio views; Code clean-up;
marjev
committed
64c7b7a
Feedback inspired changes

Martyn James
authored and
marjev
committed
57ccc55
Merge pull request #22 from edx-solutions/mjames/feedback_updates
marjev
committed
e9233c4
Merge pull request #23 from edx-solutions/mjevtic/PR-21-review
marjev
committed
0a7d86e
Code cleaning as a result of feedback
marjev
committed
2d44630
Merge pull request #24 from edx-solutions/mjevtic/PR-18
marjev
committed
1d652d7

Commits on Feb 20, 2015