nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
15572 commits 4 branches 0 tags 121 MiB
Commit graph

329 commits

Author SHA1 Message Date
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
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
a398184081 WIP 2011-02-08 16:35:33 -08:00
Nicolas Berens
024ecc1752 Fixed small layout glitch 2011-02-08 17:11:09 +01:00
Sarah Mei
e7cf5fc841 Fix/expand cucumber feature for new user signup. 
Replace "wait for aspects page"-type steps with general wait for step.
 2011-02-02 17:17:00 -08:00
zhitomirskiyi
f5ad03f5d9 added visiblity for new aspect on getting started 2011-01-27 13:58:59 -08:00
zhitomirskiyi
2314c08265 current password requirement to change password 2011-01-24 22:39:57 -08:00
Raphael
738e8c65c8 Merge almost complete, 4 failures 2011-01-14 16:00:10 -08:00
danielvincent
b029475421 aspects now have edit pages accessible through the top nav 2011-01-08 13:11:52 -08:00
Sarah Mei
e2804dbbcb Replace old references to request.from with request.sender 2010-12-28 22:56:53 -08:00
danielvincent
d6bb5291bc Revert "Merge branch '348-change-email' of https://github.com/mblog/diaspora into mblog-348-change-email" 
This reverts commit 2ac54eeffe, reversing
changes made to 3a13657087.
 2010-12-13 17:16:56 -08:00
mblog
d0355fdd43 Feature #348: Change Email 2010-12-13 22:14:52 +01:00
danielvincent
c9b498d59c resolved 500 page on getting_started#step_3 2010-12-11 12:05:58 -08:00
maxwell
c774685d52 users can now disable email notfications 2010-12-10 11:47:10 -08:00
MrZYX
0374ee436e fixed untranslatable strings 2010-12-10 16:52:35 +01:00
danielvincent
5731f32cfe add correct page titles 2010-12-09 20:09:20 -08:00
Raphael
b8589c457d Refactor people edit page, now using form_tag 2010-12-09 13:03:30 -08:00
maxwell
10df61a504 order of birthday is now correct for US english, also, you birthday actually sticks on the getting started page 2010-12-08 16:35:48 -08:00
Hexagon
5c1c31b2b2 Final fix, really 2010-12-07 22:40:27 +01:00
Hexagon
d04e8eff00 Putting document.ready back 2010-12-07 22:38:02 +01:00
Hexagon
80c5c5c9f5 Cleaning up revert of #619 pull 2010-12-07 22:20:26 +01:00
Raphael
c320dae589 Add a cuke for being invited by someone 2010-12-05 00:15:37 -08:00
maxwell
0a8af9e72b DG MS some fixes for getting started 2010-12-04 23:05:47 -08:00
danielvincent
34a1a35bf1 skip getting started is not ajaxy 2010-12-04 12:06:08 -08:00
danielvincent
7fdbc9015b swapped new invitation lightbox for a proper page. 2010-12-03 00:57:53 -08:00
danielvincent
756824d072 removed referring text from users#edit. render_views in both users_controller_spec and photos_controller_spec. 2010-12-02 18:42:21 -08:00
Sarah Mei
967fcd9a52 Revert "Added genderized variants of t() to views, controllers and helpers." 
This reverts commit 017251fef9.
 2010-12-01 22:29:24 -08:00
Paweł Wilk
017251fef9 Added genderized variants of t() to views, controllers and helpers. 2010-12-01 18:19:48 +01: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
ed3dc10f79 various fixes to translations - i like downcased keys only :P - made stuff translatable - cleaned up en.yml a bit 2010-11-23 14:02:13 +01:00
Dan Goldenberg
bfc1fa4da0 added getting_started text and new press logos 2010-11-22 21:07:01 -08:00
maxwell
0965b45f23 fixing getting started 2 2010-11-22 18:28:04 -08:00
maxwell
173ec5f73b Revert "remove a duplicate view, hence many files updated, and fixed the js to socket people to the aspect sidebar" 
This reverts commit c45893d07d.

Conflicts:

	config/locales/diaspora/en.yml
 2010-11-22 17:11:34 -08:00
maxwell
1adf93ace1 Merge branch 'master' of github.com:diaspora/diaspora 
Conflicts:
	config/locales/diaspora/en.yml
 2010-11-22 16:40:01 -08:00
maxwell
c45893d07d remove a duplicate view, hence many files updated, and fixed the js to socket people to the aspect sidebar 2010-11-22 16:38:10 -08:00
MrZYX
e72f4e1da7 translatable status is good again 
made default aspects translatable
fix all the misssing translations I found
cleanup en.yml
 2010-11-22 22:30:37 +01:00
