Commit graph

260 commits

Author SHA1 Message Date
danielgrippi
73fe74c834 updated selenium driver to work with FF5; added translations to contacts/index; fixed cucumber 2011-06-27 18:58:29 -07:00
Raphael Sofaer
5884a900a2 Get rid of manage 2011-06-24 16:55:40 -07:00
danielgrippi
bd84eaaf75 added cucumber test for re-registering a pod from a client 2011-06-23 18:57:39 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
63125cb9b9 Fixed the oauth cucumber features 2011-06-23 16:03:36 -07:00
danielgrippi
5917f0d695 added JWT verification support to diaspora 2011-06-22 16:15:03 -07:00
Ilya Zhitomirskiy
78253b6885 resetting the token instead if the app already exists, should move the lookup to be homepage url 2011-06-15 16:36:35 -07:00
Ilya Zhitomirskiy
ec9932e491 green on all the cucumbers WOOT 2011-06-14 18:30:43 -07:00
Ilya Zhitomirskiy
ef0e48a7ff A user can now revoke an application's token iz ms 2011-06-13 16:48:52 -07:00
Ilya Zhitomirskiy
3d77186d35 added authorizations page where a user can see all of their authorized applications 2011-06-13 15:40:55 -07:00
Raphael Sofaer
6d5169d707 Chubbies is working with local diaspora-client gem 2011-06-09 15:01:09 -07:00
danielgrippi
67eaafe3a9 Chubbies no longer saves diaspora_handle from the browser 2011-06-06 15:42:58 -07:00
Maxwell Salzberg
de55a1cbb3 remove remember aspects feature 2011-06-03 17:35:27 -07:00
Maxwell Salzberg
4b13c83de7 Chubbies now uses sqlite to have tables of pods and users 2011-06-03 16:24:12 -07:00
Maxwell Salzberg
e720fc097d chubbies tests mow take diaspora handle 2011-06-03 16:24:12 -07:00
danielgrippi
01edfeee03 Chubbies now sends manifest data to create a client 2011-06-03 16:24:12 -07:00
danielgrippi
e121b0fe6d Chubbies now sees that it has no secret and registers itself. 2011-06-03 16:22:38 -07:00
Raphael Sofaer
381b85189d Add Chubbies, the oauth sample app, and a cucumber feature for part of an oauth flow 2011-06-03 16:22:38 -07:00
Maxwell Salzberg
149c086d5e make the tumblr posting smarter 2011-06-02 17:02:29 -07:00
Maxwell Salzberg
6e3fcdd893 fixed build 2011-06-02 16:25:32 -07:00
Dan Hansen
0edc160007 Clean up stream.js, make the comments step selector more sane 2011-05-31 15:52:17 -05: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
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
Sarah Mei
00d89b0207 Small updates to infinite scroll feature 2011-05-14 16:58:37 -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
danielgrippi
c200c386fb pulled new aspect into modal window 2011-05-13 11:58:18 -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
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
f6765324da likes cucumber, rspec green 2011-05-11 11:08:30 -07:00
Raphael Sofaer
160e01f7bd Fix broken sorting by activity 2011-05-07 00:50:26 -04:00
Dan Goldenberg
f1f0d6e2ea added cuc test for commenting on a status message show page 2011-05-06 15:12:46 -07:00
Raphael Sofaer
fa174f8eb2 Cukes for posting a photo with and without text 2011-05-06 16:46:45 -04: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
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
ae3deb1f32 Theory: embedder.feature breaks CI because it assumes the browser can show video. 2011-04-29 19:53:27 -07:00
Sarah Mei
e025b14b60 Logout: still not a word. 2011-04-29 19:44:57 -07:00
Raphael Sofaer
b4e36878fe Fix pages after 1 on tag page 2011-04-28 09:28:59 -07:00
Raphael Sofaer
948725b946 Fix infinite scroll after changing aspects 2011-04-26 18:26:12 -07:00
Raphael Sofaer
2517653d34 Red feature for infinite scroll after changing aspects 2011-04-26 17:28:42 -07:00
Raphael Sofaer
24ea518b6f Fix some JS bugs, delegate doesn't work if you remove the element 2011-04-25 16:15:33 -07:00
Raphael Sofaer
9940f19962 Test and fix embedder after changing aspects 2011-04-25 12:24:38 -07:00
MrZYX
45d621a9e6 fixed embedder the hacky way (?) and added cucumber feature for youtube feature so you'll notice if you breakt it again the next time 2011-04-21 15:42:28 +02:00
danielgrippi
352d1c6abf fixed disconnecting logic. specs&cucumber green 2011-04-11 15:10:51 -07:00
danielgrippi
1c9ca738ae green everywhere. 2011-04-08 17:10:43 -07:00
danielgrippi
c128cae4ec specs green after moving ContactController#new to AspectsMembership#new 2011-04-08 11:44:09 -07:00
danielgrippi
aeda5a4e39 dispatching / receiving logic complete. following wip. 2011-04-07 18:29:24 -07:00
danielgrippi
4f972a23f6 drop requests table wip 2011-04-06 19:01:41 -07:00
danielgrippi
2e5b5e1efe request notification emails -> started sharing notification emails 2011-04-06 13:21:15 -07:00
danielgrippi
847f4fd260 edited subscribers to include all contacts on public posts. added the ability to drop an aspect regardless of contacts contained. wip. 2011-04-05 18:53:10 -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
danielgrippi
b22b13d73f Revert "popstate now in aspect-filters. back button now actually works on aspect/index."
This reverts commit 326155af54.
2011-03-31 01:30:02 -07:00
danielgrippi
326155af54 popstate now in aspect-filters. back button now actually works on aspect/index. 2011-03-30 17:39:08 -07:00
zhitomirskiyi
5a9ec82597 can now hide posts 2011-03-30 16:43:28 -07:00
zhitomirskiyi
fb8b8ab7fc wip holding off until the follow model is done 2011-03-30 16:43:28 -07:00
danielgrippi
9a0d6219b5 Moving PostVisibility to aspects, WIP, model specs pass 2011-03-29 17:31:56 -07:00
zhitomirskiyi
d54a8428d3 add some limits for conversation#new 2011-03-29 15:19:14 -07:00
zhitomirskiyi
4b2364e893 MS profile update from getting started fixed 2011-03-29 15:03:10 -07:00
Sarah Mei
59650c8104 Refactor saved state cucumber feature to be more consistent. (It was occasionally failing locally due to a timing issue.) 2011-03-27 18:32:11 -07:00
MrZYX
40810741f3 fixed cucumber 2011-03-27 22:04:36 +02: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
MrZYX
56a6f0e43b cleaned up craziness in users and likes routing, fixed #961 2011-03-24 03:02:14 +01:00
danielgrippi
fb5bc2805d fix cucumber 2011-03-23 12:42:07 -07:00
Sarah Mei
631163ec02 "Add contact" buttons on tag page are smaller and don't appear on top of names.
Moved some logic from view into user model.
2011-03-22 13:16:58 -07:00
zhitomirskiyi
058b74846a removed the bring your friends message from the stream 2011-03-21 15:23:34 -07:00
MrZYX
495465f3a4 fixed cucumber 2011-03-20 18:35:42 +01:00
Sarah Mei
8d7aa1826c Reorder some steps in the comments feature to make it more consistent. 2011-03-19 22:08:11 -07:00
Sarah Mei
0b1fa4d014 You can now add contacts from tags#show. Also, a CSS change to help us start refactoring: there's now a class to the body that you can set with content_for :body_class. This lets you scope CSS to a particular page. Started breaking out smaller CSS files. 2011-03-19 20:53:55 -07:00
Sarah Mei
1bd693eb14 Added cucumber step for searching, and feature for searching for tags. 2011-03-19 19:06:24 -07:00
Sarah Mei
a8737ab318 Publisher modal cucumber step is now officially insane. Or is that me? 2011-03-19 18:19:37 -07:00
Sarah Mei
b0ca6ead26 Fix append cucumber step to trigger keyup, so that it always copies the text from the placeholder input to the real input. 2011-03-19 15:59:13 -07:00
maxwell
f4c482cdb3 make the photo downloaders wip to save mrzyx some emails untill we work it out 2011-03-17 18:40:26 -07:00
maxwell
562c0d40ac profile tags now federate 2011-03-17 16:28:17 -07:00
maxwell
1de52d3ba2 fixed failing cucumber 2011-03-17 13:59:53 -07:00
zhitomirskiyi
3d34e3bd35 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-17 10:56:58 -07:00
Kiran Soumya
6d113da242 Bug Fix:868 for Users unable to download photos 2011-03-17 01:14:05 +05:30
danielgrippi
68479481cf made websockets far less dumb. don't render partials for people not connected. 2011-03-15 18:21:09 -07:00
danielgrippi
3bbc766abc fixed cucumber tests 2011-03-15 13:38:13 -07:00
danielgrippi
c608c70ca7 tagging profiles complete 2011-03-15 13:21:36 -07:00
Raphael Sofaer
3c1b5a10df Fix cucumber features for text instead of message 2011-03-14 11:39:31 -07:00
Raphael Sofaer
4b4654a408 Changing message to text, partway done, deleted data conversion 2011-03-14 11:39:31 -07:00
Kiran Soumya
7c3a173010 Bug Fix for #913 with Rspec and Cucumber test cases, for a scenario, where a user is mentioned on a post and when that user closes his account, then his contacts cannot see their homepages due to this post 2011-03-12 11:08:40 +05:30
Michael Nutt
9d1bb3ac21 fix feature for new markup 2011-03-10 16:42:07 -05:00
Michael Nutt
2b6070d325 features for comments 2011-03-10 16:42:07 -05:00
Sarah Mei
5a23907143 Fix cucumber feature for deleting posts. 2011-02-19 22:35:10 -08:00
MrZYX
cc84e349de fixed cucumber for cd7e4d6e8f 2011-02-18 13:36:24 +01:00
zhitomirskiyi
16b7ec3990 pulled out share_with to be contact new and contact show 2011-02-17 18:05:21 -08:00
maxwell
8c2e6dd8cb aspect membership refactor complete 2011-02-17 18:05:21 -08:00
maxwell
c6eb5d0340 IZ MS; refactored aspect_membership_controller, moved and updated views accordingly 2011-02-17 18:05:21 -08:00
maxwell
d1b91e1eac wip, profiles controller and specs, with cucumber failures 2011-02-15 14:17:25 -08:00
zhitomirskiyi
9f239789b9 can remote the person from the last aspect from edit contact pane 2011-02-11 12:58:01 -08:00
zhitomirskiyi
4105f90aaa forgot to add 2011-02-09 19:07:02 -08:00
zhitomirskiyi
1da965616b added an option to remove a contact from the last aspect, after a prompt 2011-02-09 17:47:27 -08:00
Raphael Sofaer
aaaa00f1c9 Fix cucumber features 2011-02-09 16:34:03 -08:00