Raphael Sofaer
686464c36e
move account deletion out of a tranaction and into a job
2011-06-03 12:05:57 -07:00
Raphael Sofaer
ed61c53e09
Wrap UsersController to not 500 when no params are submitted
2011-05-19 17:01:42 -07:00
Maxwell Salzberg
3c4c62abd5
moved auth token to admins page, and added a link in the dropdown
2011-05-19 14:23:04 -07:00
danielgrippi
dd31f37fd0
only generate new token if admin
2011-05-19 11:57:06 -07:00
danielgrippi
be662a65c6
added token authenticatable to user model
2011-05-19 11:57:06 -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
Raphael Sofaer
a4f81c6410
Finish fixing password changing and keeping emails downcased
2011-05-13 16:32:07 -07:00
Raphael Sofaer
f8b7307441
Downcase emails upon inviting
2011-05-13 16:32:07 -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
Raphael Sofaer
71e77d59b3
Revert to including all helpers everywhere, because the rest of the team prefers it that way
2011-05-12 13:54:55 -07: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
a5f297d7f7
Don't include every helper everywhere, re-organize helpers
2011-04-28 10:38:33 -07:00
danielgrippi
4f972a23f6
drop requests table wip
2011-04-06 19:01:41 -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
maxwell
3ba7ce41f1
make the public page show the public profile if html request
2011-03-30 11:34:54 -07:00
MrZYX
56a6f0e43b
cleaned up craziness in users and likes routing, fixed #961
2011-03-24 03:02:14 +01:00
zhitomirskiyi
8a9a95d854
added a flash notice
2011-03-23 11:45:06 -07:00
zhitomirskiyi
1cfba68416
this should fix the getting started, going to test on staging first
2011-03-23 11:05:04 -07:00
Raphael Sofaer
55c5b4e525
Just enqueue a job on service create for now, since our queues are empty. Resque status will let us run the job and show the user a spinny without locking up a thin
2011-03-23 10:41:34 -07:00
maxwell
52b970098b
add specs for updating email settings in the controller, and user#mail
2011-03-11 15:43:29 -08:00
maxwell
e9a843b095
email prefs are now saved. need more tests and use it in user#mail
2011-03-11 15:42:53 -08:00
maxwell
af43a60b62
only grab statuses for public feed
2011-03-09 18:12:36 -08:00
maxwell
1ac688f82c
moved an ostatus builder query out to the controller, where it belongs, and corrected the order
2011-03-09 17:33:47 -08:00
maxwell
f9279f9bbc
fixed public route not fetching posts, also an error in status_message activity markup
2011-03-09 17:08:41 -08:00
Gonzalo Rodriguez
778afa2889
Update locale before loading flash notice on user language update
2011-02-19 02:25:03 -02:00
Raphael Sofaer
5eb487ed20
204, not 201
2011-02-09 18:04:44 -08:00
Raphael Sofaer
04f33c8034
Render an empty 201 in users update with a js request
2011-02-09 17:22:45 -08:00
zhitomirskiyi
4e96d11cd0
Revert "refactored local person person friend finder functionality to use the partial"
...
This reverts commit 9f4035ab019803fc53844e70884b0519142deb18.
Conflicts:
app/views/services/_remote_friend.html.haml
app/views/users/getting_started/_step_3.html.haml
refactored invitations, added them to the last page
fixed styling on adding an aspect to the aspect list
added a facebook for person edit aspect memberships
touched up and simplified sign-up flow
fix styling on step 3
2011-02-08 16:40:33 -08:00
zhitomirskiyi
d147da1b4a
invitation text
...
setting the invites
added requests to the fb hash
finder has options
remove the requester from the list
typo
making a block
another typo
remove the if statement for the notifications
checking on the right field
translations and correct indenting
fixed stuff added
added a temp puts
added a temp puts
now actually referencing the service
not double nesting
remove stream element
updated remote friends to old style
removed it from the h1 block
putting the stream element back
2011-02-08 16:40:32 -08:00
zhitomirskiyi
df4ebb286d
accept invitation feature passing
...
wip, added a form to add aspect to the contact list
added files
typo
render the partial
remote friend
specifying the provider for the route
refactored local person person friend finder functionality to use the partial
typo
trying to use the stream
2011-02-08 16:40:28 -08:00
zhitomirskiyi
59f1bff046
storing it as a boolean in the aspect
2011-02-01 17:25:15 -08:00
zhitomirskiyi
7f026e8271
now updating the open aspects in js
2011-02-01 16:58:33 -08:00
zhitomirskiyi
2314c08265
current password requirement to change password
2011-01-24 22:39:57 -08:00
zhitomirskiyi
ddf95e2750
couple more passing cucumber stories, changed the queries on request and notification
2010-12-28 19:14:47 -08:00
MrZYX
c3a79f7298
some fixes to translations
2010-12-18 15:25:21 +01:00
danielvincent
f1ee32145d
Remove pending_requests from user, just use Request.from and Request.to.
2010-12-14 19:00:03 -08:00
danielvincent
d6bb5291bc
Revert "Merge branch '348-change-email' of https://github.com/mblog/diaspora into mblog-348-change-email"
...
This reverts commit 2ac54eeffe3a13657087
2010-12-13 17:16:56 -08:00
mblog
d0355fdd43
Feature #348 : Change Email
2010-12-13 22:14:52 +01:00
danielvincent
2c5d5d9328
show already invited users on invitation#new
2010-12-10 18:05:08 -08:00
maxwell
c774685d52
users can now disable email notfications
2010-12-10 11:47:10 -08:00
Hexagon
80c5c5c9f5
Cleaning up revert of #619 pull
2010-12-07 22:20:26 +01:00
danielvincent
177cc16e2f
fixed the build
2010-12-04 14:26:13 -08:00
danielvincent
34a1a35bf1
skip getting started is not ajaxy
2010-12-04 12:06:08 -08:00
Paweł Wilk
279b08ae4a
Added inflection of nouns by the grammatical gender for some languages.
...
- New module I18n::Backend::Genderize keeps configuration and adds :gender option to translate().
- Module methods in Genderize allow fast checking if language needs gender and guessing gender.
- jQuery in views/users/edit.html.haml shows and hides grammatical gender select list when needed.
- Span and select list in views/users/edit.html.haml allows to choose grammatical gender.
- Key :grammatical_gender in User model keeps grammatical gender information.
- Added some methods to language_helper.rb.
- UsersController is aware of grammatical gender and is able to guess it when "getting started".
2010-12-01 17:29:04 +01:00
Michael Sofaer and Raphael Sofaer
e8a266b6dd
Make the getting_started aspects page more like the manage page
2010-11-25 23:17:27 -05:00
MrZYX
ca72bb40a6
refactored en.yml
...
removed unused keys out of en.yml
replaced some ' with "
2010-11-12 06:04:05 +01:00
Raphael
6dd58fe875
Specs pass again, invitations moved to Invitation model, refactor possibly complete
2010-11-09 14:07:26 -08:00
MrZYX
1102fcd565
made flash messages translatable
2010-11-04 20:49:50 +01:00
danielvincent
a3ce5f1cd7
REMOVED IMPORTER
2010-11-02 11:17:47 -07:00
zhitomirskiyi
c86a3eb608
moved getting started logic to the controller
2010-10-31 19:33:11 -07:00
