danielvincent
|
ce63e13eca
|
aspect ids normalized to posts to minimize queries on views.
|
2010-11-26 18:55:06 -05:00 |
|
danielvincent
|
d7609ef647
|
fixed issue with photos#index not recognizing an already sent request.
|
2010-11-23 21:03:35 -08:00 |
|
danielvincent
|
55952d00c0
|
fixed failing photoscontroller spec.
|
2010-11-21 22:58:24 -08:00 |
|
danielvincent
|
752d50a6a9
|
editing captions on photos uses remote forms. removed photo in album from WSR.
|
2010-11-21 19:51:20 -08:00 |
|
danielvincent
|
069b372c19
|
photo show links to original post and siblings. status message shows all photos associated with it. youtube player makes http/s call instead of just http.
|
2010-11-21 16:30:47 -08:00 |
|
maxwell
|
7fb751b00c
|
making photo uploader work better
|
2010-11-21 16:11:55 -08:00 |
|
maxwell
|
7d6be51cfb
|
making photos#show be in no aspect
|
2010-11-08 17:53:47 -08:00 |
|
maxwell
|
2162a2e3f9
|
collapse person's photos and status message into their profile; also, made these nested on a person
|
2010-11-08 15:55:58 -08:00 |
|
maxwell
|
4d2820e31c
|
MS RS fixed photo show bug
|
2010-11-08 14:05:01 -08:00 |
|
danielvincent
|
82c82b8ccc
|
killed albums
|
2010-11-04 10:17:19 -07:00 |
|
zhitomirskiyi
|
8246882067
|
MS IZ fixed some permissions in photo controller
|
2010-11-03 16:42:33 -07:00 |
|
zhitomirskiyi
|
3578daa14e
|
IZ MS more photo controller specs
|
2010-11-03 12:21:32 -07:00 |
|
Raphael
|
c8a8849518
|
Move to build_post and dispatch_post in most controllers
|
2010-11-03 09:30:41 -07:00 |
|
danielvincent
|
4776f4810e
|
fixed failing spec for photos_controller#edit
|
2010-10-29 10:38:53 -07:00 |
|
danielvincent
|
a7df1bca68
|
photos do not require an album. uploading files on a user's photos#index page will post to all aspects.
|
2010-10-29 10:38:17 -07:00 |
|
danielvincent
|
2b4e3e3a41
|
a person now has a photos#index page.
|
2010-10-29 10:38:17 -07:00 |
|
Sarah Mei
|
14fedf5369
|
GAHHH STOP EMAILING ME (specs pass)
Also, added attr_protected to Photo#person and Photo#person_id.
|
2010-10-29 00:59:26 -07:00 |
|
Raphael
|
78acdb7368
|
Pushing broken photo controller spec for dan to fix
|
2010-10-28 16:19:18 -07:00 |
|
danielvincent
|
9162a4a168
|
DG MS; 404 show pages for objects that don't exist for given user
|
2010-10-11 11:32:20 -07:00 |
|
Raphael
|
1fd3aeabd9
|
Add or later to license notice
|
2010-10-07 16:25:34 -07:00 |
|
danielvincent
|
aed9125e93
|
more querying through the current_user in controllers
|
2010-10-05 12:41:41 -07:00 |
|
Stephen Caudill
|
536cea5e44
|
Remove consecutive empty lines
|
2010-09-25 12:06:39 -04:00 |
|
Raphael
|
999d229225
|
Post photos in either 1.8.7 or 1.9.2
|
2010-09-24 15:18:30 -07:00 |
|
Raphael
|
950c6a7cab
|
Merge branch '1.9.2' into HEAD
Conflicts:
app/models/photo.rb
|
2010-09-24 14:36:00 -07:00 |
|
Raphael
|
2489f8503f
|
Merge branch 'master' into HEAD
Conflicts:
app/controllers/albums_controller.rb
app/controllers/aspects_controller.rb
app/controllers/photos_controller.rb
app/controllers/registrations_controller.rb
app/controllers/requests_controller.rb
app/helpers/dashboards_helper.rb
app/views/albums/show.html.haml
app/views/aspects/manage.html.haml
app/views/shared/_aspect_nav.haml
app/views/shared/_sub_header.haml
app/views/status_messages/_status_message.html.haml
app/views/status_messages/show.html.haml
config/locales/de.yml
config/locales/en.yml
config/locales/es.yml
config/locales/fr.yml
|
2010-09-22 21:32:03 -07:00 |
|
danielvincent
|
e9d16cc09b
|
DG IZ; cleanup
|
2010-09-22 15:48:50 -07:00 |
|
danielvincent
|
6dd7911c8c
|
DG IZ; update_or_repost
|
2010-09-22 10:52:29 -07:00 |
|
ilya
|
efd901dcd9
|
RS, IZ; Pod url moved to app_config.yml, app_config.yml refactored, diaspora_handle now set based on APP_CONFIG
|
2010-09-21 15:46:57 -07:00 |
|
danielvincent
|
4fe4326ed1
|
DG IZ photo uploading now works
|
2010-09-20 15:00:02 -07:00 |
|
danielvincent
|
af9cda52af
|
DG IZ; always query through the current_user in the controllers.
|
2010-09-20 13:18:11 -07:00 |
|
danielvincent
|
fe306b37ab
|
DG IZ; mass-assignment quick-fix in controllers
|
2010-09-20 11:30:27 -07:00 |
|
Aria Stewart
|
45b6ff53f1
|
Ruby 1.9 fixes
|
2010-09-18 16:35:48 -06:00 |
|
Ariel Zavala
|
4558f9901e
|
Added translations to photos and registrations controllers
|
2010-09-17 18:25:36 -04:00 |
|
Jamie Wilkinson
|
fbdd50172d
|
Cleanup stray whitespace
|
2010-09-16 10:07:59 +08:00 |
|
Raphael
|
708e9f88a5
|
Spell our own name right
|
2010-09-15 17:56:18 -07:00 |
|
Raphael
|
aa3ebe372c
|
License notices replaced
|
2010-09-15 10:58:48 -07:00 |
|
Daniel Vincent Grippi
|
26e4e088d7
|
flash messages are now being set.
|
2010-09-13 15:44:26 -07:00 |
|
Daniel Vincent Grippi
|
40ecf176e8
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-09-13 14:26:15 -07:00 |
|
Daniel Vincent Grippi
|
4c15b1a01c
|
added license to every single goddamn file. also, put one in the root dir.
|
2010-09-13 14:23:50 -07:00 |
|
maxwell
|
24d957cb32
|
MS IZ removed the views and redirected the edit route
|
2010-09-13 12:20:47 -07:00 |
|
Daniel Vincent Grippi
|
20d9334ce1
|
DG IZ; changed the photo uploader to drag and drop. now works in firefox.
|
2010-09-07 17:20:48 -07:00 |
|
Daniel Vincent Grippi
|
41afd86fe7
|
DG IZ; fixed photos.
|
2010-09-07 12:03:43 -07:00 |
|
Daniel Grippi & Raphael Sofaer
|
7984756aa7
|
controller cleanup: using respond_to and respond_with.
|
2010-08-29 22:49:13 -07:00 |
|
Raphael
|
55c94c385c
|
fixed photos going through the websocket. added a spec to SocketsController
|
2010-08-25 16:08:44 -07:00 |
|
Raphael
|
ae6f0fdc51
|
new photo form now loads through ajax
|
2010-08-23 13:58:33 -07:00 |
|
Raphael
|
01dac4d173
|
Take tinymce out of layout
|
2010-08-23 11:56:06 -07:00 |
|
Raphael
|
683bb0dbef
|
Took out create redirects on ajaxy things, authenticating statusmessages
|
2010-08-11 10:52:01 -07:00 |
|
Raphael
|
a48fbaaf59
|
RS, DG; DashboardsController has been eliminated.
|
2010-08-10 11:36:00 -07:00 |
|
danielvincent
|
75663b2447
|
DG MS; user can edit photo caption. also, photos have captions.
|
2010-08-04 16:00:59 -07:00 |
|
Raphael
|
74691228d3
|
RS, IZ; All relevant controllers now create with user.post
|
2010-08-02 16:32:52 -07:00 |
|
maxwell
|
80db1132d1
|
Fixed the tests;
|
2010-07-28 16:50:38 -07:00 |
|
ilya
|
5723d91dae
|
DG IZ; moved some buttons around, added album edit page
|
2010-07-28 14:00:02 -07:00 |
|
danielvincent
|
36abb19e2c
|
added the uploading photo wjava script
|
2010-07-26 15:50:41 -07:00 |
|
ilya
|
8793709284
|
No file is now complained about in the view
|
2010-07-23 16:57:34 -07:00 |
|
ilya
|
1b32afc78f
|
Switching to Grid_FS, correctly
|
2010-07-23 14:53:12 -07:00 |
|
ilya
|
082274d0d7
|
RS IZ a nicer fail(notice) on wrong file format on upload
|
2010-07-23 11:59:04 -07:00 |
|
ilya
|
b90cb95c64
|
RS IZ the photo controller now uses instantiate
|
2010-07-22 11:41:00 -07:00 |
|
maxwell
|
695a93ddad
|
DG MS added basic album traversal
|
2010-07-21 14:29:58 -07:00 |
|
maxwell
|
301343ae01
|
DG MS added basic album support
|
2010-07-20 21:28:24 -07:00 |
|
Raphael
|
d8cbbcf6c8
|
Added photo file validation spec
|
2010-07-20 11:31:41 -07:00 |
|
danielvincent
|
c8c76ddab5
|
added auth_user back to photos controller
|
2010-07-17 14:08:18 -07:00 |
|
danielvincent
|
b221e19746
|
every post partial shows a user picture. a post's comments are displayed with a count in its show page
|
2010-07-17 13:41:54 -07:00 |
|
Raphael
|
fa46fb31f4
|
Added photos, profile editing
|
2010-07-16 17:26:06 -07:00 |
|
Raphael
|
9165ac413a
|
image uploading started
|
2010-07-16 12:31:24 -07:00 |
|