master

Commits

a0ad30af
remove description from create command because we do not add one until we edit the cake.
mo khan
2014-07-06 03:35:25
967db38a
continue to display the progress bar until we receive an id.
mo khan
2014-07-06 03:27:23
ef3febbb
stop sending welcome emails in tests and clean up some duplication.
mo khan
2014-07-06 03:21:54
ff506756
tidy up the search query.
mo khan
2014-07-06 03:20:03
11dfd7a2
disable the save button on the edit view until something has changed.
mo khan
2014-07-06 02:57:23
39ec2aa7
remove view from dom when the modal is closed.
mo khan
2014-07-06 02:55:44
11b5a563
attach a watermark to the photo during upload.
mo khan
2014-07-06 02:52:04
76862b73
remove usage of watermark from creations.
mo khan
2014-07-05 23:32:53
bd487422
migrate watermarks from creations to photos.
mo khan
2014-07-05 23:26:10
92da5f98
remove watermark method from photos.
mo khan
2014-07-05 23:21:28
95363ae4
add watermark to photos.
mo khan
2014-07-05 23:19:31
e3127ef2
drop unused creations_categories table.
mo khan
2014-07-05 23:06:26
82568208
remove is_restricted.
mo khan
2014-07-05 23:03:12
e6d58e34
Merged in mocheen/cakeside/edit-cakes-photos (pull request #70)
mo k
2014-07-05 22:51:08
1e06969c
remove extra fields from cakes#new and make sure we load the category properly from the edit page.
mo khan
2014-07-05 22:46:05
47c1d10d
add photo upload to the edit page.
mo khan
2014-07-05 22:12:02
561a2d89
Merged in mocheen/cakeside/upgrade-rails (pull request #69)
mo k
2014-07-05 21:47:19
97dff755
remove step 1 of 2 stuff.
mo khan
2014-07-05 21:45:52
d686723e
upgrade gems
mo khan
2014-07-05 21:44:31
4bc4e3b1
use new hash syntax.
mo khan
2014-07-05 21:04:39
d014ab3b
refresh new/edit view status on keyup instead of change.
mo khan
2014-07-05 21:04:29
c592ac90
remove extra step to go through dashboard page.
mo khan
2014-07-05 21:03:12
87635b14
fix broken feature spec and add helper to wait for ajax requests to complete.
mo khan
2014-07-05 21:00:36
83e80f65
upgrade capybara.
mo khan
2014-07-05 20:59:47
d842e784
do not send emails in test environment.
mo khan
2014-07-05 19:59:14
fa4fb8c3
upgrade rails and remove dead assets.
mo khan
2014-07-05 19:53:15
8f3bd0b2
Merged in mocheen/cakeside/wide-layout (pull request #68)
mo k
2014-07-05 19:23:35
63c034bf
update links in the dashboard page to go to the new backbone pages.
mo khan
2014-07-05 19:11:19
c891233a
remove edit links and actions from the old creations#show page.
mo khan
2014-07-05 19:07:08
e908a204
load cake comments on photos pages.
mo khan
2014-07-05 18:58:35
71225c98
remove console.log
mo khan
2014-07-05 18:32:22
842ba08e
update all backbone templates and views to render the proper links.
mo khan
2014-07-05 18:30:20
96d03444
add a root path to the cakes section so we have /my#cakes route.
mo khan
2014-07-05 18:23:26
15336423
update my cakes routes to go to #cakes
mo khan
2014-07-05 18:18:02
cc3192a2
swap add creation links to go to the new backbone cakes#new page.
mo khan
2014-07-05 18:11:11
81277a56
Merged in mocheen/cakeside/disqus-backbone (pull request #67)
mo k
2014-07-05 16:04:57
231966f2
remove callback code from html template.
mo khan
2014-07-05 15:54:23
ff1fccbd
move comment posting to the disqus backbone view.
mo khan
2014-07-05 15:52:12
402fdbb0
display disqus backbone view on cakes#show page.
mo khan
2014-07-05 14:48:23
ab64290d
Merged in mocheen/cakeside/new-cake (pull request #66)
mo k
2014-07-03 04:29:12
524d0159
replace js routes usage with hardcoded path for case where we create a new cake and are waiting for an id.
mo khan
2014-07-03 04:10:55
83d1cb36
check if photos exists before rendering.
mo khan
2014-07-02 04:58:43
c8e50b64
change empty view element from div to li.
mo khan
2014-07-02 04:53:31
fa28d603
unset error message before saving and redirect to index page.
mo khan
2014-07-02 04:51:46
4948cd53
render json of deleted cake.
mo khan
2014-07-02 04:49:41
a5db20d0
add destroy route to remove a cake via the api.
mo khan
2014-07-02 04:41:24
d8dd92a0
attach delete button to a modal to delete the cake.
mo khan
2014-07-02 04:34:10
25367765
change text for save and cancel buttons.
mo khan
2014-07-02 03:43:39
f4a919c5
add action bar to the top of the cake show page.
mo khan
2014-07-02 03:41:42
c6d3cfbe
use thumbnail on index page and dont worry about masonry for now.
mo khan
2014-07-02 03:31:41
588559c4
extract helpers and redirect to show page after creating.
mo khan
2014-07-01 14:41:11
a980c339
tidy up mark up for backbone cakes listing.
mo khan
2014-07-01 04:31:06
ea046c63
set percentcomplete on model and remove progress bar when 100% uploaded.
mo khan
2014-07-01 04:02:26
4464578c
bind to progress event directly rather than through marionette.
mo khan
2014-07-01 03:55:38
e4256102
add debugger.
mo khan
2014-07-01 03:45:48
7c66024c
move progress bar to thumbnail and out of the modal.
mo khan
2014-07-01 03:36:31
d733008a
Merged in mocheen/cakeside/progress-bar (pull request #65)
mo k
2014-07-01 03:18:09
6028dcb2
extract variable.
mo khan
2014-07-01 03:16:58
2b4b073f
remove hardcoded 20 percent progress.
mo khan
2014-07-01 03:14:38
a7d15a04
display progress bar while photo is uploading in modal upload.
mo khan
2014-07-01 03:13:32
45d5827b
broadcast uploading event.
mo khan
2014-07-01 02:13:57
326c598c
Merged in mocheen/cakeside/backbone (pull request #64)
mo k
2014-07-01 01:53:24
a7c0297c
lock gem versions.
mo khan
2014-07-01 01:21:33
48b37db3
remove unused backbone views and template.
mo khan
2014-07-01 01:05:25
f266ab78
remove unused photo backbone views and templates.
mo khan
2014-07-01 01:03:11
4d9ad610
changes routes to backbone cakes routes.
mo khan
2014-07-01 00:55:05
2b427637
fix broken spec that needs a valid category.
mo khan
2014-07-01 00:31:57
834fd121
add category id to broken specs.
mo khan
2014-06-30 23:38:50
7b3ad9a9
fix creation factory.
mo khan
2014-06-30 23:37:07
f887076a
render the tags based on whether it is a string or array of objects.
mo khan
2014-06-30 23:28:56
de7e159a
remove space.
mo khan
2014-06-30 23:03:22
72318014
fix checked lookup.
mo khan
2014-06-30 04:06:09
dfef69e6
fix the edit cake page.
mo khan
2014-06-30 03:55:02
9921cc76
extract method to display upload events.
mo khan
2014-06-29 15:27:20
148ca738
fix upload photo functionality.
mo khan
2014-06-29 15:15:24
0619ea80
make primary image a link.
mo khan
2014-06-29 15:09:37
acfd8330
use a composite view and item view to render the thumbs under the original photo.
mo khan
2014-06-29 15:05:53
5b338409
use backbone to display an individual photo.
mo khan
2014-06-29 15:03:12
ea7d5417
re-render thumbnail when photo model synced and create cache for photo collections.
mo khan
2014-06-29 14:12:37
2495bb02
move default id to thumbnail template instead of model.
mo khan
2014-06-29 04:51:17
be3c76bd
move thumbnail view a a separate file.
mo khan
2014-06-29 04:29:17
9cf4e9d8
load categories in the new cake form.
mo khan
2014-06-29 04:07:41
cff3acf1
extract method to create cake and ensure the category exists first.
mo khan
2014-06-29 03:38:11
64469297
add empty view and extract methods to enable/disable save button.
mo khan
2014-06-29 03:36:52
0343f123
add defaults for backbone models.
mo khan
2014-06-29 03:36:19
3ee154e3
rename root backbone module to cakeside.
mo khan
2014-06-29 03:35:59
1587bb47
load up photos in a composite view.
mo khan
2014-06-28 14:47:54
e081f9b2
start the backbone application after all the cakes have been fetched.
mo khan
2014-06-28 14:00:16
58466d1d
initialize marionette application and inject cake collection in container.
mo khan
2014-06-27 04:02:05
74b75d8c
update the new cake form to use an item view and add error handling logic.
mo khan
2014-06-27 03:39:12
1c96046c
replace a bunch of boilerplate with item view and collection view.
mo khan
2014-06-27 01:53:13
3601cc52
Merge branch 'backbone' of bitbucket.org:mocheen/cakeside into backbone
mo khan
2014-06-27 01:43:40
873d1ad3
remove marionette rails gem and vendor marionette.js.
mo khan
2014-06-27 01:42:48
586bd9b9
remove rails-backbone gem and add most recent version of backbone and underscore to vendor.
mo khan
2014-06-27 01:39:00
19d554e1
remove marionette.
mo khan
2014-06-27 01:02:00
3db427a5
redirect to cake show page after creating a new cake.
mo khan
2014-06-26 03:57:47
241f8161
install backbone marionette.
mo khan
2014-06-26 03:56:57
634357ed
parse the proper params to save the cake tags.
mo khan
2014-06-24 03:32:28
644a9248
load tags on my/cakes/new page.
mo khan
2014-06-24 03:25:17
affa35b3
add an image preview before uploading..
mo khan
2014-06-19 04:10:51