Sarah Mei
|
c19ebcece3
|
Request delete now returns head :ok instead of redirecting. On client side, request div is removed.
|
2010-11-17 22:28:24 -08:00 |
|
Raphael
|
7876da8fb8
|
Refactor raises in requesting to validations in request, move to better controller structure
|
2010-11-16 16:18:16 -08:00 |
|
danielvincent
|
aa9966ea26
|
removed the word friend everywhere minus translation files
|
2010-11-12 20:22:55 -08:00 |
|
Raphael
|
390fffdee6
|
Fix new request view
|
2010-11-09 15:03:56 -08:00 |
|
MrZYX
|
1102fcd565
|
made flash messages translatable
|
2010-11-04 20:49:50 +01:00 |
|
maxwell
|
6d139ab946
|
more tests pass
|
2010-10-29 11:17:39 -07:00 |
|
maxwell
|
dae9f6540b
|
adding case for error message being emmited
|
2010-10-29 11:14:28 -07:00 |
|
maxwell
|
eddcb71fcb
|
EM websocket cleanly merged with master. webfingering is now async
|
2010-10-29 11:11:05 -07:00 |
|
maxwell
|
0aae89aa03
|
adding case for error message being emmited
|
2010-10-29 11:06:31 -07:00 |
|
maxwell
|
8fe339b03b
|
EM websocket cleanly merged with master. webfingering is now async
|
2010-10-29 11:05:17 -07:00 |
|
danielvincent
|
b906dd5a1d
|
added redirect to getting_started_path in requests#create
|
2010-10-27 12:31:48 -07:00 |
|
danielvincent
|
f1fbb68fd8
|
added success to getting_started. fixed birthday selectors to display years down to 1930. made buttons rounder. all save and continue buttons step forward.
|
2010-10-26 18:35:14 -07:00 |
|
Joseph Method
|
4b588ccefb
|
Addresses [#380] and [#239] by handling the errors from bad identities
|
2010-10-19 23:44:43 -04:00 |
|
Raphael
|
244accc9a9
|
flash error on friending self
|
2010-10-18 12:11:32 -07:00 |
|
Joseph Method
|
e3e4a6b319
|
Continuation of previous commit
|
2010-10-17 19:07:54 -04:00 |
|
Raphael
|
65958cf85c
|
Should close Issue 368
|
2010-10-14 15:53:43 -07:00 |
|
Shawn McGuire
|
711dcdc5f4
|
Issue #280 Fixed trailing whitespace error
|
2010-10-13 14:36:03 -05:00 |
|
Raphael
|
1fd3aeabd9
|
Add or later to license notice
|
2010-10-07 16:25:34 -07:00 |
|
Stephen Caudill
|
536cea5e44
|
Remove consecutive empty lines
|
2010-09-25 12:06:39 -04:00 |
|
maxwell
|
457be4385b
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-09-23 10:39:04 -07:00 |
|
Raphael
|
2489f8503f
|
Merge branch 'master' into HEAD
Conflicts:
app/controllers/albums_controller.rb
app/controllers/aspects_controller.rb
app/controllers/photos_controller.rb
app/controllers/registrations_controller.rb
app/controllers/requests_controller.rb
app/helpers/dashboards_helper.rb
app/views/albums/show.html.haml
app/views/aspects/manage.html.haml
app/views/shared/_aspect_nav.haml
app/views/shared/_sub_header.haml
app/views/status_messages/_status_message.html.haml
app/views/status_messages/show.html.haml
config/locales/de.yml
config/locales/en.yml
config/locales/es.yml
config/locales/fr.yml
|
2010-09-22 21:32:03 -07:00 |
|
Thomas Krehbiel
|
10e6ff9df8
|
Fix for sending unlimited duplicate friend requests
|
2010-09-22 18:16:10 -04:00 |
|
maxwell
|
63ed6a3a95
|
MS DG made async webfingering controller. need to call it from javascript to prevent seeds from blocking. remember to update your gems
|
2010-09-21 21:31:53 -07:00 |
|
Ariel Zavala
|
c1c20e14f7
|
Added translations to requests controller
|
2010-09-17 17:05:54 -04:00 |
|
Raphael
|
d124686723
|
Need more stack traces!
|
2010-09-15 23:22:02 -07:00 |
|
Jamie Wilkinson
|
fbdd50172d
|
Cleanup stray whitespace
|
2010-09-16 10:07:59 +08:00 |
|
Raphael
|
708e9f88a5
|
Spell our own name right
|
2010-09-15 17:56:18 -07:00 |
|
Raphael
|
aa3ebe372c
|
License notices replaced
|
2010-09-15 10:58:48 -07:00 |
|
maxwell
|
650a502404
|
MS IZ removed a bunch of unused request stuff
|
2010-09-13 16:58:23 -07:00 |
|
Daniel Vincent Grippi
|
26e4e088d7
|
flash messages are now being set.
|
2010-09-13 15:44:26 -07:00 |
|
Raphael
|
ff348eb944
|
Add flashes back in to aspect and albums
|
2010-09-13 15:20:57 -07:00 |
|
Daniel Vincent Grippi
|
4c15b1a01c
|
added license to every single goddamn file. also, put one in the root dir.
|
2010-09-13 14:23:50 -07:00 |
|
Raphael
|
44a1f82da9
|
Rename group to aspect
|
2010-09-13 10:38:38 -07:00 |
|
Raphael
|
86d9a41d25
|
send_friend_request_to now takes a person and group, rather than a receive url and a group id
|
2010-09-09 16:06:42 -07:00 |
|
Daniel Grippi & Raphael Sofaer
|
7984756aa7
|
controller cleanup: using respond_to and respond_with.
|
2010-08-29 22:49:13 -07:00 |
|
Raphael
|
ab4ad249df
|
Forgot to return in that rescue
|
2010-08-23 17:09:20 -07:00 |
|
Raphael
|
e05956bddd
|
rescuing 500 on friending someone that was already friends
|
2010-08-23 17:05:24 -07:00 |
|
Raphael
|
dc1dd07720
|
Don't crash on requesting a non-existent email address
|
2010-08-23 11:04:57 -07:00 |
|
maxwell
|
df435dc319
|
MS IZ made a reques form in the user index page
|
2010-08-19 11:59:58 -07:00 |
|
maxwell
|
84cc598017
|
MS a couple of small bug fixes when updateing user profile....starting to attept friend index/search page
|
2010-08-18 22:58:57 -07:00 |
|
Raphael
|
a52077b176
|
Redirect to the group you put someone in after adding them as friends
|
2010-08-18 14:57:53 -07:00 |
|
ilya
|
16a4cbc4e2
|
DG IZ redirect to requests on error
|
2010-08-16 15:21:45 -07:00 |
|
Raphael
|
6bb8c52dc4
|
Syntax error in requests
|
2010-08-16 15:16:29 -07:00 |
|
ilya
|
33ed838b79
|
DG IZ added an error message on request delete
|
2010-08-16 15:08:05 -07:00 |
|
ilya
|
373321beef
|
DG IZ made the selector box going to the right thing by passing only the id
|
2010-08-16 14:52:59 -07:00 |
|
ilya
|
97e5468cea
|
adding the user to the correct group
|
2010-08-16 14:46:15 -07:00 |
|
ilya
|
6a3eb97fd4
|
Merge branch 'friend-refactor' of github.com:diaspora/diaspora_rails into selector
|
2010-08-16 14:43:13 -07:00 |
|
Raphael
|
4f22222b30
|
Splitting accept_friend_request into two methods
|
2010-08-16 12:10:23 -07:00 |
|
ilya
|
0ee03afe1d
|
DG IZ selector box on request page
|
2010-08-16 11:39:33 -07:00 |
|
ilya
|
af6c70db47
|
RS, IZ; hack to test requests, accepted friends go into the first group.
|
2010-08-13 09:56:18 -07:00 |
|