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

4183 commits

This branch
This branch
All branches
Author SHA1 Message Date
Raphael
f9919d1cce Not calling friend_users until it is needed takes a couple seconds off 2010-10-20 17:43:13 -07:00
Raphael
abf27bbfb2 Take unused models out of webhooks spec 2010-10-20 17:43:13 -07:00
Raphael
ff3666df5e Cut parser spec time by a couple seconds 2010-10-20 17:43:13 -07:00
ilya
bec1842bed redirects to the right place 2010-10-20 17:40:58 -07:00
danielvincent
183ac75c6a Merge branch 'master' of github.com:diaspora/diaspora 2010-10-20 17:35:35 -07:00
danielvincent
6d8b670150 changed show layouts for album and photos. still needs work. 2010-10-20 17:35:27 -07:00
ilya
6fa82490c9 remove friend from aspect box, with js call to remove the person from the aspect 2010-10-20 17:34:52 -07:00
ilya
ae7891194e added links to the aspects a person is in on the show page 2010-10-20 16:57:09 -07:00
ilya
554adeae69 MS IZ; querying through for person not in aspect is tested 2010-10-20 16:39:37 -07:00
ilya
6bee872039 moved the add people into a partial 2010-10-20 15:42:03 -07:00
ilya
62700387ad MS IZ added an add to aspect form on the request partial 2010-10-20 15:30:30 -07:00
ilya
0afe83b5e3 Merge branch 'master' of github.com:diaspora/diaspora 2010-10-20 14:52:30 -07:00
ilya
02c0bf3c43 fixed the seed script 2010-10-20 14:52:17 -07:00
danielvincent
e9fc086089 users name doesn't overflow in user menu 2010-10-20 14:45:01 -07:00
ilya
94a7a3c6ad IZ MS; deleted move_friends removed 2010-10-20 14:26:45 -07:00
danielvincent
f5caa5be40 Merge branch 'master' of github.com:diaspora/diaspora 2010-10-20 13:47:42 -07:00
danielvincent
d3d7131c8d stream using data-guid for messages. view fix in photo show 2010-10-20 13:47:16 -07:00
ilya
02f37c6156 Merge branch 'master' of github.com:diaspora/diaspora 
Conflicts:
	spec/controllers/aspects_controller_spec.rb
 2010-10-20 13:21:16 -07:00
ilya
8fddb4ecf5 MS IZ added test concerning people in multiple aspects 2010-10-20 13:19:32 -07:00
Alec Leamas
929fe05043 Merge remote branch 'upstream/master' 2010-10-20 22:06:35 +02:00
Alec Leamas
03f637eca9 Polishing up after git mess... 2010-10-20 22:05:42 +02:00
danielvincent
675ebde5e6 Merge branch 'master' of github.com:diaspora/diaspora 2010-10-20 12:35:28 -07:00
danielvincent
e9ced7b2e6 changing photo now updates all user images in page 2010-10-20 12:35:16 -07:00
Raphael
fa55cca222 Merge branch 'master' of github.com:diaspora/diaspora 2010-10-20 12:30:01 -07:00
Raphael
4d81583533 Backfill spec on mass-assignment in aspect update 2010-10-20 12:29:36 -07:00
danielvincent
65ffe2ecdd Merge branch 'master' of github.com:diaspora/diaspora 2010-10-20 12:19:24 -07:00
danielvincent
61122b83d0 make profile button on photo show page. (removed clean hash on usercontroller) 2010-10-20 12:19:06 -07:00
Raphael
dfef8d0113 Merge branch 'master' of github.com:diaspora/diaspora 2010-10-20 12:15:36 -07:00
Raphael
9c8e514642 Adding a spec for a mass-assignment attack through profile update 2010-10-20 12:15:13 -07:00
Alec Leamas
3e0948d961 Polishing up after git mess... 2010-10-20 20:53:22 +02:00
ilya
e6de6179e9 MS IZ dependant destroy is back for aspects 2010-10-20 11:47:09 -07:00
ilya
992bd42b55 Merge branch 'master' of github.com:diaspora/diaspora 
Conflicts:
	spec/models/aspect_spec.rb
 2010-10-20 11:30:06 -07:00
ilya
ea1ab59c3a MS, IZ finished adding and removing people from aspects methods, refactored the move friend method 2010-10-20 11:28:56 -07:00
Raphael
961510a8ed Rename instantiate! to build, no more raising in build, no saving in build, no seeding of aspects in build. 2010-10-20 11:03:47 -07:00
danielvincent
98a8fbcfb6 request badge text color fix 2010-10-20 10:37:00 -07:00
Raphael
f97f63e2d1 Merge remote branch 'tristil/239-380-identity-error-handling' 2010-10-20 10:36:03 -07:00
Raphael
4986de2c33 Put reloads back in 2010-10-20 10:35:16 -07:00
Raphael
cfbdb94743 Merge branch 'master' of github.com:diaspora/diaspora 2010-10-20 10:28:20 -07:00
Raphael
0758f9245f Clean up specs a little, fix unfriending 2010-10-20 10:28:08 -07:00
danielvincent
e4d6e170e3 aspect tab no longer selected on user#edit and person#show, person#index 2010-10-20 10:22:29 -07:00
Raphael
1bd54aba63 Revert "Merge remote branch 'upstream/master'" 
This reverts commit 570d0cf104, reversing
changes made to 9da5399425.
 2010-10-20 09:52:23 -07:00
Raphael
951c513f39 Revert "socket server update: pidfile, ubuntu upstart, bugfixes" 
This reverts commit c08121e6eb.
 2010-10-20 09:52:12 -07:00
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
ilya
4d1ce410d7 Merge branch 'master' of github.com:diaspora/diaspora 2010-10-20 09:39:32 -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