MrZYX
0febee6fbb
fix unlike
2011-05-29 13:43:56 +02:00
MrZYX
e201340bb2
Photo association on GUID 2/2: replace status_message_id with status_message_guid
2011-05-27 18:56:24 +02:00
MrZYX
ba08c38a74
fixed activity_streams::photo controller spec
2011-05-26 00:01:10 +02:00
Maxwell Salzberg
52487e87de
added a very basic page for the stream of all public activity stream photos
2011-05-25 12:57:29 -07:00
Sarah Mei
5e56b8a0ee
HULK SMASH PENDING SPEC
2011-05-24 23:36:00 -04:00
MrZYX
a68031179b
prevent inviting yourself, #515
2011-05-22 14:48:07 +02:00
Raphael Sofaer
286f1b876d
Allow anyone to generate a token, restrict tokens to ActivityStreams::PhotosController#create, don't let tokens create sessions.
2011-05-20 15:14:23 -07:00
danielgrippi
16351227f7
use aspect dropdowns everywhere; updated rake to 0.9.0
2011-05-20 11:50:41 -07:00
Maxwell Salzberg
1e3971da3d
i think we want to not prevent non admins...
2011-05-19 22:22:03 -07:00
Arzumy MD
a060acffeb
add spec for admins_controller#add_invites
2011-05-20 10:51:04 +08:00
Arzumy MD
0ee41b3be5
removed user variable from admins_controller#user_search
2011-05-20 09:37:32 +08:00
Raphael Sofaer
93be5497a7
Small controller for generating an auth token, if you are an authable user
2011-05-19 18:29:53 -07:00
Raphael Sofaer
ed61c53e09
Wrap UsersController to not 500 when no params are submitted
2011-05-19 17:01:42 -07:00
danielgrippi
d7899d10e3
Fix various links in to cubbi.es objects
2011-05-19 15:17:42 -07:00
Maxwell Salzberg
3c4c62abd5
moved auth token to admins page, and added a link in the dropdown
2011-05-19 14:23:04 -07:00
danielgrippi
c8e31825c5
Bookmark -> ActivitiyStreams::Photo
2011-05-19 11:57:06 -07:00
danielgrippi
dd31f37fd0
only generate new token if admin
2011-05-19 11:57:06 -07:00
danielgrippi
41e1d0dd86
show photos from cubbies in the streams
2011-05-19 11:57:06 -07:00
danielgrippi
9b941e6520
Bookmark now consumes cubbi.es JSON, cubbi.es things can be saved to Diaspora, but are not displayed.
2011-05-19 11:57:06 -07:00
danielgrippi
be662a65c6
added token authenticatable to user model
2011-05-19 11:57:06 -07:00
Maxwell Salzberg
e95288e074
notifications by created at date so they stop jumping when you make them read
2011-05-17 14:44:42 -07:00
danielgrippi
0c62277961
add add to aspect dropdown on notifications page
2011-05-17 14:41:15 -07:00
danielgrippi
775e7b6b2b
Merge branch 'master' into follow
...
Conflicts:
features/step_definitions/user_steps.rb
2011-05-17 11:33:35 -07:00
Raphael Sofaer
495dd89dd2
Fix password reset, add cucumber feature
2011-05-16 15:54:18 -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
956f0044a9
set @contacts_of_contact_count in photos#index, thanks LPrelle
2011-05-16 16:21:13 +02:00
Sarah Mei
43ab8cfcfa
Tell devise that :mobile is a navigational format.
2011-05-14 15:46:56 -07:00
Sarah Mei
fbf486dae6
Users can log in on their phones again.
...
Something in devise broke for the :mobile format. More investigation needed; we're having this same issue on log out and incorrect password on mobile (though those pages are at least still usable).
2011-05-14 14:58:52 -07:00
danielgrippi
a02b9c01c8
eager loading aspect memberships
2011-05-13 18:22:42 -07:00
danielgrippi
ee49fb3547
no more n-query in the view problem
2011-05-13 16:49:37 -07:00
Raphael Sofaer
a4f81c6410
Finish fixing password changing and keeping emails downcased
2011-05-13 16:32:07 -07:00
Raphael Sofaer
f8b7307441
Downcase emails upon inviting
2011-05-13 16:32:07 -07:00
danielgrippi
c200c386fb
pulled new aspect into modal window
2011-05-13 11:58:18 -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
3c82af49bf
fixed cucumber with an exception of one step. added dropdowns to tag pages
2011-05-12 14:11:52 -07:00
Raphael Sofaer
71e77d59b3
Revert to including all helpers everywhere, because the rest of the team prefers it that way
2011-05-12 13:54:55 -07:00
Arzumy MD
efd5c4f500
slimming down application_helper, moved markdown and aspect related methods to individual helpers
2011-05-13 00:51:45 +08:00
MrZYX
8abe28d992
fix 500 on tags#show
2011-05-12 12:32:31 +02: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
dfeb4f3a13
use .js response convention for remote likeke behavior
2011-05-11 11:08:30 -07:00
danielgrippi
eadede966f
unliking works right now minus on-page feedback
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
Raphael Sofaer
ab1f29c339
Working on styling the ContactsController#sharing
2011-05-10 14:17:43 -07:00
Raphael Sofaer
37be13d4e0
Fix facebook finder and tests
2011-05-10 11:22:52 -07:00
zhitomirskiyi
469d5b99a2
WIP added a share view, tests are red
2011-05-09 16:55:22 -07:00
MrZYX
3b7dd1906f
fixed 500 on /people/:person_id/photos
2011-05-08 21:36:27 +02:00
Maxwell Salzberg
7a2f6dae10
fixed js error on new comments on statusmessage show page
2011-05-06 15:29:39 -07:00
danielgrippi
7e838fc778
only display contacts you are sharing with in aspect edit panes
2011-05-04 18:05:49 -07:00
danielgrippi
0db8541f6e
added a pane for people sharing with you on all aspect page
2011-05-04 17:57:42 -07:00
