danielgrippi
775e7b6b2b
Merge branch 'master' into follow
...
Conflicts:
features/step_definitions/user_steps.rb
2011-05-17 11:33:35 -07:00
MrZYX
1746f610b6
if we disable websocket in single process mode, there's no need for the JS
2011-05-17 19:26:37 +02:00
danielgrippi
8d7b0b2c4c
take out animations in inf scroll.
2011-05-16 16:55:24 -07:00
danielgrippi
d70f10b609
made dropdown selectors sexi
2011-05-16 16:29:13 -07:00
danielgrippi
7eaca0346c
Merge branch 'master' into follow
...
Conflicts:
config/assets.yml
public/stylesheets/sass/_mixins.scss
spec/models/user/posting_spec.rb
2011-05-16 14:56:28 -07:00
MrZYX
e338886910
fixes to login page: removed not needed login.sass; removed fixed string length assumption; fixed login button not showing up in Chrome when the form is pre-filled
2011-05-16 15:16:01 +02:00
Ilya Zhitomirskiy
709ac44da3
fixed the incrementing aspect ids on the contacts#sharing modal window, showing 'Add to Aspect' button only on the tags and profile pages
2011-05-16 02:16:46 -07:00
MrZYX
f916f3a3e0
remove the width from the share button, thanks artem
2011-05-15 00:49:35 +02:00
danielgrippi
01be909e38
well, that was dumb. (fix cucumber)
2011-05-14 00:58:39 -07:00
danielgrippi
b89dd900cc
misc visual cleanup on mobile
2011-05-13 23:33:16 -07:00
danielgrippi
666fb76bfc
login as its own js file. accounted for the autofil state
2011-05-13 22:27:08 -07:00
danielgrippi
0e72a91d1b
update login page
2011-05-13 22:05:35 -07:00
danielgrippi
402e84708b
ms iz; everything is green, the sharewith is translated in js, fixed the clicking on the checkbox bug
2011-05-13 16:05:37 -07:00
danielgrippi
a9a1280e17
one cuke failing. wip
2011-05-12 20:41:56 -07:00
danielgrippi
60a60733df
Merge branch 'master' into follow
...
Conflicts:
app/controllers/aspects_controller.rb
app/controllers/contacts_controller.rb
app/controllers/people_controller.rb
app/controllers/photos_controller.rb
app/controllers/tags_controller.rb
app/helpers/notifications_helper.rb
app/models/notifications/new_request.rb
app/models/user_preference.rb
public/javascripts/view.js
spec/controllers/aspects_controller_spec.rb
spec/controllers/contacts_controller_spec.rb
spec/controllers/home_controller_spec.rb
spec/controllers/post_visibilities_controller_spec.rb
spec/controllers/requests_controller_spec.rb
spec/mailers/notifier_spec.rb
spec/models/user_spec.rb
2011-05-12 15:49:51 -07:00
danielgrippi
47cf614996
sneaky fixed header
2011-05-11 18:53:59 -07:00
danielgrippi
4280417e41
broke out dropdown into its own partial. aspect dropdown on person show. user menu fixed
2011-05-11 18:33:17 -07:00
danielgrippi
7893129435
prevent user from hitting aspectmemberships controller before response on dropdowns
2011-05-11 17:07:58 -07:00
danielgrippi
c67d143719
dropdown in ContactsController#sharing now works
2011-05-11 15:47:13 -07:00
danielgrippi
9f3044838d
Views for contactscontroller#sharing almost done, cuke for editing aspect memberships started
2011-05-11 14:53:43 -07:00
danielgrippi
dfeb4f3a13
use .js response convention for remote likeke behavior
2011-05-11 11:08:30 -07:00
danielgrippi
8b081a48b4
likes controller now has destroy method. commented out dislikes from views. unlike links not functional.
2011-05-11 11:08:29 -07:00
MrZYX
73c96ea8f0
Revert "Clean up WSR, add comment processing to ContentUpdater, add comment fixture, update post processing spec"
...
This reverts commit bd74ab4acc
2011-05-11 11:51:51 +02:00
Dan Hansen
bd74ab4acc
Clean up WSR, add comment processing to ContentUpdater, add comment fixture, update post processing spec
2011-05-10 23:19:36 -05:00
Raphael Sofaer
ab1f29c339
Working on styling the ContactsController#sharing
2011-05-10 14:17:43 -07:00
danielgrippi
d34774f4e5
png favicon
2011-05-09 16:24:24 -07:00
danielgrippi
29c3f7f1d4
make cursor a question mark on welcome page info text
2011-05-09 15:55:24 -07:00
danielgrippi
645d685c58
Merge branch 'welcome-page'
2011-05-09 15:45:05 -07:00
danielgrippi
cfa9e6cf29
some polish on the welcome page
2011-05-09 15:39:44 -07:00
danielgrippi
68601e392e
halfway to a better welcome/getting started page. wip.
2011-05-08 22:15:26 -07:00
Raphael Sofaer
9d2849d851
Move publisher ajax stuff into publisher.js
2011-05-08 20:40:35 -07:00
Raphael Sofaer
ffd96d989c
Update publisher callback to use ContentUpdater
2011-05-08 20:31:13 -07:00
Sarah Mei
a904204f46
Content updater refactor complete for posts
2011-05-08 14:22:40 -07:00
Dan Hansen
50e67524c1
content update wip
2011-05-08 15:18:02 -05:00
Dan Hansen
fc25c9bedb
Flash message handling is now a widget
2011-05-08 10:53:09 -05:00
Dan Hansen
535954dcc2
make incrementing the notification count optional
2011-05-07 07:28:52 -05:00
Maxwell Salzberg
7a2f6dae10
fixed js error on new comments on statusmessage show page
2011-05-06 15:29:39 -07:00
Maxwell Salzberg
d0381b913d
remove the hidden rule for the status message show page submit button. thx dangoldenberg for debugging
2011-05-06 13:30:43 -07:00
MrZYX
3d1c208fc2
added a bit space to checkbox labels, thanks 21echoes
2011-05-05 21:38:43 +02:00
danielgrippi
648a10e6d3
Merge branch 'master' into follow
...
Conflicts:
app/controllers/requests_controller.rb
app/controllers/tags_controller.rb
app/helpers/aspects_helper.rb
app/views/notifications/index.html.haml
config/routes.rb
public/javascripts/aspect-edit.js
public/javascripts/contact-list.js
spec/integration/receiving_spec.rb
spec/models/user/connecting_spec.rb
spec/models/user/posting_spec.rb
2011-05-04 11:35:35 -07:00
MrZYX
f6e4be35a1
white-space: nowrap; for buttons
2011-05-04 17:53:22 +02:00
MrZYX
1dcb0e4863
fixed #1038
2011-05-04 16:22:24 +02:00
Raphael Sofaer
abde3244b5
InfiniteScroll#options doesn't need to be a function
2011-05-03 14:54:49 -07:00
danielgrippi
77372b2f08
update robots.txt to only exclude /people/
2011-05-03 10:32:50 -07:00
Raphael Sofaer
94bc18e467
Make websocket closed message less disruptive
2011-05-02 17:12:18 -07:00
Raphael Sofaer
83a3655bfe
Don't infinitescroll undefined
2011-05-02 15:28:42 -07:00
Raphael Sofaer
2abb592833
Destroy old infinite scrollers to keep event bindings from piling up
2011-05-02 14:08:41 -07:00
Raphael Sofaer
bc8b6097bc
Update infinite scroll plugin for $.fn.infinitescroll.destroy
2011-05-02 14:08:41 -07:00
Raphael Sofaer
38e44b13aa
Test and fix pagination on profile, tag and aspect streams
2011-04-30 10:26:16 -07:00
Sarah Mei
09ac4c789e
Remove debugging statements
2011-04-29 21:00:39 -07:00
