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

3135 commits

This branch
This branch
All branches
Author SHA1 Message Date
Raphael
e52e600a4d Revert "Revert "Merge remote branch 'upstream/master'"" 
This reverts commit 3faca8380b.
 2010-10-20 09:52:03 -07:00
Raphael
fd8028db33 Revert "Revert "Merge remote branch 'upstream/master'"" 
This reverts commit 1481056af2.
 2010-10-20 09:51:55 -07:00
Alec Leamas
1481056af2 Revert "Merge remote branch 'upstream/master'" 
This reverts commit fb70dc8c99, reversing
changes made to 53fef63a9a.

Conflicts:

	pkg/fedora/diaspora-setup
	pkg/ubuntu/diaspora-setup
	public/stylesheets/sass/application.sass
	spec/models/user/attack_vectors_spec.rb
 2010-10-20 14:59:55 +02:00
Alec Leamas
3faca8380b Revert "Merge remote branch 'upstream/master'" 
This reverts commit 4bb5aeb34b, reversing
changes made to fb70dc8c99.
 2010-10-20 14:52:18 +02:00
Alec Leamas
c08121e6eb socket server update: pidfile, ubuntu upstart, bugfixes 
patching websocket_server.rb to provide a pidfile, important
for SystemV init files. Ubuntu upstart configuration. Bugfixes
 2010-10-20 14:08:44 +02:00
Alec Leamas
570d0cf104 Merge remote branch 'upstream/master' 2010-10-20 10:32:32 +02:00
maxwell
9da5399425 Merge branch 'master' of github.com:diaspora/diaspora 2010-10-20 00:42:52 -07:00
maxwell
e7f764ffeb attack vector where you take posts from valid (unknown) diaspora people is now fixed 2010-10-20 00:42:33 -07:00
danielvincent
e7d7e1f258 Merge branch 'master' of github.com:diaspora/diaspora 2010-10-20 00:02:22 -07:00
danielvincent
d2945c83dc status message show is now a real show page. photo partial in stream shouldn't display a slideshow of album. 2010-10-20 00:02:15 -07:00
Alec Leamas
4bb5aeb34b Merge remote branch 'upstream/master' 2010-10-20 08:55:35 +02:00
Alec Leamas
fb70dc8c99 Merge remote branch 'upstream/master' 
Conflicts:
	pkg/ubuntu/diaspora-setup
 2010-10-20 08:54:56 +02:00
Raphael
a01c1c7461 Remove remove_all_aspects without ill effect 2010-10-19 23:54:12 -07:00
Raphael
d3d0182164 Put database cleaner back in 2010-10-19 23:29:59 -07:00
Raphael
d98ac70155 Clean up some repetition in specs 2010-10-19 23:29:59 -07:00
Raphael
197bd8eb49 make user/receive spec less repetitive 2010-10-19 23:29:59 -07:00
Raphael
74ec629b01 user_friending_spec passes again 2010-10-19 23:29:59 -07:00
Raphael
52f7350f78 Fix a couple more specs 2010-10-19 23:29:59 -07:00
Raphael
43dd95147e Starting to remove database-cleaner 2010-10-19 23:29:58 -07:00
Sarah Mei
b007ba1487 Fixed cucumber features. Backfilled tests for AspectsController#create. 2010-10-19 22:57:55 -07:00
Sarah Mei
f8400389de Merge branch 'master' of github.com:diaspora/diaspora 2010-10-19 22:39:05 -07:00
Sarah Mei
81ef7386b3 validation errors in profile and person bubble up to user. 2010-10-19 22:33:12 -07:00
Sarah Mei
8cf1b83662 cucumber feature closer to passing. 2010-10-19 22:29:07 -07:00
maxwell
d0055cee37 changed a bit of text in the invite, also made it show on all aspects now that we have it fixed 2010-10-19 21:07:10 -07:00
maxwell
e7f84f5434 fix hcard when parsing friend photo 2010-10-19 20:46:43 -07:00
maxwell
f26dc039c9 removed empty hash from invite email 2010-10-19 20:43:45 -07:00
maxwell
bfe57b13cc added diaspora handle to user profile page 2010-10-19 20:34:10 -07:00
maxwell
da95930c9a added a bit to test email 2010-10-19 20:23:20 -07:00
danielvincent
d200aaab52 mail has some style. couldn't figure out devise mailer templating at the time... 2010-10-19 18:26:02 -07:00
Raphael
14a5eee41c Return if there is a failure to create a user 2010-10-19 17:29:22 -07:00
Raphael
360891496e Check that time serializes correctly post-parse, not on string equality 2010-10-19 17:09:52 -07:00
danielvincent
8751503aa4 header on public explain fancybox 2010-10-19 16:28:45 -07:00
danielvincent
f6303b8fff reshare dropdown looks nicer. fixed user menu to drop down on click 2010-10-19 16:16:46 -07:00
Raphael
3557d66749 Merge branch 'master' of github.com:diaspora/diaspora 2010-10-19 16:07:03 -07:00
Raphael
9309be2d69 Merge branch 'import' 
Conflicts:
	spec/models/user/invite_spec.rb
 2010-10-19 16:06:48 -07:00
ilya
24b136bbd9 Merge branch 'master' of github.com:diaspora/diaspora 2010-10-19 15:42:51 -07:00
ilya
4e9e716783 another attack vector spec 2010-10-19 15:42:40 -07:00
Alec Leamas
8dbd61f167 Point fix: error in diaspora-setup (x2) blocks build. 2010-10-19 23:39:22 +02:00
danielvincent
35a59d3982 Merge branch 'master' of github.com:diaspora/diaspora 2010-10-19 14:07:09 -07:00
Raphael
ea36790e21 Add gzipped source.tar to gitignore 2010-10-19 14:06:57 -07:00
danielvincent
0a4bf225d0 Merge branch 'master' of github.com:diaspora/diaspora 2010-10-19 14:06:51 -07:00
danielvincent
b218a53bf7 fancyboxes have title bars now, kind of. 2010-10-19 14:06:44 -07:00
Alec Leamas
53fef63a9a linking 2010-10-19 22:53:38 +02:00
Raphael
d6f8fe106a Merge branch 'master' of github.com:diaspora/diaspora 2010-10-19 13:51:43 -07:00
Raphael
2c66bbbe00 Strip profile names, resolve 357 2010-10-19 13:51:31 -07:00
Alec Leamas
2cf2b5f8b7 Linking 2010-10-19 22:44:07 +02:00
Alec Leamas
0096fd11e5 LInking?! 2010-10-19 22:33:53 +02:00
Alec Leamas
10f6a6994c Docs... 2010-10-19 22:29:25 +02:00
Alec Leamas
a0c6c175f6 websocket service cleanup 
Complete implementation of the websocket service as a separate
SystemV service. Patch to websocket_server.rb to make it support
a pidfile. Complete rewrite of the /etc/init.d script for
ubuntu. Support in installation scripts.
 2010-10-19 22:15:47 +02:00
Alec Leamas
d738846900 Merge remote branch 'upstream/master' 2010-10-19 22:10:30 +02:00