Sarah Mei
b60101b9ad
Use explicit parameters instead of request format to determine whether we render a remote or non-remote form in aspects#new.
...
Facebox needs to get back a text/html response. We were using text/javascript to indicate that we wanted a remote form and text/html to indicate we wanted a non-remote form. The trouble is, if we request with text/javascript then that is the format we get back. It doesn't really make sense to use formats that way anyway, so I changed it to an explicit parameter. This had the nice side effect of simplifying our new-aspect views.
2011-08-28 16:08:57 -07:00
Gonzalo Rodriguez
b9dbe0ecdd
Closes #1827 . Minor text fix on Getting Started page
2011-08-27 21:32:58 -03: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
Gonzalo Rodriguez
cc1add81b0
Avoid RecordNotFound exception thrown by find method when invalid person_id
2011-08-27 02:45:58 -03:00
Dan Hansen
d084c708b6
use @like.target instead of @target, build should be green
2011-08-26 16:08:39 -05:00
Dan Hansen
27d4fd8176
fix retractions, fix likes, backfill likes widget tests, remove typo from jasmine.yml, remove unneeded js files
...
require confirmation for comments in js, get rid of rails helper
2011-08-26 15:24:07 -05:00
Andrej Kacian
5d2d883dd3
Require confirmation when deleting a comment
2011-08-26 20:24:04 +02:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
a40543e15c
a user now has the option to disable reshare email notifications
2011-08-25 17:16:09 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
8c9a585337
reshares now have notifications, slight refactor of the notification helper
2011-08-25 17:16:09 -07:00
Gonzalo Rodríguez
31733e1f9f
Merge pull request #1686 from grzuy/1486-invalid-birthday-crash
...
Fix #1486 profile update was crashing with invalid birthday date
2011-08-25 16:40:57 -07:00
Maxwell Salzberg
8dfb278509
Merge pull request #1795 from lksnyder0/admin_nav
...
Admin nav
2011-08-25 16:35:09 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
2708b0b695
added back the tooltip explaining username constatrains on the accept invite flow
2011-08-24 17:35:27 -07:00
Raphael Sofaer
7f0677ab16
connect wip
2011-08-23 16:37:51 -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
6b88a75174
Log out a user if they arrive at AuthorizationsController#new carrying the username of a different user
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
Maxwell Salzberg
eb99b6ba5d
MS IZ removed the puts
2011-08-23 14:41:16 -07:00
Maxwell Salzberg
2a5155fd4d
IZ MS fixed facebook inviter for people you are already friends with to use the normal aspect membership dropdown, and created some nuiaces in the seed script between bob, alice and eve and their fb status"
2011-08-23 13:50:03 -07:00
Maxwell Salzberg
0dc5807ee0
go to the facebook friend finding page on getting started untill we work out the facebox problems
2011-08-23 09:15:51 -07:00
Maxwell Salzberg
e7071fd74c
fix admin inviter
2011-08-23 08:43:42 -07:00
Gonzalo Rodriguez
43d6acd868
Support green login page flash message for password change success
2011-08-23 00:51:00 -03:00
Dan Hansen
6b040c7b4a
clean up websocket receiver, add specs to content updater
2011-08-22 20:03:38 -05:00
MrZYX
87cd09a936
fix string concat
2011-08-22 23:09:51 +02:00
Dan Hansen
c0f45acfe8
Merge branch 'js-refactor-merged'
2011-08-21 21:40:01 -05:00
Sarah Mei
db6acebb6c
Need to define mailer_name in the mailer wrapper class, or devise can't find the email templates.
...
Also, for some reason, had to move the include of NotifierHelper to the view itself. That requires more investigation.
2011-08-21 19:11:46 -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
Dan Hansen
545611fffa
green?
2011-08-21 20:45:51 -05:00
Andrej Kacian
cad14bcdfc
Show tags on user profile pages for everyone if we're logged in.
2011-08-22 01:59:03 +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
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
Raphael Sofaer
a74080e27d
Fix ServicesController spec
2011-08-19 16:52:26 -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
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
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
