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

150 commits

Author SHA1 Message Date
Jonne Haß
e70e48d6ca some refactoring regarding the law of demeter 2012-09-23 19:33:19 +02:00
Dennis Collinson
426f0278f9 DG DC uploading a photo shows up in the stream 2012-03-27 14:52:51 -07:00
Dennis Collinson
1ec2b73d59 DG DC remotipartjarvascripts 2012-03-27 14:52:51 -07:00
danielgrippi
6dce04d2f5 callbax, yo 2012-03-27 14:52:51 -07:00
Dennis Collinson
37bf5c5aee REMOTIPART WIP 2012-03-27 14:52:51 -07:00
Dennis Collinson
9769dfb303 cukes passing 2012-02-23 17:24:19 -08:00
Florian Staudacher
082d5c9fd4 initial photo page functionality is back, featuring backbone and handlebars 2012-02-09 20:55:34 +01:00
Jonne Haß
e1658f8d8b switch PhotosController#index over to guid, fix #2729 2012-01-25 12:45:02 +01:00
Sarah Mei
ad27eaac3d Fix photo#show for non-logged-in user 2011-11-19 21:17:39 -08:00
Jonne Hass
b3142ac208 redirect to sign in page from photo#show on a private photo when user isn't signed in 2011-11-10 22:44:12 +01:00
Jonne Hass
10fa7ba024 fixed 500 on photos#show for private photos and logged out user 2011-11-10 19:31:00 +01:00
Pistos
14842c1b43 Merge remote-tracking branch 'johnedmonds/issue1144' 2011-11-06 22:21:53 -05:00
Sarah Mei
f9a9654c86 Allow non-logged-in users to see public photos 2011-11-03 22:07:48 -07:00
John Edmonds
b482d16622 Merge branch 'master' into issue1144 2011-10-22 14:39:03 -04:00
Manuel Schölling
bdeae54c6c Make Photos not inherit from Posts 2011-10-16 13:58:35 +02:00
John Edmonds
8d0f6699ae Move photo upload logic to file_handler. 2011-09-29 21:49:58 -04:00
John Edmonds
b999617dde Respond with HTML for Opera. 
If we don't respond with the content-type text/html, rails will return a 406 Not Acceptable.
 2011-09-25 12:01:44 -04:00
John Edmonds
5f906defc8 Directly use UploadedFile object if available. 
Opera doesn't support XHR file uploads and instead submits a regular form.
Thus, we are provided with an UploadedFile object which can be used instead of creating our own compatible object.
 2011-09-25 11:51:13 -04:00
