danielgrippi
ae7944418c
DH DG; made privacy page; can now unblock a user; users are actually being blockocked in ajaxed streams
2011-11-03 12:31:24 -07:00
danielgrippi
28e08fb6a3
show actual screenshots of diaspora mobile on logout; supress log out flash message; bootstrap on logged out page (can we get d* shots in wp7 and android emulators?)
2011-10-24 20:51:16 -07:00
Maxwell Salzberg
d5e3033308
make a setting to check out the new getting started
2011-10-24 17:10:36 -07:00
danielgrippi
547d7e4f8c
bootstrapped getting started page
2011-10-24 14:11:35 -07:00
danielgrippi
794247d07b
MS DG; rename soup to stream; fix a bunch of translations
2011-10-21 14:44:02 -07:00
danielgrippi
79ec50a16c
DG MS; added setting for displaying spotlight members in soup stream
2011-10-21 14:44:02 -07:00
danielgrippi
4bd1f0997d
fix build
2011-09-25 13:14:09 -07:00
danielgrippi
131166841a
added logged out page referencing mobile
2011-09-25 11:58:44 -07:00
Maxwell Salzberg
049eb74ab2
added route to grab users profile picture if you know their username
2011-09-24 23:33:14 -07:00
danielgrippi
97f80272b2
DG MS; changed Job:: to Jobs::; require all mail jobs from Job base class
2011-09-15 12:42:53 -07:00
danielgrippi
91e649977c
MS DG update copyright
2011-09-14 11:23:12 -07:00
Raphael Sofaer
f8e53bfba5
Fix a user's atom feed route from a cell phone.
2011-08-09 16:20:27 -07:00
danielgrippi
b8b4ad3d84
added helpers for each of the getting started steps; make step sections dull if completed
2011-08-03 18:02:56 -07:00
Raphael Sofaer
ddd4424df8
Merge remote branch 'manuels/842-sortable-aspects'
...
Conflicts:
app/models/user.rb
db/schema.rb
2011-07-28 14:36:41 -07:00
Raphael Sofaer
9797e04957
Merge remote branch 'yolk/348-change-email-with-confirmation' into merge_email_change
...
Conflicts:
app/controllers/users_controller.rb
config/locales/diaspora/en.yml
db/schema.rb
spec/controllers/users_controller_spec.rb
spec/mailers/notifier_spec.rb
2011-07-19 10:44:00 -07:00
Manuel Schölling
0855144a0a
Issue #842 : Sortable aspects
...
Signed-off-by: Manuel Schölling <manuel.schoelling@gmx.de>
2011-07-10 20:37:11 +02:00
Raphael Sofaer
9453f65b7d
Limit posts in the RSS feed, wecan come back to this and not limit it, and instead cache the static feed, when we have a little more time.
2011-06-08 12:00:08 -07:00
Arzumy MD
c0f5571795
do not unnecessary build the feed in users_controller#public when we want to redirect anyway
2011-06-08 17:50:13 +08:00
Maxwell Salzberg
de55a1cbb3
remove remember aspects feature
2011-06-03 17:35:27 -07:00
Raphael Sofaer
686464c36e
move account deletion out of a tranaction and into a job
2011-06-03 12:05:57 -07:00
Sebastian
ea85daadc4
Added UsersController#confirm_email with route and some specs
2011-06-01 16:26:54 +02:00
Sebastian
37ccbce153
Added confirmation email + specs + User#mail_confirm_email + call User#mail_confirm_email in UsersController#update
2011-06-01 16:26:53 +02:00
Sebastian
602382e24e
Extended UsersController#update method for changing password with minimal specs, added form to view and locales (en).
2011-06-01 16:26:53 +02: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
