danielgrippi
be662a65c6
added token authenticatable to user model
2011-05-19 11:57:06 -07:00
MrZYX
c47c9ef069
fix untranslated string; fix two translations; don't mess routes.rb again
2011-05-18 00:53:48 +02: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
8b081a48b4
likes controller now has destroy method. commented out dislikes from views. unlike links not functional.
2011-05-11 11:08:29 -07:00
zhitomirskiyi
469d5b99a2
WIP added a share view, tests are red
2011-05-09 16:55:22 -07: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
ff58d63191
minor cleanup to routes.rb
2011-04-30 16:28:39 +02:00
Jonne Hass
84412863dc
(minor change) move bookmarklet route to the right place
2011-04-30 06:51:37 -07:00
Raphael Sofaer
d5ecce7ca6
Merge branch 'limit_similar_contacts'
...
Conflicts:
app/controllers/people_controller.rb
2011-04-12 11:48:41 -07:00
danielgrippi
106ae983d5
Merge branch 'master' into follow. all specs green.
...
Conflicts:
app/controllers/application_controller.rb
app/controllers/people_controller.rb
app/models/person.rb
config/assets.yml
db/schema.rb
public/javascripts/aspect-edit.js
spec/controllers/aspects_controller_spec.rb
spec/models/user/querying_spec.rb
spec/spec_helper.rb
2011-04-11 17:48:37 -07:00
danielgrippi
aeda5a4e39
dispatching / receiving logic complete. following wip.
2011-04-07 18:29:24 -07:00
maxwell
d7c4e15835
let admin give a user 10 ma user 10 more invites
2011-04-07 17:54:22 -07:00
danielgrippi
590e1fd93f
All green except invite connecting +2 misc.
2011-04-04 15:16:19 -07:00
zhitomirskiyi
f99b724e0b
ms iz, can now undo hiding a post, fixed a bunch of jamine specs
2011-03-31 17:23:54 -07:00
zhitomirskiyi
5a9ec82597
can now hide posts
2011-03-30 16:43:28 -07:00
zhitomirskiyi
a5bb26a3c4
almost done
2011-03-29 15:03:09 -07:00
maxwell
f08b5dfafe
basic functionality done, fixing rough edges
2011-03-28 18:11:59 -07:00
MrZYX
52fee96bfc
whoops, recieve is a post route, not a get, thanks mb-log
2011-03-27 16:11:38 +02:00
MrZYX
55417cf9e3
AspectsController#move_contact -> AspectMembershipsController#update
2011-03-27 13:29:36 +02:00
MrZYX
b689d4695b
refactor of routes.rb done so far; further refactor needs design decisions
2011-03-27 00:05:35 +01:00
MrZYX
985d79acb5
some more refactoring to routes.rb
2011-03-26 17:38:49 +01:00
Raphael Sofaer
aed190dc6d
cucumber for comment retractions, modified views
2011-03-25 16:26:03 -07:00
danielgrippi
f5a03fd6ed
Make public timeline of a user publicly accessible
2011-03-25 15:06:22 -07:00
danielgrippi
5dbbc79f65
added users_profile_image, home_timeline, fixed public_timeline
2011-03-25 15:06:22 -07:00
danielgrippi
517f3fd802
statuses/ and users/ GET routes
2011-03-25 15:06:22 -07:00
maxwell
ea3d839e1c
initial public api'
2011-03-25 15:06:22 -07:00
MrZYX
56a6f0e43b
cleaned up craziness in users and likes routing, fixed #961
2011-03-24 03:02:14 +01:00
Raphael Sofaer
555a774668
Initial contacts_of_contact page
2011-03-23 16:42:53 -07:00
zhitomirskiyi
dcc80d5b43
almost done, need to figure out how whats the deal with the controller not being called
2011-03-21 14:56:50 -07:00
MrZYX
1b1a23aa8f
likes/dislikes WIP TODO: better icons, better styling, integration on photo show page
2011-03-20 18:10:58 +01:00
danielgrippi
3db11cf38d
PostsController#index -> TagsController#show
2011-03-18 20:57:39 -07:00
zhitomirskiyi
abbf949fe1
publishing from a person profile page wip
...
mentioning a person from their profile page, added js & jasmine, still need to add the mention style, and prevent deselecting the last one
a tiny sass add
publishing from the profile works, need js translation
added the translation
made the hover state consistant
need to fix the cucumber spec
specs are green need to add a button
added the buttion to mention people
moved the publisher to the facebox
fixed the cucumbers for the modal window
2011-03-16 16:35:30 -07:00
Raphael Sofaer
8f929d2b85
Show local public posts in /p
2011-03-10 14:41:03 -08:00
maxwell
f9279f9bbc
fixed public route not fetching posts, also an error in status_message activity markup
2011-03-09 17:08:41 -08:00
danielgrippi
d0569fb881
simplified functionality on aspect edit faceboxes
2011-03-09 12:00:49 -08:00
danielgrippi
1f5edb1d92
Merge branch 'private_messages'
...
Conflicts:
app/controllers/status_messages_controller.rb
app/models/data_point.rb
app/models/status_message.rb
db/schema.rb
lib/fake.rb
public/stylesheets/sass/application.sass
spec/models/mention_spec.rb
2011-03-08 21:23:41 -08:00
zhitomirskiyi
3812612c86
added a validation of participant, as well as messages controller spec wip
2011-03-01 19:24:07 -08:00
Raphael Sofaer
0cb218bba0
Delete statistic and data point models
2011-03-01 16:54:12 -08:00
danielvincent
1072806d8f
PrivateMessage -> Conversation, Message.
2011-03-01 12:25:55 -08:00
danielvincent
979d9d7fb4
added delete actions for private messages
2011-03-01 12:14:31 -08:00
danielvincent
090c412690
touched up AspectMembership resource
2011-03-01 12:14:31 -08:00
danielvincent
9fe0320881
added PrivateMessage and PrivateMessageVisibility models and migrations
2011-03-01 12:14:31 -08:00
maxwell
0bf3cae54a
MS IZ added spec from admin page, moved it to its own controller where it belongs
2011-02-18 11:35:24 -08:00
zhitomirskiyi
a68dfbcabc
removed the share_with route
2011-02-17 18:05:21 -08:00
maxwell
17a801394e
work in progress. need to update the views for the controller changes
2011-02-17 18:05:21 -08:00
maxwell
6858e2e543
crazy ugly admin interface so an admin can invite people, and search for user accounts for basic debugging
2011-02-17 18:00:59 -08:00
maxwell
d1b91e1eac
wip, profiles controller and specs, with cucumber failures
2011-02-15 14:17:25 -08:00
zhitomirskiyi
b49f54144e
resending of invitation in resque and works
2011-02-05 15:01:04 -08:00
zhitomirskiyi
2c1c2a4a8a
WIP
2011-02-05 15:01:04 -08:00
zhitomirskiyi
83a9e916e4
resending of invitation in resque and works
2011-02-05 15:01:04 -08:00