danielgrippi
91e649977c MS DG update copyright 2011-09-14 11:23:12 -07:00
The Lambda Calculus
f8f1ef3f91 Refactored code so that the controller got thinner while the model become fatter [Finishes #1126] 2011-09-13 03:04:22 -04:00
Gonzalo Rodriguez
8dd05a5e5b Fixing method signature semantics 2011-09-03 03:36:38 -03:00
The Lambda Calculus
9d7b8d7f5d Have passing Cucumber tests [Finishes issue #1126] 2011-09-01 01:59:51 -04:00
The Lambda Calculus
98b71f92ab We now do a check on photo deletion to ensure that any associated status messages are also deleted if now empty [Issue #1126] 2011-09-01 01:59:51 -04:00
Raphael Sofaer
38a8962945 Fix 500 on photo destroy 2011-08-12 15:58:42 -07:00
Raphael Sofaer
caf26a5c64 Upgrade rails.js, add CSRF token manually in the photo uploader. 2011-07-21 17:49:33 -07:00
Raphael Sofaer
af6547815e Some view helper cleanup 2011-07-04 07:36:01 -07:00
Maxwell Salzberg
1f11e51a9b add object_aspect_ids to status_message controller 2011-06-16 15:59:03 -07:00
Maxwell Salzberg
41e8a32b28 tests for data methods 2011-06-16 15:47:16 -07:00
MrZYX
e201340bb2 Photo association on GUID 2/2: replace status_message_id with status_message_guid 2011-05-27 18:56:24 +02:00
danielgrippi
7eaca0346c Merge branch 'master' into follow 
Conflicts:
	config/assets.yml
	public/stylesheets/sass/_mixins.scss
	spec/models/user/posting_spec.rb
 2011-05-16 14:56:28 -07:00
MrZYX
956f0044a9 set @contacts_of_contact_count in photos#index, thanks LPrelle 2011-05-16 16:21:13 +02:00
danielgrippi
60a60733df Merge branch 'master' into follow 
Conflicts:
	app/controllers/aspects_controller.rb
	app/controllers/contacts_controller.rb
	app/controllers/people_controller.rb
	app/controllers/photos_controller.rb
	app/controllers/tags_controller.rb
	app/helpers/notifications_helper.rb
	app/models/notifications/new_request.rb
	app/models/user_preference.rb
	public/javascripts/view.js
	spec/controllers/aspects_controller_spec.rb
	spec/controllers/contacts_controller_spec.rb
	spec/controllers/home_controller_spec.rb
	spec/controllers/post_visibilities_controller_spec.rb
	spec/controllers/requests_controller_spec.rb
	spec/mailers/notifier_spec.rb
	spec/models/user_spec.rb
 2011-05-12 15:49:51 -07:00
danielgrippi
3c82af49bf fixed cucumber with an exception of one step. added dropdowns to tag pages 2011-05-12 14:11:52 -07:00
Raphael Sofaer
71e77d59b3 Revert to including all helpers everywhere, because the rest of the team prefers it that way 2011-05-12 13:54:55 -07:00
MrZYX
3b7dd1906f fixed 500 on /people/:person_id/photos 2011-05-08 21:36:27 +02:00
danielgrippi
648a10e6d3 Merge branch 'master' into follow 
Conflicts:
	app/controllers/requests_controller.rb
	app/controllers/tags_controller.rb
	app/helpers/aspects_helper.rb
	app/views/notifications/index.html.haml
	config/routes.rb
	public/javascripts/aspect-edit.js
	public/javascripts/contact-list.js
	spec/integration/receiving_spec.rb
	spec/models/user/connecting_spec.rb
	spec/models/user/posting_spec.rb
 2011-05-04 11:35:35 -07:00
Raphael Sofaer
a5f297d7f7 Don't include every helper everywhere, re-organize helpers 2011-04-28 10:38:33 -07:00
danielgrippi
106ae983d5 Merge branch 'master' into follow. all specs green. 
Conflicts:
	app/controllers/application_controller.rb
	app/controllers/people_controller.rb
	app/models/person.rb
	config/assets.yml
	db/schema.rb
	public/javascripts/aspect-edit.js
	spec/controllers/aspects_controller_spec.rb
	spec/models/user/querying_spec.rb
	spec/spec_helper.rb
 2011-04-11 17:48:37 -07:00
MrZYX
e91c153257 fixed #1013 thanks jbivins 2011-04-11 17:08:36 +02:00
danielgrippi
4f972a23f6 drop requests table wip 2011-04-06 19:01:41 -07:00
Raphael Sofaer
e3ad078ba5 Scope querying in PhotosController#show 2011-03-30 16:40:01 -07:00
Raphael Sofaer
8c9a7e1c41 Fix PhotosController#show 2011-03-30 15:43:44 -07:00
danielgrippi
b3cb8e0a2b temp fix for pagination. photos index fix 2011-03-29 18:55:00 -07:00
danielgrippi
97d8b34599 Fix all specs, add foreign key constraints on post_visibility 2011-03-29 17:31:56 -07:00
Raphael Sofaer
fef226156c Update controllers to use User#retract, change Relayable#relayable to Relayable#relayable? 2011-03-25 16:09:37 -07:00
MrZYX
1b1a23aa8f likes/dislikes WIP TODO: better icons, better styling, integration on photo show page 2011-03-20 18:10:58 +01:00
maxwell
14ff1e0143 ms dg improved styling, fixed delete 2011-03-17 13:59:53 -07:00
maxwell
61bffb50d6 remove puts from photoscontroller 2011-03-17 13:59:53 -07:00
maxwell
516b620148 gif and delayed processing wip 2011-03-17 13:59:53 -07:00
danielvincent
21fd546cd0 posts now have authors instead of people 2011-03-01 18:05:05 -08:00