Sarah Mei
948a7c5d55
DH SM MS Fix showing image in the publisher when it gets uploaded
2011-06-30 20:36:15 -07:00
Raphael Sofaer
3887144db6
I seriously think that this commit is going to fix CI. SRSLY.
2011-06-29 15:34:45 -07:00
Raphael Sofaer
02489bb7cf
This should fix CI for real
2011-06-29 12:07:10 -07:00
Raphael Sofaer
d6321d2327
Bundle in the oauth features, take the source out of the chubbies Gemfile
2011-06-29 11:21:23 -07:00
Raphael Sofaer
1af945de11
Merge branch 'master' into oauth
...
Conflicts:
Gemfile
Gemfile.lock
app/models/app_config.rb
app/models/post.rb
db/schema.rb
public/stylesheets/sass/application.sass
spec/lib/webfinger_spec.rb
2011-06-28 17:13:38 -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
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
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
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
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
Raphael Sofaer
160e01f7bd
Fix broken sorting by activity
2011-05-07 00:50:26 -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
e025b14b60
Logout: still not a word.
2011-04-29 19:44:57 -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
danielgrippi
2e5b5e1efe
request notification emails -> started sharing notification emails
2011-04-06 13:21:15 -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
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
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
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
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
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
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
