nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
9438 commits 4 branches 0 tags 121 MiB
Commit graph

401 commits

Author SHA1 Message Date
Ilyaaaaaaaaaaaaa Zhitomirskiy
c3bcb9c962 Revert "Revert "Merge branch 'issue1586-aspectdropdown-when-posting'"" 
This reverts commit a407f12463.
 2011-08-18 16:48:20 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
a407f12463 Revert "Merge branch 'issue1586-aspectdropdown-when-posting'" 
This reverts commit 2777f16f4f, reversing
changes made to 8b278adff6.
 2011-08-18 16:16:14 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
b1e95def4a Merge branch 'master' into issue1586-aspectdropdown-when-posting 2011-08-18 12:59:00 -07:00
Raphael Sofaer
c7331230bc Revert "Revert "Revert "remove uploaded test images after running the specs/cucumber"" -- using == now instead of =" 
This reverts commit b11bd23da2.
 2011-08-18 12:06:04 -07:00
danielgrippi
b11bd23da2 Revert "Revert "remove uploaded test images after running the specs/cucumber"" -- using == now instead of = 
This reverts commit 7969b52035.
 2011-08-18 11:20:49 -07:00
danielgrippi
7969b52035 Revert "remove uploaded test images after running the specs/cucumber" 
This reverts commit a6eb275c7a.
 2011-08-18 11:11:08 -07:00
danielgrippi
a6eb275c7a remove uploaded test images after running the specs/cucumber 2011-08-18 11:08:57 -07:00
Gonzalo Rodriguez
2d54d9a97e Validate presence of message text on conversations. Closes #1329. 2011-08-17 23:52:31 -03:00
danielgrippi
eb8c540ac1 MS DG IZ major invite refactor. all tests are green minus weird stuff on dans computer, need to checkout this out on pivots 2011-08-17 16:28:21 -07:00
Brian Wisti
03127cd592 basic support for Redcarpet Markdown 2011-08-16 21:48:48 -07:00
Raphael Sofaer
cc3eeac98e Merge the aspect dropdown in the publisher with master, some things are still broken 2011-08-16 14:59:53 -07:00
Raphael Sofaer
1bd7e1314f Make the signs up feature more robust 2011-08-16 11:34:34 -07:00
Andrej Kacian
48282e3402 Make and use a single cucumber step to send a private message 2011-08-13 05:03:27 +02:00
Andrej Kacian
9c99331bb7 Improve the conversation test a bit 2011-08-13 04:36:26 +02:00
Andrej Kacian
fe93fd5c91 Write a cucumber test for starting a private conversation 2011-08-13 03:57:41 +02:00
Raphael Sofaer
56fc409a39 Most of the way towards getting posts feature working 2011-08-11 18:15:18 -07:00
Dan Hansen
2e9040e227 merged with master, 7 cukes failing. jasmine is green. need to remove rails.js helpers so things suck less 2011-08-10 23:57:33 -07:00
Andrej Kacian
2f924e2e8a Make sure we got the right tag, just in case there will be more in the test background later. 2011-08-10 21:50:30 +02:00
Andrej Kacian
05fb2c3e7a Write cucumber test for unfollowing a tag directly from tag listing 2011-08-09 22:54:31 +02:00
Sarah Mei
6c512cbfa9 Chubbies is now a little TOO good at shutting itself off. Also: processes are hard. >.< 2011-08-06 19:22:09 -07:00
Sarah Mei
1ccfaedd08 Chubbies actually shuts itself down now, so both builds should now be able to be green at the same time. FWIW, @ variables in class methods are class variables and therefore persist across tests. 2011-08-06 18:19:17 -07:00
Raphael Sofaer
e366a4b8b5 re-enable the embedder feature outside of CI 2011-08-05 17:03:21 -07:00
danielgrippi
75c3107035 made signing up and accepting an invitation look a little nicer 2011-08-05 12:36:53 -07:00
Raphael Sofaer
d33282cbf6 Make cucumber think that facebook has been configured 2011-08-05 11:52:35 -07:00
Daniel Grippi
f63ba2c557 Merge pull request #1707 from TheLambdaCalculus/b1696-publisher-should-automatically-collapse-if-last-photo-removed-and-otherwise-blank 
Issue #1696 - When the last photo is deleted from the publisher, we now collapse the publisher if no status text had been entered.
 2011-08-05 10:57:33 -07:00
