Manuel Schölling
0b28376216
Fixed some texts in "Getting Started" that were not translatable
2011-09-09 01:15:54 +02:00
Gonzalo Rodriguez
b9dbe0ecdd
Closes #1827 . Minor text fix on Getting Started page
2011-08-27 21:32:58 -03:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
a40543e15c
a user now has the option to disable reshare email notifications
2011-08-25 17:16:09 -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
MrZYX
87cd09a936
fix string concat
2011-08-22 23:09:51 +02:00
Dan Hansen
2e9040e227
merged with master, 7 cukes failing. jasmine is green. need to remove rails.js helpers so things suck less
2011-08-10 23:57:33 -07:00
Maxwell Salzberg
d22e5e7598
make some getting started text slightly cleaner
2011-08-10 09:38:54 -07:00
Raphael Sofaer
902edb6745
Make the tag autocomplete on the getting started page less broken
2011-08-09 18:55:34 -07:00
Maxwell Salzberg
1afc3f36f5
refix services in getting started
2011-08-09 18:04:44 -07:00
Maxwell Salzberg
86e374b8ce
add hovercards back to mentions, reorganized some helpers, made getting started view mobile accessible
2011-08-09 16:54:24 -07:00
Sarah Mei
66bb686f4b
Handle the case where the pod doesn't have the diasporahq user.
2011-08-06 12:48:23 -07:00
Raphael Sofaer
e3d0cfedd7
Use 'Welcome' from i18n
2011-08-05 23:09:00 -07:00
danielgrippi
9b24af717f
fix styling on featured users on getting started; added hovercards
2011-08-03 18:22:52 -07:00
danielgrippi
99ac976594
fix redirects around getting_started and aspect/index
2011-08-03 18:07:43 -07:00
danielgrippi
987d334764
fixed tests, translations, initalizer
2011-08-03 18:02:58 -07:00
danielgrippi
23c2eaf1c5
added a real profile description on the welcome tab
2011-08-03 18:02:58 -07:00
danielgrippi
e23439d193
fix cucumber; temporarily remove fetch featured users initilizer
2011-08-03 18:02:57 -07:00
danielgrippi
e589dd88b2
added has_connected_cubbies?
2011-08-03 18:02:57 -07:00
danielgrippi
120cf9835b
added more translations; welcome text switch
2011-08-03 18:02:57 -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
danielgrippi
303b23883d
added featured users, left nav, and search boxes into getting started
2011-08-03 18:02:56 -07:00
danielgrippi
6369eefdbe
added translations to getting started
2011-08-03 18:02:56 -07:00
danielgrippi
c9eeeb6150
ms dg; profile (step 1) finished
2011-08-03 18:02:56 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
c2dc5fde08
dg iz reworked the getting started into a tab, need to remove the getting started steps
2011-08-03 18:02:56 -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
Raphael Sofaer
1af945de11
Merge branch 'master' into oauth
...
Conflicts:
Gemfile
Gemfile.lock
app/models/app_config.rb
app/models/post.rb
db/schema.rb
public/stylesheets/sass/application.sass
spec/lib/webfinger_spec.rb
2011-06-28 17:13:38 -07:00
danielgrippi
a9b7cd1254
nicer auth prompt. wip.
2011-06-23 12:40:47 -07:00
Ilya Zhitomirskiy
a03423309d
fixed the getting started step 3, ignore the CA certs in developement is now in initializer, changed the 'login' -> 'connect' [to facebook] png
2011-06-09 15:12:35 -07: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
Ilya Zhitomirskiy
6cda0bf9ea
Revert "added a podwide email preference"
...
This reverts commit 60c0a9839b
2011-05-18 10:38:45 -07:00
Ilya Zhitomirskiy
60c0a9839b
added a podwide email preference
2011-05-17 18:19:47 -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
danielgrippi
ebb17ff70c
few cucumber steps failing. wip.
2011-05-11 11:08:30 -07:00
danielgrippi
4f972a23f6
drop requests table wip
2011-04-06 19:01:41 -07:00
danielgrippi
2e5b5e1efe
request notification emails -> started sharing notification emails
2011-04-06 13:21:15 -07:00
MrZYX
c9fd4e0e5b
fixed path in getting started
2011-04-03 15:42:24 +02:00
MrZYX
985d79acb5
some more refactoring to routes.rb
2011-03-26 17:38:49 +01:00
MrZYX
56a6f0e43b
cleaned up craziness in users and likes routing, fixed #961
2011-03-24 03:02:14 +01:00
zhitomirskiyi
1cfba68416
this should fix the getting started, going to test on staging first
2011-03-23 11:05:04 -07:00
danielgrippi
c608c70ca7
tagging profiles complete
2011-03-15 13:21:36 -07:00
maxwell
adbd23ec50
more tests for mailing. the bug was i think we have to restart the resque workers
2011-03-14 11:32:59 -07:00
maxwell
28fc093a01
fix bug in user edit mailer view
2011-03-14 11:32:59 -07:00
maxwell
50d9d76562
update translations for email settings, and missing translation for aspect#new
2011-03-11 16:02:24 -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
Dan Hansen
e04685e7ab
remove unused javascript that's in a view
2011-02-21 23:25:38 -06:00
MrZYX
11f95ee596
fixed broken css for other languages at account settings page
2011-02-19 14:27:45 +01:00
maxwell
d1b91e1eac
wip, profiles controller and specs, with cucumber failures
2011-02-15 14:17:25 -08:00
Nicolas Berens
60b08b9b08
Merge remote branch 'upstream/master'
2011-02-09 06:56:07 +01:00
zhitomirskiyi
eecf1d5d82
fixed cucumber, localization, and css
2011-02-08 17:14:37 -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
