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

9038 commits

This branch
This branch
All branches
Author SHA1 Message Date
Andrej Kacian
b772b8354d Fixed misplaced translations for no tags on own profile 2011-08-22 01:55:36 +02:00
Sarah Mei
163ac103cd Haven't figured out why reset password email body is blank, but I pulled it into a controller test so we can figure it out there instead of in a cucumber feature. 2011-08-21 16:45:53 -07:00
Gonzalo Rodriguez
4ccb5f778a Missing js for contacts page. Aspect renaming wasn't working. 2011-08-21 20:31:16 -03:00
ticho
c39e8bb64f Merge pull request #1741 from ticho/hide-post-button-ajaxification 
Show ajax spinner when hiding or unhiding a post in stream.
 2011-08-21 16:18:00 -07:00
Andrej Kacian
bd3683d0d1 Fix selector in the hide undo click handler. 2011-08-22 01:15:43 +02:00
Andrej Kacian
395df041db Made toggleComments jasmine test aware that there are more posts in the fixture 2011-08-22 00:38:34 +02:00
Andrej Kacian
2a52face12 Add jasmine test for ajax spinner display 2011-08-22 00:38:34 +02:00
Andrej Kacian
50f32ce5ac Show ajax loader and hide the hide icon when hiding a post. 2011-08-22 00:38:34 +02:00
Luke Snyder
f9fc55823b finished styling 2011-08-21 13:07:04 -04:00
Luke Snyder
96bfaf7550 changes to bar 2011-08-21 12:24:31 -04:00
MrZYX
1b5698c1f5 updated locales 2011-08-21 17:09:16 +02: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
Gonzalo Rodriguez
f1cf81772b Closes #1386. On conversations, disable Reply button once pressed 2011-08-20 15:51:39 -03:00
Gonzalo Rodriguez
ceedbb14cb Closes #1486. Profile update was crashing with invalid birthday date 2011-08-20 00:34:59 -03:00
Gonzalo Rodriguez
234af2a15b Fixing some tests that weren't testing correctly 
These assertions were always returning true even if you dont populate
the flash, because nil.should_not be_empty returns true
 2011-08-19 23:57:33 -03:00
Raphael Sofaer
a74080e27d Fix ServicesController spec 2011-08-19 16:52:26 -07:00
Maxwell Salzberg
a5ab8a80d8 Merge branch 'facebook_friend_refactor' 2011-08-19 15:57:57 -07:00
Maxwell Salzberg
735a37ffe0 really basic preventivie mesures for facebook friending. we need to GO ALL THE WAY and proxy facebook users to be in many aspects 2011-08-19 15:57:10 -07:00
Maxwell Salzberg
bb5ada6533 create a wrapper class for devise mailer, both so we can resquify it and so we can inject helpers 2011-08-19 15:57:10 -07:00
Maxwell Salzberg
e4062bf5fd now functionally correct 2011-08-19 15:56:32 -07:00
Maxwell Salzberg
70fe2cf10f wip 2011-08-19 15:56:31 -07:00
Raphael Sofaer
32368a16dd Make latest migration postgres compatible 2011-08-19 15:55:27 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
834c75894c jasmine is green again 2011-08-19 14:42:28 -07:00
Maxwell Salzberg
e100032244 add all in the query, to be more pedantic 2011-08-19 13:59:41 -07:00
Maxwell Salzberg
3cee589397 show only invites from a user 2011-08-19 13:58:22 -07:00
Maxwell Salzberg
fe78a69161 combine invitation emails 2011-08-19 12:15:11 -07:00
Maxwell Salzberg
6f20e11a67 better invite emails wip 2011-08-19 12:15:11 -07:00
MrZYX
f2e25c5fc5 updated locales 2011-08-19 20:39:26 +02:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
96d183a041 fixed private message emails not including the message 2011-08-19 11:33:55 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
ecf38305b4 added a visible style for missing translations in development and production modes 2011-08-19 11:05:48 -07:00
Gonzalo Rodriguez
3d7297ba5e Closes #1753. Render thats_you message instead of dropdown for your hovercard 2011-08-19 00:47:26 -03:00
Maxwell Salzberg
6beeecefd8 add better messages telling a user that they sent share requests if they try and email exsisting users 2011-08-18 18:27:37 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
2c47262d54 manually pulled in manuels latest commits 2011-08-18 16:49:26 -07: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
a54ad95e87 Merge branch 'master' of github.com:diaspora/diaspora 2011-08-18 16:16:38 -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
Raphael Sofaer
60e9fd54e2 Fix a problem with re-saving deleted objects in a spec in postgres, add postgres to test group in gemfile 2011-08-18 16:05:14 -07:00
Raphael Sofaer
31584eed84 It turns out find_for_database_authentication calls find_for_authentication, not the other way around. 2011-08-18 16:05:14 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
2777f16f4f Merge branch 'issue1586-aspectdropdown-when-posting' 2011-08-18 16:02:09 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
064ae972b3 the cucumber is now passing & renamed the partial to conform with convention 2011-08-18 15:38:27 -07:00
Maxwell Salzberg
8b278adff6 migration to fix old invites for resend 2011-08-18 14:51:15 -07:00
Maxwell Salzberg
7d9b1636c0 dont raise runtime error if invitation token is not found 2011-08-18 14:14:24 -07:00
Maxwell Salzberg
947dfaacf7 make profile photo auto so it does not get smooshed 2011-08-18 14:09:50 -07:00
Andrej Kacian
e033eda5d1 Use live binding for tipsy tooltips within stream elements, so that elements loaded by the infiniscroll get them too 2011-08-18 22:28:36 +02:00
Andrej Kacian
f59275adb4 Actually add the comment delete link to list of tipsified elements 2011-08-18 22:22:47 +02:00
Andrej Kacian
f5e93c3e83 Comment delete icon should also have a tipsy tooltip 2011-08-18 22:12:09 +02: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