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

1818 commits

Author SHA1 Message Date
danielvincent
8e175be2ba fixed comments not showing up through websocket on photo show page 2010-10-20 23:40:48 -07:00
ilya
84e19f833a Merge branch 'master' of github.com:diaspora/diaspora 2010-10-20 18:30:36 -07:00
ilya
30bae4f807 throws an alert if you try to remove person from the last aspect 2010-10-20 18:30:22 -07:00
danielvincent
a1830b5d40 Merge branch 'master' of github.com:diaspora/diaspora 2010-10-20 18:15:19 -07:00
danielvincent
e880a5a11f comment submit buttons show again. further changes to show pages. 2010-10-20 18:15:07 -07:00
maxwell
bc9c852e25 fixed translation showing en on person show page when the person had no posts 2010-10-20 17:52:07 -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
94a7a3c6ad IZ MS; deleted move_friends removed 2010-10-20 14:26:45 -07:00
danielvincent
d3d7131c8d stream using data-guid for messages. view fix in photo show 2010-10-20 13:47:16 -07:00
danielvincent
e9ced7b2e6 changing photo now updates all user images in page 2010-10-20 12:35:16 -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
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
Raphael
f97f63e2d1 Merge remote branch 'tristil/239-380-identity-error-handling' 2010-10-20 10:36:03 -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
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
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
Raphael
a01c1c7461 Remove remove_all_aspects without ill effect 2010-10-19 23:54:12 -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
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
Joseph Method
4b588ccefb Addresses [#380] and [#239] by handling the errors from bad identities 2010-10-19 23:44:43 -04: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
ilya
38e8af2300 better querying 2010-10-19 19:16:44 -07:00
ilya
e3ffd2ffe7 Merge branch 'master' of github.com:diaspora/diaspora 2010-10-19 18:26:06 -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
ilya
b31b2de6f5 MS IZ aspect add and delete for a person 2010-10-19 18:25:59 -07:00
Raphael
14a5eee41c Return if there is a failure to create a user 2010-10-19 17:29:22 -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