Skip to content

Snippets 7 #72

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Open
wants to merge 140 commits into
base: development
Choose a base branch
from
Open

Snippets 7 #72

wants to merge 140 commits into from

Conversation

@biong
Copy link

@biong biong commented Mar 15, 2011

Here are the layouts for our module. database integration and pulling is working well with some features like creating a snippet. We have documentation, workflow, and storyboard on the poster. This will help aid the rest of the workflow.

biong and others added 30 commits February 1, 2011 17:40
Merge branch 'cove_interval_thumbnail' of https://github.com/savethew…
3c4deb0 
…aves/cove into cove_interval_thumbnail
Merge branch 'cove_interval_thumbnail' into development
6a05ac8
Merge branch 'development' of git://github.com/icl/cove into development
590c730
Merge branch 'development' of git://github.com/icl/cove into development
a8da248
Merge branch 'development' of git://github.com/icl/cove into development
9a790d5
adding modified interval.rb
41fc315
Merge branch 'release' of git://github.com/icl/cove into development
20f9ca2
Merge branch 'release' of git://github.com/icl/cove into development
c095379
@winnyhuang
edited show page
5444892
Merge branch 'snippets' of https://github.com/winnyhuang/cove into sn…
5a08c60 
…ippets
add modified video-js js/css
43300b7
modified video-js initial run
065f7f8
@winnyhuang
edited stylesheet
2396a76
Merge branch 'development' of git://github.com/icl/cove into snippets
4d48431
@jsonnikson
add snippet model and associate with interval
d7e87ce
@jsonnikson
add snippets controller and route
ebea226
@jsonnikson
actually add snippet model this time
159e14c
@jsonnikson
added property snippetDuration
694d123
@jsonnikson
first go at snippet creation
a89135f
@winnyhuang
Merge branch 'snippets' of https://github.com/jsonnikson/cove into sn…
9703e7e 
…ippets
Added buttons
b3c3614
GemFile.lock deleted
1954b55
updating stylesheet
a5f426b
Merge branch 'snippets' of git://github.com/jsonnikson/cove into snip…
92fa72a 
…pets
Added form
9e2ec3e
Adding Josh's update
bbf072b
@winnyhuang
added create_section feature
56c6918
committing form and css for form
944d48a
@winnyhuang
edited show page
c4fbbc7
@jsonnikson
add offset and instance-specific duration
9ed59b9
Billy Ong and others added 30 commits March 11, 2011 21:56
Merge branch 'snippets' of git://github.com/jsonnikson/cove into deve…
a3b4f07 
…lopment
added the new haml and html stuff
dad39b8
@winnyhuang
merged conflicts
0eddf5e
added css styling for snippet_list
a506526
changed styling for snippet list again
51fcb2b
@winnyhuang
edited stylesheet
ad6e712
@winnyhuang
merged changes
0d7a1ff
more changes to styling
4d1f29c
styling changed again
db4e4c2
@winnyhuang
edited stylesheet
58b072e
@winnyhuang
edit stylesheet
3717e20
added javasctript
accc0ea
@jsonnikson
merge with billy and convert his html to haml
2e4357b
@jsonnikson
pretty sure billy meant for snippet_list div to contain list of snippets
f578610
@jsonnikson
removing <a> tags within <a> tags
e2d112d
@jsonnikson
separate "see more" link into its own class
289b7c5
@winnyhuang
edited stylesheet
452b67f
@jsonnikson
fix snippet position display
ad600d8
@winnyhuang
edited stylesheet
c02184b
@winnyhuang
edited stylesheet
6c7ee81
@jsonnikson
remove unnecessary grid elements
39d98f1
@jsonnikson
expand form to whole grid
f61e774
@jsonnikson
work on snippet model and form
a7ad0fa
@jsonnikson
process offset and duration properly from form (right now, end_time i…
8748f1f 
…s not working though)
@jsonnikson
add snippet save support
6ab121f
@jsonnikson
make start/end mark button id correct in javascript
033a03e
changed styling and javascripts
093f0aa
@jsonnikson
Merge branch 'snippets' of git://github.com/winnyhuang/cove into snip…
8c9f661 
…pets

Conflicts:
	app/views/intervals/_snippets.html.haml
	app/views/intervals/_snippets_list.html.haml
@jsonnikson
Merge branch 'snippets_7' of git://github.com/biong/cove into snippets
089cef7 
Conflicts:
	app/views/intervals/_snippets.html.haml
	app/views/intervals/_snippets_list.html.haml
added styling problems with cancel, clear, and save
1fd1b2e
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@biong @winnyhuang @jsonnikson