danielvincent
8c6f3bddc3 added diaspora handle to home page with help text. added email address to account settings page. 2010-11-22 11:19:50 -08:00
danielvincent
b3ec4d10c2 user can now remove contact from aspects on contact's profile page. a contact's posts are retained in a given aspect reflecting the duration of said contact's inclusion. 2010-11-21 16:30:45 -08:00
maxwell
4ce337bbed display a users username in the final step 2010-11-21 16:13:02 -08:00
maxwell
9f5ba1a1ea added finished state to sidbar for getting started 2010-11-21 16:13:02 -08:00
Raphael
7db1da935a Stream is a class 2010-11-21 13:21:42 -05:00
MrZYX
6f5c3f3258 made recent changes translatable and cleanup up en.yml a bit 2010-11-19 17:25:45 +01:00
Matt Baker
b2e6caafed Don't show skip link if user.getting_started == false 2010-11-18 11:16:18 -08:00
maxwell
afc3bd63fe added button to end of getting started 2010-11-17 11:30:22 -08:00
danielvincent
ed50fe7f1f Aspect.people -> Aspect.contacts. Fixed diaspora.en to reflect friend -> contact changes. 2010-11-12 20:22:56 -08:00
danielvincent
aa9966ea26 removed the word friend everywhere minus translation files 2010-11-12 20:22:55 -08:00
MrZYX
748efb1860 eliminated senseless duplicates in en.yml 2010-11-12 06:07:36 +01:00
MrZYX
d91c26fb68 translated getting started, fixed #508 2010-11-12 06:06:15 +01:00
MrZYX
eef0901f36 unscoped fill_me_out 2010-11-12 06:04:05 +01:00
danielvincent
85e2316280 Add a contact pane on aspects#show altered to also allow removal of existing contact from aspect 2010-11-11 19:41:12 -08:00
maxwell
e5c2bb46f5 reverse the years as they are displyed in the birthday dropdown 2010-11-08 10:30:01 -08:00
maxwell
32ed7e3b0f forgot to add the birthday picker change in the previous commit. now getting started does not prompt you to look for photos you dont have 2010-11-05 17:48:33 -07:00
Raphael
4233e45bc5 Adjust wording 2010-11-05 11:23:21 -07:00
Sarah Mei
a230763879 gender is a text field 2010-11-04 22:02:27 -07:00
Raphael
1bba4c60f7 Merge remote branch 'MrZYX/untranslated-strings' 
Conflicts:
	app/views/aspects/manage.html.haml
	config/locales/diaspora/en.yml
 2010-11-04 20:05:57 -07:00
Derrick Camerino
087f7e90d4 removing aspect in ui only if ok is clicked on confirmation 2010-11-04 19:54:11 -07:00
Raphael
abebd18c98 Move getting_started self link color to a css class 2010-11-04 19:29:15 -07:00
Raphael
c1c631d5ed Merge remote branch 'jdeisenberg/496-eliminate-self-links-getting-started' into 496-jdeisenberg 
Conflicts:
	config/locales/diaspora/en.yml
 2010-11-04 18:56:43 -07:00
MrZYX
1102fcd565 made flash messages translatable 2010-11-04 20:49:50 +01:00
MrZYX
63a5fdb000 made a bunch of strings translatable 2010-11-04 20:49:50 +01:00
danielvincent
fff43bf650 profile defaults key searchable to true. search takes searchable into account. 2010-11-02 16:12:42 -07:00
Hexagon
938d146405 Common translations are used without the namespace 2010-11-02 00:07:24 +01:00
Hexagon
1acc206fa4 #475: Fixed more untranslated strings 2010-11-01 22:22:13 +01:00
Raphael
07e96e5a37 Merge remote branch 'jdeisenberg/492-vague-signup-wording' 2010-10-31 23:44:50 -07:00
zhitomirskiyi
c86a3eb608 moved getting started logic to the controller 2010-10-31 19:33:11 -07:00
Sarah Mei
0817409e9a Fixed deprecation warning 2010-10-31 17:48:38 -07:00
J David Eisenberg
f54820f456 Issue #496: Eliminate self-links in Getting Started 2010-10-31 12:16:07 -07:00
J David Eisenberg
14ccf7229b Issue #492: Informal, vague description when signing up as a new user 2010-10-30 22:07:37 -07:00
Hexagon
bba3aaa684 Translating a huge amount of untranslated strings 2010-10-30 15:25:42 +02:00
danielvincent
6eb50ea934 profile photo uploader is now a standard form file element. Upload new image through people#update, which calls current_user.post to do so. 2010-10-29 14:11:59 -07:00
danielvincent
79ec02c6ad photo uploader on edit profile page. 2010-10-29 14:11:59 -07:00
Raphael
d753e31205 Merge remote branch 'ed0h/309-user-choose-language' 
Add explicit language set to spec in users_controller_spec.rb

