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

643 commits

Author SHA1 Message Date
Joseph Method
4b588ccefb Addresses [#380] and [#239] by handling the errors from bad identities 2010-10-19 23:44:43 -04:00
Raphael
9309be2d69 Merge branch 'import' 
Conflicts:
	spec/models/user/invite_spec.rb
 2010-10-19 16:06:48 -07:00
danielvincent
0621aa2f6c fixed no friends/posts message positioning 2010-10-19 12:28:54 -07:00
danielvincent
ea00d35f1f padding on stream fix. added add aspect button in aspect nav. 2010-10-19 12:10:22 -07:00
Alec Leamas
fcd70ce152 Add a configuration file 
Adds a config file with environment and default thin
options
 2010-10-19 08:26:43 +02:00
ilya
d642928268 invite sends friend request if already friends, and raises if already friends 2010-10-18 16:27:02 -07:00
Joseph Method
e3e4a6b319 Continuation of previous commit 2010-10-17 19:07:54 -04:00
Sarah Mei
f688653936 disallow whitespace in username 2010-10-16 23:34:58 -07:00
Sarah Mei
d25847a626 Error message for duplicate email; add email validation spec. 2010-10-16 22:46:13 -07:00
Sarah Mei
83b23a0ffe Error message for duplicate username; refactor User validation specs. 2010-10-16 22:36:26 -07:00
maelsoucaze
34b21e7543 French localization updates. 2010-10-16 17:19:19 +02:00
danielvincent
db31357172 another typo change 2010-10-15 11:16:04 -07:00
danielvincent
d18b59f3d3 typo fix 2010-10-15 11:12:12 -07:00
maxwell
341009e20f Merge branch 'master' of github.com:diaspora/diaspora into maxwell 
Conflicts:
	Gemfile
	Gemfile.lock
	spec/models/user/invite_spec.rb
 2010-10-14 23:02:06 -07:00
Raphael
0680c2b5a6 Merge remote branch 'maelsoucaze/fr-locales' 2010-10-14 17:43:27 -07:00
Raphael
ecc7a55f8b Merge remote branch 'flea/master' 
Conflicts:
	.gitignore
 2010-10-14 17:24:46 -07:00
Raphael
08e629668d I18ning empty_messages 2010-10-14 16:55:00 -07:00
maelsoucaze
9134c4545c Fixes and updates French (Informal Honorifics) localization. 2010-10-15 01:17:33 +02:00
maelsoucaze
753deedc65 Fixes and updates French (Formal Honorifics) localization. 2010-10-15 01:17:17 +02:00
danielvincent
32a0f60a2f moved photos link to the side bar for now 2010-10-14 14:38:19 -07:00
maxwell
e218ab6780 Merge branch 'master' of github.com:diaspora/diaspora into import 
Conflicts:
	app/controllers/users_controller.rb
 2010-10-13 23:09:48 -07:00
maxwell
04f6cdaacf MS DG; basic view support; it works, but it is ugly 2010-10-13 18:42:24 -07:00
Volkan Unsal
241d104bc1 change en to tr 2010-10-13 21:10:36 -04:00
ilya
36b9f66f60 the invited user keeps track of who invited them, limit on invites, 
removed the invites controller test
 2010-10-13 16:52:33 -07:00
ilya
324f14c719 setting the token to nil on accept of invite 2010-10-12 18:23:59 -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
Volkan Unsal
73f06bb61b add devise.tr.yml 2010-10-11 15:09:43 -04:00
danielvincent
9bfb213465 Merge branch 'invites' of github.com:diaspora/diaspora into invites 2010-10-11 11:52:57 -07:00
Volkan Unsal
6d00b2ca8a correct some spelling errors in Turkish translation 2010-10-10 23:49:36 -04:00
Volkan Unsal
35ad703a5b Merge branch 'master' of http://github.com/diaspora/diaspora 2010-10-10 23:09:19 -04:00
Volkan Unsal
633048fbed finished Turkish translation 2010-10-10 23:06:56 -04:00
Alec Leamas
0c30f544d9 Fallback to static version data if git unavailable. 
Uses the file config/gitversion if git is unavailable.  This is to
support deployment without git (which will be necessary). Installation
script will generate the file config/gitversion when app is shipped.
 2010-10-10 16:38:01 +02:00
ilya
ef3e627bed the users are now made with people 2010-10-08 15:40:42 -07:00
Nick van der Burgt
09b38bb726 Added dutch locale 2010-10-08 09:11:04 +02:00
ilya
9a34ca07c4 Merge branch 'master' of github.com:diaspora/diaspora into invites 2010-10-07 19:25:42 -07:00
ilya
ddb98502b9 setup the controller, still need to make the person 2010-10-07 19:25:34 -07:00
danielvincent
75aadc5c57 DG MS; cleaned up routes, killed all deprication warnings in everything. totally legit. 2010-10-07 18:25:59 -07:00
ilya
4ecda6ab8f Merge branch 'master' of github.com:diaspora/diaspora into invites 
Conflicts:
	Gemfile
	Gemfile.lock
 2010-10-07 18:20:51 -07:00
danielvincent
c756e1a331 Merge branch 'master' of github.com:diaspora/diaspora 2010-10-07 18:17:38 -07:00
danielvincent
2e73104d6f DG MS; updated BSON gems, added devise-mongomapper gem fix, using unforked devise 1.1.2 2010-10-07 18:17:26 -07:00
Raphael
399e437655 Merge branch 'master' of github.com:diaspora/diaspora 2010-10-07 17:34:03 -07:00
Raphael
2bb36a266a Merge remote branch 'minilibra/master' 2010-10-07 17:32:20 -07:00
ilya
c75a2ebd66 Merge branch 'master' of github.com:diaspora/diaspora 2010-10-07 17:00:52 -07:00
ilya
97f058c625 moving to app config yml 2010-10-07 17:00:38 -07:00
danielvincent
7a56d82873 Merge branch 'master' of github.com:diaspora/diaspora 2010-10-07 16:56:22 -07:00
danielvincent
4deea95057 DG MS; export photos button in users#edit 2010-10-07 16:56:10 -07:00
ilya
ad348ed24c trying the mailer_condig 2010-10-07 16:54:38 -07:00
ilya
9c59adee51 in dev env as well 2010-10-07 16:48:49 -07:00
ilya
487637d5a3 Merge branch 'master' of github.com:diaspora/diaspora 2010-10-07 16:42:49 -07:00
ilya
f022c2d8bd correct smtp server 2010-10-07 16:42:39 -07:00
Raphael
1fd3aeabd9 Add or later to license notice 2010-10-07 16:25:34 -07:00
ilya
720d1daa9e moved the mailer settings back into env 2010-10-07 15:40:18 -07:00
ilya
8fae836b65 isolating the problem 2010-10-07 15:28:58 -07:00
ilya
e174722315 Merge branch 'master' of github.com:diaspora/diaspora 2010-10-07 15:06:03 -07:00
ilya
43600905dc trying making the port an int 2010-10-07 15:05:52 -07:00
Raphael
6dbe429ed1 Merge branch 'master' of github.com:diaspora/diaspora 2010-10-07 15:02:37 -07:00
Raphael
a01a059293 Merge branch 'master' of github.com:diaspora/diaspora 2010-10-07 14:47:32 -07:00
danielvincent
efcd0c418d Merge branch 'master' of github.com:diaspora/diaspora 2010-10-07 14:47:31 -07:00
danielvincent
bd9e9043e0 fixed nb locale 2010-10-07 14:37:38 -07:00
ilya
7aa49b277c moved the smtp setting to intializers 2010-10-07 14:36:08 -07:00
Raphael
9646a453a1 Merge branch 'master' of github.com:diaspora/diaspora 2010-10-07 14:34:57 -07:00
ilya
c036e63289 Merge branch 'master' of github.com:diaspora/diaspora 2010-10-07 14:27:38 -07:00
ilya
2a104ea622 Revert "moved the SMTP setting into app_config.yml" 
This reverts commit 2451ac4957.
 2010-10-07 14:26:59 -07:00
danielvincent
1a8d4a603f Merge branch 'master' of github.com:diaspora/diaspora 2010-10-07 14:22:10 -07:00
danielvincent
8f1973815e DG MS; added route for exported xml 2010-10-07 14:21:53 -07:00
ilya
2451ac4957 moved the SMTP setting into app_config.yml 2010-10-07 14:20:31 -07:00
Raphael
9912769b5b Merge remote branch 'guillei/s3_upload' 2010-10-07 14:17:43 -07:00
ilya
8352a7cf95 Merge branch 'master' of github.com:diaspora/diaspora 
Conflicts:
	config/routes.rb
 2010-10-07 14:04:31 -07:00
ilya
7ecc94d7b2 added the password route to make email reset password work 2010-10-07 14:03:18 -07:00
minilibra
ae6f39a0d0 Localization file for Indonesian added. Change "en" at the top of both files to "id". Thanks to rsofaer. 2010-10-08 02:09:13 +07:00
Raphael
e47aa90b15 Merge remote branch 'Stigjb/master' 2010-10-07 11:06:27 -07:00
Raphael
6ae6d20e4f Merge remote branch 'crimer/master' 2010-10-07 10:57:51 -07:00
Raphael
d7bbb66d27 Run whitespace:cleanup 2010-10-07 10:47:37 -07:00
Raphael
0831812e97 Merge remote branch 'kashif/master' 2010-10-07 10:41:50 -07:00
Raphael
f078bd0a54 Merge remote branch 'leamas/perm-fix' 2010-10-07 10:09:29 -07:00
Raphael
b6a3549693 Merge branch 'master' of github.com:diaspora/diaspora 2010-10-07 09:37:00 -07:00
Crimer
56ed245db0 MongoMapper now not overrides database name in MONGOHQ_URL configuration if provided. It also works on Heroku. 2010-10-07 14:29:17 +00:00
Alec Leamas
0d51af0a13 Removing shebang on non-script. 2010-10-07 16:11:43 +02:00
ilya
131e905322 fixed the public route 2010-10-06 19:05:43 -07:00
Raphael
a315b489f1 Merge branch 'master' of github.com:diaspora/diaspora 2010-10-06 18:19:38 -07:00
danielvincent
66b356b5fe moved public route 2010-10-06 18:14:37 -07:00
Raphael
caffd8f9ff Don't check for servers that aren't there 2010-10-05 17:58:48 -07:00
Raphael
79f19b6870 Merge branch 'master' of github.com:diaspora/diaspora 2010-10-05 17:46:25 -07:00
Raphael
de9cdfbe7b Always set the FACEBOOK constant 2010-10-05 17:46:14 -07:00
Yaron Shahrabani
77d5b68e15 Fixed some typos 2010-10-06 08:29:58 +08:00
Daniele Di Sarli
5074d2f8f2 Updated Italian translation 2010-10-06 08:25:29 +08:00
Raphael
22f90086ca Merge branch 'master' of github.com:diaspora/diaspora 2010-10-05 16:58:06 -07:00
Raphael
37fb2bfd32 Don't require a facebook yml 2010-10-05 16:57:22 -07:00
UserAd
1d0a4579f6 Add missing localization for aspect managment 2010-10-06 07:56:23 +08:00
UserAd
e7c153df4e Add translation support in profile ('or' between buttons). Fix Russian locale 2010-10-06 07:56:23 +08:00
danielvincent
33e478229e Merge branch 'master' of github.com:diaspora/diaspora 2010-10-05 13:40:10 -07:00
danielvincent
f3c34692d8 pubsub support 2010-10-05 13:39:56 -07:00
ilya
45d40f27d9 changed the deploy config back to master 2010-10-05 13:06:55 -07:00
ilya
85f71aa4aa added the deploy task to symlink the fb_config 2010-10-05 12:38:20 -07:00
ilya
82455981b8 added fb_config to gitignore 2010-10-05 12:21:33 -07:00
Raphael
1fa732498b Update sprinkle script 2010-10-05 11:55:47 -07:00
Raphael
bb88a6fb8c Merge branch 'salmon-refactor' 2010-10-05 09:47:10 -07:00
Raphael
be909e27d6 Deleting adams 2010-10-04 14:49:27 -04:00
Raphael
2cd8cf0621 Remove a bunch of deleted backer servers 2010-10-02 20:30:37 -04:00
ilya
88dafbf5cc changed deploy branch 2010-10-02 13:29:36 -07:00
Stig Johan Berggren
ff7c8c7a50 Added locale files for Norwegian (bokmål) 
Localization files for Norwegian bokmål (nm) inserted. They have been
tested a little locally and do not produce any errors.
 2010-09-29 17:58:25 +02:00
Kashif Rasul
330cf63599 Arabic locale fixes. 2010-09-29 17:13:27 +02:00
Kashif Rasul
08ddae0894 Added devise Arabic locales and moved locale to correct folder. 2010-09-29 16:54:33 +02:00
Kashif Rasul
0fed72d505 Added Arabic locales. 2010-09-28 13:57:40 +02:00
danielvincent
15a4609c14 moved user's public route to user controller. changed person.public_url to reflect change. 2010-09-27 22:30:16 -07:00
danielvincent
44c29cf8e6 deploy_config back to master 2010-09-27 21:57:52 -07:00
danielvincent
eb7244e07c Merge branch 'master' of github.com:diaspora/diaspora 2010-09-27 19:07:01 -07:00
danielvincent
26a4dc76a6 Merge branch 'master' of github.com:diaspora/diaspora 2010-09-27 18:34:55 -07:00
danielvincent
3b8ddf76a3 temp route for atom feed. also, public atom currently displays all posts. 2010-09-27 18:34:47 -07:00
ilya
a8f05244ba localization should be fixed 2010-09-27 16:07:24 -07:00
ilya
50234b095b had to move translation around slightly, now the profile edit will be missing a template 2010-09-27 16:02:08 -07:00
ilya
08b9aa864a Merge branch 'master' of github.com:diaspora/diaspora into fb 
Conflicts:
	app/views/layouts/application.html.haml
	app/views/shared/_publisher.haml
	app/views/shared/_sub_header.haml
	app/views/users/edit.html.haml
	config/deploy_config.yml
	config/routes.rb
 2010-09-27 15:39:50 -07:00
ilya
8f55852ea9 Merge branch 'master' of github.com:diaspora/diaspora 2010-09-27 15:30:27 -07:00
ilya
b823213c0d added a generate:secret_token task, and added an initializer to generate one if the file does not exist 2010-09-27 15:29:55 -07:00
Guillermo
1a876355d5 Some fixes in spanish locale 2010-09-28 03:02:47 +08:00
Daniele Di Sarli
6b9bcfda63 Corrected Italian translation 2010-09-28 02:41:59 +08:00
Raphael
2f31e036e3 Merge branch 'cz' of http://github.com/koo5/diaspora 2010-09-27 11:36:04 -07:00
Raphael
ef2647c188 Merge branch 'master' of http://github.com/yarons/diaspora 2010-09-27 10:52:32 -07:00
Raphael
1e495c676c Merge branch 'master' of github.com:diaspora/diaspora 2010-09-27 10:39:41 -07:00
Raphael
139102e488 Merge branch 'master' of http://github.com/bastos/diaspora 2010-09-27 10:11:28 -07:00
Yaron Shahrabani
08c0c345f5 Updated Hebrew translation 2010-09-27 09:49:38 +02:00
ilya
f36b99b03c changed the deploy_config to play on remote 2010-09-26 22:13:28 -07:00
Dorian
611852bb74 Use rake whitespace:cleanup 2010-09-26 12:53:22 -04:00
Dorian
e792344c0e Use improved whitespace:scrub_gratuitous_newlines 2010-09-26 12:52:39 -04:00
Dorian
6ffc03a4c9 Big clean up: delete trailing whitespace 2010-09-26 12:48:40 -04:00
Stephen Caudill
fd69f0201f User creates an aspect 2010-09-26 12:05:39 -04:00
Guillermo
6e0082da9e Files are uploaded to S3 if the ENV variables are set (Heroku-friendly) 2010-09-26 11:03:47 -05:00
Stephen Caudill
05c2da81e5 Add cucumber and run the generator 2010-09-26 11:35:50 -04:00
koo5
28e925e40a More czech translation goodness. I've added distance_in_words translations, feel free to delete it if it belongs somewhere/sometime else. 2010-09-26 06:01:39 +02:00
Yuval Adam
f2ddb8a39c added Hebrew (he) locale files 2010-09-26 04:49:39 +08:00
Stephen Caudill
536cea5e44 Remove consecutive empty lines 2010-09-25 12:06:39 -04:00
Tiago Bastos
5a4f40591d Added missing translations. 2010-09-25 11:25:45 -03:00
Raphael
beda67aca6 Shorten git show stuff 2010-09-24 17:51:51 -07:00
danielvincent
d59330264d fixed syntax error in italian locale 2010-09-24 16:18:41 -07:00
sennewood
dcedc5d505 Added the missing lines of code and translated them. 2010-09-25 06:39:59 +08:00
sennewood
16e5f972d1 Translation correction 2010-09-25 06:39:59 +08:00
sennewood
e2db21d7b0 Use double quotes in locale files 2010-09-25 06:39:59 +08:00
Daniele Di Sarli
8323e7dcb2 Added Italian translation 2010-09-25 06:35:43 +08:00
Raphael
70a22ae839 Merge branch 'master' into HEAD 
Conflicts:
	app/models/post.rb
	app/models/user.rb
	config/initializers/socket.rb
 2010-09-24 09:15:10 -07:00
ilya
deea03bf82 deploy restart after db:reset since we need the new app_config.yml 2010-09-23 20:38:39 -07:00
Raphael
8690967509 defaults doesn't really make sense when there's nothing else 2010-09-23 14:58:17 -07:00
Raphael
972cb54828 Move locale files, fix syntax error in fr-informal 2010-09-23 14:52:06 -07:00
Raphael
82bc5b097d Use double quotes in locale files 2010-09-23 14:43:38 -07:00
UserAd
cfd3523030 Stupid error fix 2010-09-24 05:02:30 +08:00
UserAd
7a9e347b28 Improved russian locale 2010-09-24 05:02:30 +08:00
Maël Soucaze
49162a6ead The underscore (fr_informal) is replaced by the hyphen (fr-informal). 2010-09-24 04:51:49 +08:00
Maël Soucaze
4cd83f9ae9 Change the file organization, and Casual Honorifics is now Informal Honorifics. 2010-09-24 04:51:49 +08:00
Maël Soucaze
d7eb828064 Language fix. 2010-09-24 04:51:48 +08:00