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

791 commits

Author SHA1 Message Date
maxwell
c3d0c78bd1 Merge branch 'master' of github.com:diaspora/diaspora 
Conflicts:
	lib/diaspora/user/receiving.rb
 2010-11-02 12:46:08 -07:00
maxwell
19bbf8ce4d IZ MS; fixed post update. Posts which implement the mutable? method now can be updated via receive 2010-11-02 12:38:30 -07:00
Raphael
a9b429d163 Merge remote branch 'ed0h/helper-method-for-markdown' 2010-11-02 12:14:41 -07:00
Raphael
ff21c827e4 Revert "Merge remote branch 'ed0h/336-markdown-for-status-messages'" 
This reverts commit 2b128d88ec, reversing
changes made to 8778bdab3b.
 2010-11-02 12:14:12 -07:00
Raphael
2b128d88ec Merge remote branch 'ed0h/336-markdown-for-status-messages' 
Conflicts:
	pkg/ubuntu/dist
 2010-11-02 11:45:16 -07:00
Raphael
bbd8cadc14 Retaining specs and line from robustdj's patch 2010-11-02 11:27:51 -07:00
danielvincent
a3ce5f1cd7 REMOVED IMPORTER 2010-11-02 11:17:47 -07:00
Raphael
0b8425cbde user.aspect is gone 2010-11-02 11:02:08 -07:00
Raphael
c031416ca8 Merge branch 'master' into HEAD 
Conflicts:
	lib/diaspora/user/receiving.rb
	pkg/ubuntu/dist
 2010-11-02 10:54:37 -07:00
Sarah Mei
dc97c852f4 Person delegates first_name and last_name to profile. 2010-11-01 22:22:15 -07:00
livefromthemoon@gmail.com
aab74cf1ff Added markdown support for status messages 2010-11-02 03:55:14 +01:00
maxwell
15d6cff837 MS IZ everything now uses diaspora handle. this feels so good 2010-11-01 18:42:42 -07:00
maxwell
3c8b40c427 IZ MS retractions now use diaspora handle 2010-11-01 17:11:06 -07:00
maxwell
06445901f8 IZ MS retrations for posts now green 2010-11-01 17:11:06 -07:00
maxwell
ccf897ed62 IZ MS; fixing parser spec 2010-11-01 14:56:31 -07:00
maxwell
922aa85fb7 MS IZ refactor green 2010-11-01 14:54:40 -07:00
danielvincent
f6b4be97a3 requests are almost there 2010-11-01 14:54:40 -07:00
Raphael
9d273c6d24 Now expecting a 500 on someone passing an id to create, should really be a 422 2010-11-01 12:31:00 -07:00
Raphael
488df6eaa0 RS IZ a good test to overwrite ids 2010-11-01 11:35:37 -07:00
Raphael
6c0b187d40 Merge remote branch 'jwinky/446-user-name-length-limit' 
Conflicts:
	app/models/user.rb
 2010-11-01 11:00:02 -07:00
Raphael
7f7697c11d Merge remote branch 'traction/441-failed-aspect-creation-redirect' 2010-10-31 23:22:10 -07:00
Sarah Mei
ce213513eb PeopleController#update handles getting an empty string for :image 2010-10-31 17:49:47 -07:00
danielvincent
dc330012d6 Merge branch 'master' of github.com:diaspora/diaspora 2010-10-31 12:35:56 -07:00
danielvincent
b08c4fb84e removed user#aspect method. all aspect creation should be scoped through the user -> aspect association proper: user.aspects.create(opts) 2010-10-31 12:34:26 -07:00
Derrick Camerino
b19cdf2e25 fixing N socketing bug 2010-10-31 03:15:58 -07:00
Sarah Mei
3bd3a63c5d Enough jasmine specs to get us started. 2010-10-30 11:48:17 -07:00
livefromthemoon@gmail.com
bcb17aae16 Add support for markdown links 2010-10-30 19:26:11 +02:00
livefromthemoon@gmail.com
ebf9dd464f Better support for imbricated markdown emphasis 2010-10-30 19:26:11 +02:00
livefromthemoon@gmail.com
112088ace3 add support for markdown emphasis in status messages 2010-10-30 19:26:11 +02:00
Sarah Mei
d819c98718 can haz working jasmine 2010-10-29 22:21:08 -07:00
Raphael
ccf3b7d87b stub out some stuff in publics_controller 2010-10-29 19:10:29 -07:00
Raphael
f7708fb9bf Get rid of deprecation warning 2010-10-29 18:55:30 -07:00
Raphael
49e1bde150 Stub user creation in registrations_controller 2010-10-29 18:46:57 -07:00
Raphael
bc5dc934d6 Speed up importer spec by 40 seconds 2010-10-29 18:08:36 -07:00
Raphael
05cd57b02c Merge branch 'master' of github.com:diaspora/diaspora 2010-10-29 16:56:40 -07:00
Raphael
555c15dfef Simplify validations on user 2010-10-29 16:56:04 -07:00
danielvincent
5a9bfa7405 DG IZ; post senders are now verified by diaspora handles 2010-10-29 16:49:59 -07:00
maxwell
15bd24a64f Merge branch 'master' of github.com:diaspora/diaspora 
Conflicts:
	spec/lib/message_handler_spec.rb
	spec/spec_helper.rb
 2010-10-29 16:23:33 -07:00
maxwell
c1c045a4cd mocking 2010-10-29 16:21:39 -07:00
Raphael
581985990c Delete no-longer-relevant spec, now down to master branch failures 2010-10-29 15:59:42 -07:00
Raphael
99eb25762d Moving to make_user, a few specs broken 2010-10-29 15:53:21 -07:00
Raphael
5b78a31d29 make_user now makes a user from fixtures 2010-10-29 15:53:21 -07:00
Raphael
0c434ff66a rake task to generate user fixtures, helper method which saves them 2010-10-29 15:53:21 -07:00
maxwell
a272b22208 Merge branch 'master' of github.com:diaspora/diaspora 2010-10-29 15:16:17 -07:00
maxwell
3ce44d040f mocking out emhttprequest everywhere 2010-10-29 15:16:11 -07:00
danielvincent
7acc138a21 resolved issue regarding profile images referenced at https:// locations. 2010-10-29 14:56:41 -07:00
maxwell
7e7c4c3431 refactored message handler spec 2010-10-29 14:26:11 -07:00
Raphael
ce805c8167 Test pollution from locale being set 2010-10-29 13:26:54 -07:00
Raphael
86ddc2561a fix spec in users_controller 2010-10-29 13:22:25 -07:00
maxwell
f75bd6bc2e whoops, taking out queue stuff untill i finish 2010-10-29 13:05:35 -07:00