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

162 commits

Author SHA1 Message Date
Sarah Mei
83b23a0ffe Error message for duplicate username; refactor User validation specs. 2010-10-16 22:36:26 -07:00
Raphael
1fd3aeabd9 Add or later to license notice 2010-10-07 16:25:34 -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
98bc2df841 removed the encryption key= method, and user with private key factory 2010-09-27 10:10:54 -07:00
ilya
cf0df90dae moved the private key into user where it belongs, two failing cucumber tests 2010-09-26 22:08:42 -07:00
Sarah Mei
5d1afe21be Refactor user specs to speed up spec runs. 2010-09-26 13:08:30 -07:00
Stephen Caudill
536cea5e44 Remove consecutive empty lines 2010-09-25 12:06:39 -04:00
ilya
bb58678556 added a fb_status model & parser method 2010-09-24 14:41:31 -07:00
ilya
efd901dcd9 RS, IZ; Pod url moved to app_config.yml, app_config.yml refactored, diaspora_handle now set based on APP_CONFIG 2010-09-21 15:46:57 -07:00
danielvincent
25b4b409be Merge branch 'master' of github.com:diaspora/diaspora into production 2010-09-16 16:19:48 -07:00
Federico Brubacher
05808456d8 fixed small issue in albums#update anad added corressponding controller test 2010-09-16 12:21:08 -03:00
Raphael
c67a8ea100 Merge branch 'master' of github.com:diaspora/diaspora into production 
Conflicts:
	config/deploy.rb
	config/environments/production.rb
	spec/models/request_spec.rb
 2010-09-15 22:37:05 -07:00
Jamie Wilkinson
fbdd50172d Cleanup stray whitespace 2010-09-16 10:07:59 +08:00
Raphael
de93fd2818 Merge branch 'master' of github.com:diaspora/diaspora into production 2010-09-15 18:10:13 -07:00
Raphael
708e9f88a5 Spell our own name right 2010-09-15 17:56:18 -07:00
Raphael
33048fe6db Merge branch 'master' of github.com:diaspora/diaspora into production 
Conflicts:
	app/models/user.rb
	spec/models/aspect_spec.rb
 2010-09-15 17:24:00 -07:00
maxwell
84c60e5f2e DG MS fixing webfinger, i hope to goodness 2010-09-15 13:28:06 -07:00
Raphael
1006e8a680 Merge branch 'master' of github.com:diaspora/diaspora into production 2010-09-15 11:01:11 -07:00
Raphael
aa3ebe372c License notices replaced 2010-09-15 10:58:48 -07:00
Daniel Vincent Grippi
c1a9a89be7 Merge branch 'production' of github.com:diaspora/diaspora into production 
Conflicts:
	app/models/user.rb
	config/deploy.rb
	spec/factories.rb
	spec/models/request_spec.rb
	spec/spec_helper.rb
 2010-09-14 11:08:18 -07:00
Daniel Vincent Grippi
4c15b1a01c added license to every single goddamn file. also, put one in the root dir. 2010-09-13 14:23:50 -07:00
Raphael
960d40278c Add username, login with username or email 2010-09-08 10:59:08 -07:00
Raphael
701bec670f Merge branch 'master' of github.com:diaspora/diaspora into pivots 
Conflicts:
	app/views/groups/index.html.haml
	config/deploy_config.yml
 2010-08-18 20:50:28 -07:00
Raphael
39c96bfd04 Changing to a smaller pic in the tests 2010-08-18 16:00:06 -07:00
Raphael
842b321dfa User email checking, routes working again 2010-08-17 13:02:42 -07:00
Raphael
f2e327d908 User factory now works 2010-08-06 13:27:42 -07:00
maxwell
5e6d0c1153 Merge branch 'master' of github.com:diaspora/diaspora_rails into 
friend-refactor, also fixed more specs

Conflicts:
	app/models/person.rb
	app/models/user.rb
	spec/factories.rb
 2010-08-05 15:13:05 -07:00