danielgrippi
99ac976594 fix redirects around getting_started and aspect/index 2011-08-03 18:07:43 -07:00
danielgrippi
987d334764 fixed tests, translations, initalizer 2011-08-03 18:02:58 -07:00
danielgrippi
e23439d193 fix cucumber; temporarily remove fetch featured users initilizer 2011-08-03 18:02:57 -07:00
danielgrippi
66315eca18 capitalize reshare when there are no reshares 2011-08-02 10:40:36 -07:00
Raphael Sofaer
603cc5d2c7 lowercese r on reshare 2011-08-02 10:17:49 -07:00
Raphael Sofaer
5d27b8047e Take the :first restriction off of posts.feature 2011-08-01 16:26:21 -07:00
danielgrippi
756a20ecd4 link a user to featured users if user has zero contacts 2011-08-01 15:19:51 -07:00
Gaelan D'costa
ba98043412 Issue #1126 - When the last photo is deleted from the publisher, we now collapse the publisher if no status text had been entered. 2011-07-31 19:29:01 -04:00
Sarah Mei
92a0b568c3 Refactor notifications.feature - we were testing the same thing with two different scenarios. 2011-07-31 14:28:21 -07:00
Sarah Mei
7f81892245 For some reason, firefox doesn't like the outerHTML property of this div - it's always undefined. This was manifesting itself as ajax requests never completing in the cucumber feature due to a js error. 2011-07-31 13:32:05 -07:00
Sarah Mei
f0ecef7f1a Make connects_users.feature slightly less flaky 2011-07-31 12:40:36 -07:00
Sarah Mei
790c74d1a6 Make accepts_invitation.feature less flaky. 2011-07-30 22:51:06 -07:00
Sarah Mei
b7b1c6b276 Fix interaction between I18n fallbacks and our interpolation fallback code. Refactor I18n tests into their own file. Remove some test support code that made it hard to test I18n. 2011-07-30 22:41:46 -07:00
Raphael Sofaer
1e7f9fa43c Get rid of duplicate step definition. 2011-07-29 17:59:25 -07:00
Raphael Sofaer
0873ad5828 Test and fix contacts index page 2011-07-29 17:01:45 -07:00
danielgrippi
dfa5824dc1 remove repeated link, fixed cucumber 2011-07-28 14:52:09 -07:00
Dan Hansen
e8bde11a92 fix failing features 2011-07-26 21:55:52 -07:00
Raphael Sofaer
17774d8b3b Getting repost back to almost green. 2011-07-21 19:15:47 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
bd1c8efe54 wip integration servers 2011-07-21 18:23:33 -07:00
danielgrippi
2d6f51f68c repost wip 2011-07-21 18:22:18 -07:00
danielgrippi
bdc4b9f746 marsharing reshares now grabs the post from the original poster, also fetcheer that person if they don't exist locally still need to ping for xml and give the right xml back 2011-07-21 18:22:18 -07:00
danielgrippi
f3a515eef1 DG IZ reshare retractions is WIP 2011-07-21 18:22:17 -07:00
danielgrippi
d1bbbdbc4c fixed all specs; rebased. 2011-07-21 18:22:17 -07:00
Ilya Zhitomirskiy
ce94779766 not showing the reshare button to the users on things they can't reshare 2011-07-21 18:22:17 -07:00
Maxwell Salzberg
fa9269541f wip removed some generated specs 2011-07-21 18:22:17 -07:00
Maxwell Salzberg
06f886ad77 WIP reshare 2011-07-21 18:22:17 -07:00
Raphael Sofaer
e5c8ebf6e2 Add cucumber feature for changing email address 2011-07-19 11:43:24 -07:00
Sarah Mei
088e2dfdb4 Maybe...we're not waiting long enough on CI? It is a very slow box. 2011-07-14 19:09:14 -07:00
Sarah Mei
6974b205a1 CI's cucumber output is once again a blessed field of dots. 2011-07-14 18:44:59 -07:00
Sarah Mei
7bfd695483 Patch Capybara to get rid of cucumber deprecation warnings 2011-07-14 17:55:03 -07:00
Sarah Mei
a096f3d9fc Make infinite scroll feature work on any size screen. 2011-07-14 17:31:31 -07:00
Maxwell Salzberg
07ca376854 fix failing cuke 2011-07-12 20:19:39 -07:00
Raphael Sofaer
39ff51a9d7 Make comments index ajaxy 2011-07-11 14:03:59 -07:00
Raphael Sofaer
97ca10ddda Huge commit I know, but move show and destroy routes into PostsController and PostsController#show into PublicsController 2011-07-10 20:06:31 -07:00
Raphael Sofaer
46ef376bc1 Fix notifications feature 2011-07-06 19:00:29 -07:00
Raphael Sofaer
19911bc856 Fix cucumber on my computer 2011-07-05 19:23:58 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
06abdce180 Use explicit classes in the hover step definition 2011-07-05 15:33:34 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
c3e477f2c5 Color the follow tag button 2011-07-05 15:03:26 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
0ab961e096 tags controller fixed 2011-07-05 15:03:26 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
027f096ca7 turns out for the join in the controller to work the current user needs to have contacts to whom they went to, added a spec 2011-07-05 15:03:26 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
f0d9d318e8 a user can now follow and unfollow a tag 2011-07-05 15:03:26 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
1e4ee472b7 WIP you can now follow a tag, needs a clean up, and ajax love 2011-07-05 15:03:26 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
77d28b4117 wip following tags 2011-07-05 15:03:26 -07:00
danielgrippi
956a86b401 publisher rework 2011-07-05 15:03:26 -07:00
Raphael Sofaer
84eb8a7063 Render a little bit less in the IntegrationSessionsController 2011-07-04 16:07:05 -07:00
Raphael Sofaer
24ece551f9 Do one step def in capybara rather than JS 2011-07-04 16:04:59 -07:00
Raphael Sofaer
7aefe37de8 Reenable notifications feature, don't use javascript in step definitions if you can avoid it? 2011-07-04 15:38:15 -07:00
Raphael Sofaer
fa3cdeb8cb Remove a few unused cucumber steps 2011-07-04 12:05:09 -07:00
Raphael Sofaer
4e1e8fdb80 Get rid of 'bogus ps syntax' maybe figure out why 1.9 is freaking out about the oauth steps 2011-07-04 09:49:50 -07:00
Raphael Sofaer
b64ba85878 Apparently running a regex against every element on the page takes 10 seconds. Who knew? 2011-07-04 09:19:03 -07:00
Raphael Sofaer
04f8abcf13 Check for all aspects in selected_contacts link switch, take out a couple extra steps 2011-07-04 08:39:07 -07:00
Raphael Sofaer
a715630471 make cucumber faster by logging in through a much simpler stubby controller. Save about 1m on my laptop. 2011-07-04 08:11:12 -07:00
danielgrippi
1cd3ef4971 comment out a notifications feature for now that seems to break cucumber. what it's testing is kind of already asserted in the previous feature. thoughts? 2011-07-04 01:58:47 -07:00
danielgrippi
8a8f8db9ad Merge branch 'notifications' 2011-07-02 17:53:55 -07:00
Raphael Sofaer
98799b3971 Make feature a little prettier 2011-07-02 14:20:57 -07:00
Raphael Sofaer
290fb1e7f5 Cut 45 seconds out of the comments feature by using factories 2011-07-02 13:40:30 -07:00
Raphael Sofaer
11e5057e52 Adjust cukes 2011-07-01 23:41:22 -07:00
Dan Hansen
05688c2f43 notifications wip 2011-07-01 22:46:54 -07:00
danielgrippi
8bf6ad45a5 various bugfixes, added missing translations, made all tests pass (rspec, cucumber, jasmine) 2011-07-01 22:04:36 -07:00
danielgrippi
41773cb29e Almost done with left-nav, added link to aspect edit facebox, colored share button 2011-07-01 14:22:38 -07:00
Sarah Mei
948a7c5d55 DH SM MS Fix showing image in the publisher when it gets uploaded 2011-06-30 20:36:15 -07:00
danielgrippi
4e48db23f0 aspect dropdown shows name of aspect if contact is only in one; green 2011-06-30 12:18:41 -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
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