Conflicts:
	app/models/user.rb
 2010-10-29 12:06:14 -07:00
danielvincent
bb9a6e47a4 added birthday and gender to Profile. fixed a view issue on getting_started#2 2010-10-28 11:01:16 -07:00
livefromthemoon@gmail.com
b7a586b1a5 allow user to change his language in his settings 2010-10-28 17:29:17 +02:00
danielvincent
db1a753add major hack on getting_started#2 with aspect javascript. reload the page on ajax success on new aspect creation just to get it working. 2010-10-27 18:08:55 -07:00
danielvincent
05c5e770ee removed real name from signup process. 2010-10-27 16:25:22 -07:00
danielvincent
335bd9c96a skip getting started button sets getting_started to false via js and redirects to root_path 2010-10-27 12:53:46 -07:00
danielvincent
cd726c0ba7 users#getting_started route -> getting_started. getting_started is now a mini-template referring to partials in users/getting_started/ 2010-10-27 12:21:25 -07:00
danielvincent
4ec11691cd user has a getting_started flag, set true by default. aspect#index checks to see if getting_started flag is set. 2010-10-27 10:36:13 -07:00
danielvincent
a8086f2990 further refinements. added back buttons, more explanation text. 2010-10-26 23:27:26 -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
danielvincent
385e1673ab Merge branch 'master' into getting-started 
Conflicts:
	app/controllers/users_controller.rb
	app/views/users/_account.haml
	app/views/users/_profile.haml
 2010-10-26 16:50:57 -07:00
danielvincent
6e015790a7 settings are more restful with account settings submitting to users#update, and profile settings submitting to person#update 2010-10-26 16:02:53 -07:00
danielvincent
ea46fa8fd8 save and continue buttons on getting_started#1 and getting_started#2. raise fields 2010-10-26 15:03:38 -07:00
danielvincent
ec141a2019 a user can add a person to an aspect from getting_started#2 2010-10-26 13:04:47 -07:00
danielvincent
0c72257c50 aspects can be created/destroyed via ajax on getting_started#2 2010-10-26 13:04:47 -07:00
danielvincent
dd4f46c8b0 repositioning layout on getting started 2010-10-26 13:04:47 -07:00
danielvincent
69b1b71a5d removed javascript slider. made each getting_started section its own page. added bio to profile (and changed xml_accessors to xml_readers). 2010-10-26 13:04:47 -07:00
danielvincent
f23d199230 added slider to getting started flow 2010-10-26 13:04:46 -07:00
danielvincent
b52afdd93c changed account and profile partials to better reflect styling changes 2010-10-26 13:04:46 -07:00
danielvincent
31713d9597 html5 placeholder text 2010-10-26 13:04:46 -07:00
danielvincent
278a74f1f9 draft 2010-10-26 13:04:46 -07:00
danielvincent
b2e8ebd0bc OmniauthService -> Service. Cleaned up views. 2010-10-25 17:41:59 -07:00
danielvincent
ea00d35f1f padding on stream fix. added add aspect button in aspect nav. 2010-10-19 12:10:22 -07:00
danielvincent
7e9585c5f0 default user picture change. stream link on all aspects page fix. layout view is not fragmented. 2010-10-19 11:29:29 -07:00
maxwell
e8c49feca4 made the public info link in all aspects publisher 2010-10-15 14:10:10 -07:00
danielvincent
58d5fbfb3e moved invite link to account#edit on settings page. changed text on person partial. 2010-10-14 10:26:06 -07:00
ilya
3b8998ab71 Invitations contains the inviters 2010-10-13 13:29:45 -07:00
ilya
d6b08de6fc corrected link on the account page 2010-10-11 15:07:17 -07:00
ilya
bb7e2a9918 Merge branch 'master' of github.com:diaspora/diaspora 2010-10-11 14:58:22 -07:00
ilya
007f6cfb6f close account 2010-10-11 14:58:11 -07:00
danielvincent
afad554f01 DG MS; added link to send invitation, consolidated locale file for devise invitable, upgraded devise to 1.1.3 in the gemfile 2010-10-11 13:42:05 -07:00
danielvincent
9bfb213465 Merge branch 'invites' of github.com:diaspora/diaspora into invites 2010-10-11 11:52:57 -07:00