Raphael
bb66e87905 RS, IZ; Encryption specs now pass with openssl 2010-08-05 11:56:31 -07:00
ilya
5dfc097c88 replaced the functionality with openssl, didn't do the encryption spec 2010-08-04 20:32:15 -07:00
danielvincent
f2d7f35b84 unfriend still not removing association from bad_friend 2010-08-04 20:29:54 -07:00
danielvincent
c92a225556 DG MS; user-person relationship done. bunch of failing stuff. 2010-08-04 19:22:14 -07:00
Raphael
58addca8dd RS, IZ; extracted and murdered ostatus. 2010-08-04 16:00:01 -07:00
maxwell
80db1132d1 Fixed the tests; 2010-07-28 16:50:38 -07:00
maxwell
bda87bbeab MS switched request new links to just the request link 2010-07-26 18:13:20 -07:00
Maxwell Salzberg
66f66b85a6 MS added test, things still seem broken though 2010-07-24 23:21:02 -07:00
maxwell
311a60f7b7 MS should be able to unsubscribe from an ostatus feed now, now it needs to be put in the controller 2010-07-23 21:16:36 -07:00
Raphael
07767e62fe Photo factory 2010-07-22 10:49:27 -07:00
Raphael
335f202e2b RS, IZ; Profiles are now embedded 2010-07-14 11:22:44 -07:00
ilya
964ee65b11 rs iz ; the signature of the signable_accessors are now in the xml 2010-07-13 12:21:11 -07:00
ilya
3dfb55ee85 IZ MS pulled in master: this is now the authoritative branch; waiting for dan to fix gpg so we can move on 2010-07-11 00:04:08 -04:00
maxwell
603fc15120 MS IZ added the env setting line to factories 2010-07-10 23:54:25 -07:00
ilya
1bed575b90 Added the Key Fingerprint validation to the person model(defaults to empty string) 2010-07-10 06:09:53 -04:00
ilya
7eba033c0d Revert "RS IZ Friday night, key_fingerprint serialization weirdness" 
This reverts commit c6e16835df9c5d46d0ec5e0f1860da1ef4c0986a.
 2010-07-10 05:29:57 -04:00
ilya
8c75761ba1 RS IZ Friday night, key_fingerprint serialization weirdness 2010-07-10 02:25:48 -04:00
maxwell
8147602570 DG MS friends now are delete 2010-07-09 18:10:11 -07:00
maxwell
06eec9204a DG MS; person request is now request. refactoring as well. user verbiage for request actions 2010-07-08 18:28:39 -07:00
maxwell
a35892428c Merge branch 'master' of github.com:diaspora/diaspora_rails into socket-foo 2010-07-07 20:09:27 -07:00
maxwell
947f1a60e7 RS MS added url for for the socket controller 2010-07-07 18:59:32 -07:00
danielvincent
3d105e7c1e DG IZ; removed Friend model, now Person is used instead. Also, broke the websocket. 2010-07-07 16:53:52 -07:00
maxwell
19e03c7077 person now has a url, and they cant add themselves any longer.... you need to add a url to your old development user, and we need to set it in the field 2010-06-29 12:33:00 -07:00
ilya
b5b9c647d7 DG IZ Created the profile model & friend view now shows the information 2010-06-28 21:32:09 -04:00
ilya
2b42ef216c DG IZ; added a profile; one-to-one relation with Person (non-singleton) 2010-06-28 18:20:56 -04:00
maxwell
6467f943da MS^2 Comments serialize and deserialize properly 2010-06-25 22:49:53 -07:00
ilya
179af4fbfa Merged mongomapper and master 2010-06-25 00:11:45 -04:00
maxwell
e558d4833f DG MS fixing tests 2010-06-24 20:45:49 -07:00
ilya
8829714e2d RS, IZ, Cleaned up Post, finished Person refactor, FactoryGirl sequences are unpleasant 2010-06-23 20:17:44 -04:00
Maxwell Salzberg
9a44578c37 DG; Person is now the parent of Friend and User 2010-06-22 23:11:55 -07:00
danielvincent
a1361da770 DG IZ; friend and owner now require a real name 2010-06-21 15:56:40 -07:00
danielvincent
628af0372f DG MS; completed event-queue intergration. 2010-06-17 14:29:41 -07:00
maxwell
497b477e89 DG MS added a post model, going to put it more places than just status message now 2010-06-15 17:21:57 -07:00
ilya
653392f738 IZ factories in controller specs as well as bookmark 2010-06-15 14:56:32 -04:00
ilya
ee295d01ff IZ using factories for the spec 2010-06-15 13:18:26 -04:00