Dan Hansen
|
624e7277e8
|
the "When I open the comment box" step used an old javascript function of ours that no longer exists. remove the feature and replace it with "When I focus the comment field"
|
2011-08-30 22:08:54 -05:00 |
|
danielgrippi
|
bd77560636
|
cucumber green in postgres (i think?). touched up aspect spec.
|
2011-08-29 15:53:47 -07:00 |
|
Maxwell Salzberg
|
f479a9a144
|
Merge branch 'brianwisti-1305-full-markdown'
|
2011-08-29 10:56:48 -07:00 |
|
Gonzalo Rodriguez
|
068d3c690d
|
Add test scenario: deleting an aspect from homepage
|
2011-08-28 22:32:05 -03:00 |
|
danielgrippi
|
3a27d66ee8
|
fix hover to add hover class to element (ugly); fixes one cucumber test
|
2011-08-27 23:20:57 -07:00 |
|
Sarah Mei
|
60c8a0d00b
|
Use different mouse events to fix tag unfollow icon hovering
|
2011-08-27 21:54:05 -07:00 |
|
Gonzalo Rodriguez
|
b048d1dd54
|
When deleting an aspect from contacts page do not redirect to aspects page
|
2011-08-27 19:24:21 -03:00 |
|
Maxwell Salzberg
|
c66b7d584d
|
Merge branch '1305-full-markdown' of https://github.com/brianwisti/diaspora into brianwisti-1305-full-markdown
Conflicts:
Gemfile.lock
|
2011-08-27 14:13:15 -07:00 |
|
Andrej Kacian
|
5d2d883dd3
|
Require confirmation when deleting a comment
|
2011-08-26 20:24:04 +02:00 |
|
Ilyaaaaaaaaaaaaa Zhitomirskiy
|
8c9a585337
|
reshares now have notifications, slight refactor of the notification helper
|
2011-08-25 17:16:09 -07:00 |
|
Ilyaaaaaaaaaaaaa Zhitomirskiy
|
e45278a043
|
notification for reshares WIP
|
2011-08-25 17:16:09 -07:00 |
|
Raphael Sofaer
|
dec10e3de9
|
Finish setting up sesssions#new prefill when logged out by authorizationsControlelr
|
2011-08-23 16:37:51 -07:00 |
|
Raphael Sofaer
|
89edfb7ed6
|
WIP prefilling username on logout of user is almost there
|
2011-08-23 16:37:50 -07:00 |
|
Raphael Sofaer
|
a63d1ad4ae
|
Sign out the signed in user if a different uid is passed to AuthorizationsController#new
|
2011-08-23 16:37:50 -07:00 |
|
Raphael Sofaer
|
c95f80be42
|
Re-nullify chubbies output and correctly handle diaspora_id param in create_account
|
2011-08-23 16:37:50 -07:00 |
|
Raphael Sofaer
|
76b0f31020
|
Fix the chubbies icon_url field, that needs to be icon path or be a url
|
2011-08-23 16:37:50 -07:00 |
|
danielgrippi
|
a7d9bbed84
|
wip
|
2011-08-23 16:37:50 -07:00 |
|
danielgrippi
|
27049e52b5
|
connect logic
|
2011-08-23 16:37:50 -07:00 |
|
Ilyaaaaaaaaaaaaa Zhitomirskiy
|
7a5fc11505
|
initial cucumber step
|
2011-08-23 16:37:50 -07:00 |
|
Ilyaaaaaaaaaaaaa Zhitomirskiy
|
7fd7fa968c
|
fixed the email from header issues and backfilled few tests
|
2011-08-22 17:38:40 -07:00 |
|
Dan Hansen
|
4a64a172d1
|
Merge branch 'master' of github.com:diaspora/diaspora into js-refactor-merged
Conflicts:
spec/javascripts/stream-spec.js
|
2011-08-21 20:57:01 -05:00 |
|
Gonzalo Rodriguez
|
e5391c1d21
|
Test reply to conversations
|
2011-08-20 18:59:09 -03:00 |
|
Dan Hansen
|
3ed50cab94
|
Merge branch 'master' of github.com:diaspora/diaspora into js-refactor-merged
Conflicts:
app/views/status_messages/bookmarklet.html.haml
config/assets.yml
db/schema.rb
public/javascripts/contact-edit.js
public/javascripts/publisher.js
public/javascripts/view.js
|
2011-08-20 14:40:56 -05:00 |
|
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 |
|