maxwell
1de52d3ba2
fixed failing cucumber
2011-03-17 13:59:53 -07:00
maxwell
b987b47f5f
there is a job to process photos and it is called from the controller
2011-03-17 13:59:53 -07:00
maxwell
516b620148
gif and delayed processing wip
2011-03-17 13:59:53 -07:00
zhitomirskiyi
574a3b45b1
made it flash the sm on the profile page
2011-03-17 11:54:13 -07:00
MrZYX
a78710690a
moar translations
2011-03-17 15:11:24 +01:00
zhitomirskiyi
6a33ae7795
fixed the css, added a space
2011-03-16 19:20:24 -07:00
zhitomirskiyi
b0ec5a0b2e
moved the fixture to the right place
2011-03-16 18:10:50 -07:00
zhitomirskiyi
abbf949fe1
publishing from a person profile page wip
...
mentioning a person from their profile page, added js & jasmine, still need to add the mention style, and prevent deselecting the last one
a tiny sass add
publishing from the profile works, need js translation
added the translation
made the hover state consistant
need to fix the cucumber spec
specs are green need to add a button
added the buttion to mention people
moved the publisher to the facebox
fixed the cucumbers for the modal window
2011-03-16 16:35:30 -07:00
Raphael Sofaer
1b0445563e
Specs passing with text
2011-03-14 11:39:31 -07:00
maxwell
d91fda656c
Revert "js hack to see bigger version of photo thumbnails in the stream without being abnoxious"
...
This reverts commit ab997e2d21
2011-03-14 09:51:06 -07:00
maxwell
ab997e2d21
js hack to see bigger version of photo thumbnails in the stream without being abnoxious
2011-03-11 17:16:43 -08:00
danielgrippi
2cf0503310
put text below photo in stream
2011-03-10 15:28:44 -08:00
danielgrippi
1f3261b2ef
make photos larger in the stream
2011-03-10 15:17:41 -08:00
danielgrippi
1f5edb1d92
Merge branch 'private_messages'
...
Conflicts:
app/controllers/status_messages_controller.rb
app/models/data_point.rb
app/models/status_message.rb
db/schema.rb
lib/fake.rb
public/stylesheets/sass/application.sass
spec/models/mention_spec.rb
2011-03-08 21:23:41 -08:00
Raphael Sofaer
a45f46828a
re-enable commenting box on show page without comments, but it looks kind of ugly
2011-03-07 10:18:50 -08:00
Raphael Sofaer
da12954d22
Move statusmessage create view out to partial
2011-03-03 11:10:44 -08:00
danielvincent
21fd546cd0
posts now have authors instead of people
2011-03-01 18:05:05 -08:00
danielvincent
9fe0320881
added PrivateMessage and PrivateMessageVisibility models and migrations
2011-03-01 12:14:31 -08:00
danielvincent
164fe1c1b5
adjust column width, leading, serifs, etc. in stream for better readability.
2011-02-13 15:27:14 -08:00
danielvincent
8269e4b300
touched up photo show and status message show pages
2011-02-03 13:05:25 -08:00
maxwell
348ae0b61d
small hack to add some feedback when links are tapped on the mobile site.
2011-01-29 18:42:50 -08:00
danielvincent
b983746888
force all links to not be bold.
2011-01-24 12:22:17 -08:00
danielvincent
39c5189c1f
everything ported from pre-mysql mobile stuff. things missing: search page, aspect switcher, notification badge.
2011-01-24 12:22:17 -08:00
zhitomirskiyi
004094d66f
fixed the querying in the controllers got rid of hashes
2011-01-18 16:21:14 -08:00
danielvincent
055fbe3e00
stream is now a div. generalized some partial extentions for mobile site.
2011-01-01 23:09:18 -05:00
danielvincent
7827968b52
removing <p> from statusmessage partial
2010-12-25 19:18:42 -05:00
danielvincent
9b6d40544c
fixed _comments bug on show pages
2010-12-21 17:36:14 -08:00
danielvincent
a6c5f420fa
giving more pixels to photos on their show pages
2010-12-21 12:39:37 -08:00
danielvincent
6c12a4c562
photo show page shows more photo.
2010-12-19 21:53:57 -08:00
maxwell
2bc849fa90
only show permalink if the post is infact public. also, make destroy delete
2010-12-13 18:45:54 -08:00
MrZYX
b84b6ea9e4
some fixes to translations
2010-12-05 16:02:52 +01:00
danielvincent
30668bf2e6
visual touchups
2010-12-02 23:19:30 -08:00
maxwell
38d9d75162
posts now have public permalinks
2010-12-02 18:47:48 -08:00
Sarah Mei
967fcd9a52
Revert "Added genderized variants of t() to views, controllers and helpers."
...
This reverts commit 017251fef9
2010-12-01 22:29:24 -08:00
Paweł Wilk
017251fef9
Added genderized variants of t() to views, controllers and helpers.
2010-12-01 18:19:48 +01:00
Raphael
fce428826c
Try to take photos query out of views
2010-11-29 23:41:03 -08:00
maxwell
2d3f2df1fd
dont use object_path
2010-11-29 19:57:20 -08:00
Raphael
7ca124c002
Refactor views to not be so dumb.
2010-11-27 21:27:27 -05:00
Raphael
7030ed0fed
Putting youtube titles back into status messages
2010-11-27 11:43:24 -05:00
danielvincent
06ff5923c5
fix photos#show and status_messages#show from previous commit
2010-11-27 01:35:57 -05:00
MrZYX
e72f4e1da7
translatable status is good again
...
made default aspects translatable
fix all the misssing translations I found
cleanup en.yml
2010-11-22 22:30:37 +01:00
danielvincent
c7ac90538a
added some spacing between photos and text on stream
2010-11-22 01:57:51 -08:00
danielvincent
108ac9fd7c
resolved stray h3 tag in stream
2010-11-22 01:31:21 -08:00
maxwell
5c2d161146
small changes to mobile
2010-11-22 01:19:11 -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
9b7d2ed0f6
DG MS; status messages can now have photos.
2010-11-21 16:13:01 -08:00
maxwell
fb0dc2db7e
added photos to status messages
2010-11-21 16:13:00 -08:00
danielvincent
2b54d9a0c5
adjusting more page structure. drafting about there.
2010-11-21 16:10:54 -08:00
Raphael
7db1da935a
Stream is a class
2010-11-21 13:21:42 -05:00
maxwell
71da954a76
removing deletetion
2010-11-09 15:29:43 -08:00
maxwell
f7cc01ceb2
more work done. much more to go
2010-11-09 15:29:43 -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
danielvincent
1a481d43d2
Use _stream_element.haml as a wrapper for posts in the stream.
2010-11-05 17:40:28 -07:00
Raphael
a9b429d163
Merge remote branch 'ed0h/helper-method-for-markdown'
2010-11-02 12:14:41 -07:00
livefromthemoon@gmail.com
aab74cf1ff
Added markdown support for status messages
2010-11-02 03:55:14 +01:00
Hexagon
938d146405
Common translations are used without the namespace
2010-11-02 00:07:24 +01:00
danielvincent
2b4e3e3a41
a person now has a photos#index page.
2010-10-29 10:38:17 -07:00
danielvincent
7b3f6f66c1
removed second #stream declaration on status_message#show. fixed bug where show pages would get posts as well as comments.
2010-10-24 14:44:43 -07:00
danielvincent
ed4c253ea8
show pages now identify content with content creator. publisher now takes a local
2010-10-22 15:32:41 -07:00
danielvincent
8e175be2ba
fixed comments not showing up through websocket on photo show page
2010-10-20 23:40:48 -07:00
danielvincent
6d8b670150
changed show layouts for album and photos. still needs work.
2010-10-20 17:35:27 -07:00
danielvincent
d3d7131c8d
stream using data-guid for messages. view fix in photo show
2010-10-20 13:47:16 -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
danielvincent
ea00d35f1f
padding on stream fix. added add aspect button in aspect nav.
2010-10-19 12:10:22 -07:00
archi
035db98367
Added HTML links to posts
2010-10-17 02:06:46 +02:00
danielvincent
3a876770f3
minor tweaks
2010-10-08 00:36:55 -07:00
danielvincent
5b66a191cd
more stream tweaks
2010-10-07 23:25:49 -07:00
danielvincent
b314ee22ec
intermediate misc ui polish
2010-10-07 22:51:08 -07:00
Raphael
1fd3aeabd9
Add or later to license notice
2010-10-07 16:25:34 -07:00
danielvincent
e0159aaaeb
small visual tweaks
2010-09-28 12:58:34 -07:00
danielvincent
263615ad14
all status messages have labels
2010-09-27 23:51:20 -07:00
danielvincent
bf587be461
public indicator tag on status message partial.
2010-09-27 22:50:11 -07:00
Dorian
e792344c0e
Use improved whitespace:scrub_gratuitous_newlines
2010-09-26 12:52:39 -04:00
Dorian
6ffc03a4c9
Big clean up: delete trailing whitespace
2010-09-26 12:48:40 -04: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
474cf77708
DG IZ; reposting now works. redirects to a template missing page, though.
2010-09-22 15:05:51 -07:00
danielvincent
5ef32b7d55
DG IZ; a user can repost. aspects are not sent through the websocket. post does not show where it curently is going in its partial
2010-09-22 12:03:25 -07:00
ilya
1882509a0b
removed the auto_link seems to fix HTML injection, no more autolinking
2010-09-21 11:59:04 -07:00
danielvincent
4d200fea87
removed view all link from status_message#show
2010-09-20 20:17:18 -07:00
Raphael
441f75203a
Add autolink and sanitize to show page
2010-09-20 17:33:05 -07:00
danielvincent
14ad24ba7e
visual tweaks on header. moved upload a file button to header on album#show
2010-09-19 14:27:20 -07:00
Ariel Zavala
6a967e7fe9
Added localization to status message views
2010-09-16 15:47:12 -04:00
Raphael
708e9f88a5
Spell our own name right
2010-09-15 17:56:18 -07:00
Raphael
d9eb3abd9d
Merge branch 'master' of github.com:diaspora/diaspora
2010-09-15 10:59:00 -07:00
Raphael
aa3ebe372c
License notices replaced
2010-09-15 10:58:48 -07:00
Daniel Vincent Grippi
73dab4b3ef
fixed stream elements
2010-09-15 10:17:37 -07:00
Daniel Vincent Grippi
2fae1049d9
silent comments in all views except the layout and session wall
2010-09-13 15:11:14 -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
danielvincent
39551a0162
fixed comments not showing for photos in stream
2010-08-26 11:08:03 -07:00
Raphael
5779610659
messed with the views
2010-08-24 18:31:16 -07:00
Raphael
03abd1ac21
Remove statuS MESsages new page. TaKE New OUt OF ROutes
2010-08-24 14:44:32 -07:00
Raphael
599d1da620
Moved socket code out to lib, unsocketing from view should now work again
2010-08-11 12:03:26 -07:00
Raphael
d71966476b
Merge branch 'group-top' of github.com:diaspora/diaspora_rails into group-top
...
Conflicts:
app/views/albums/show.html.haml
app/views/authors/show.html.haml
app/views/layouts/application.html.haml
app/views/photos/show.html.haml
2010-08-09 15:09:05 -07:00
ilya
890f927492
removed references of mine? method in all views
2010-08-08 22:53:23 -07:00
danielvincent
6f1a596dff
small color changes
2010-08-06 00:40:44 -07:00
danielvincent
03e06cb279
person sidebar has a view all; displays user images with names in tooltips instead of text
2010-07-24 10:24:43 -07:00
danielvincent
79536dcfb7
all post partials now use object_path for links
2010-07-17 13:59:04 -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
danielvincent
04eb66b2e6
user has a image url field for user picture
2010-07-16 23:02:24 -07:00
maxwell
f97218c005
MS IZ cleanup of pubsub stuff
2010-07-15 10:24:41 -07:00
maxwell
900f1080a2
DG MS; fixed destroy links for status messages, added link for requests on top nav
2010-07-08 14:38:26 -07:00
maxwell
947f1a60e7
RS MS added url for for the socket controller
2010-07-07 18:59:32 -07:00
Raphael
fffd3aebfc
Added remote is true to stream partials, no more redirecting
2010-07-02 15:36:07 -07:00
Raphael
3d976ca47e
RS, a little bit of autolinking in statuses and comments
2010-06-30 08:36:51 -07:00
danielvincent
97cd3fb413
DG IZ; comment count in status message partial
2010-06-29 19:08:23 -07:00
danielvincent
8ff241cdde
DG IZ; all comments hidden by default. linking anchor issue.
2010-06-29 19:00:54 -07:00
danielvincent
5193a20458
DG IZ; getting there.
2010-06-29 14:34:33 -07:00
danielvincent
260805af64
DG IZ; publisher box & profile picture placeholder
2010-06-29 12:25:36 -07:00
maxwell
45a9d9e342
moved the silly destory link over a bit
2010-06-28 22:15:52 -07:00
maxwell
46ab63de36
added will pagination action.
2010-06-28 21:56:58 -07:00
maxwell
b6c6316886
trying to fix status message bug
2010-06-28 15:03:45 -07:00
ilya
a540f09109
RS, IZ; Added ids to views
2010-06-28 14:46:43 -04:00
Maxwell Salzberg
b804bdc220
forgot to take out a debug line. i kept comments in, but they prevent a new post to be sent from the database to the view. on refresh everything works. also moved comments to its own partial so we can add it to all posts
2010-06-26 15:40:33 -07:00
maxwell
ec01e2c016
Comments now working, but no AJAX, need to refresh to see them
2010-06-25 22:15:41 -07:00
maxwell
faa5d21636
Change the form_for not to need a message passed, and adding it to the home page
2010-06-25 19:58:40 -07:00
maxwell
e558d4833f
DG MS fixing tests
2010-06-24 20:45:49 -07:00
maxwell
9fa26f020e
DG MS; clicking on a person's name redirects to that person's post stream
2010-06-23 14:32:51 -07:00
maxwell
663b99924f
Merge branch 'master' of github.com:diaspora/diaspora_rails
2010-06-23 01:26:06 -07:00
maxwell
60fa7e3ac4
view stuffs
2010-06-23 01:26:00 -07:00
Maxwell Salzberg
523cb6f15f
DG; Post belongs to a Person, and a Person has many Posts. Also, added Person for real this time
2010-06-22 23:27:31 -07:00
maxwell
989949a8c9
added pretty (but dumb) update of sockets, and fixed some tests which broke as a result. needs better tests and the code is U G L Y
2010-06-22 15:14:55 -07:00
maxwell
3064d208eb
added firefox websocket stuffs, only loads if it is not safari or chrome
2010-06-22 14:31:16 -07:00
maxwell
f696ffc3a6
fixed up some views, but some stuff feels like it broke
2010-06-21 16:46:19 -07:00
danielvincent
06271d5821
added dumb partial switcher function in dashboard controller
2010-06-21 14:23:59 -07:00
danielvincent
26d675af11
some sass cleanup
2010-06-20 18:36:01 -07:00
danielvincent
aee5f7f04f
took out filler elements
2010-06-20 11:49:05 -07:00
danielvincent
df2b9d6ad4
more shuffling
2010-06-19 14:44:08 -07:00
danielvincent
0c392a0cce
moved nav to bottom header
2010-06-19 03:01:39 -07:00
danielvincent
d1630b6c45
shrink that header
2010-06-19 00:53:42 -07:00
danielvincent
1223011a4f
more semi-drastic changes.
2010-06-19 00:01:25 -07:00
danielvincent
d70cf5b7a7
DG RS; fixed newest messages bug in view. moved to helper.
2010-06-15 10:11:28 -07:00
maxwell
3eef53892c
DG MS; Dashboard shows the user's most recent update
2010-06-14 17:48:21 -07:00
maxwell
4532c39e93
DG MS; Status messages have owner field; defaults to user
2010-06-14 17:13:07 -07:00
maxwell
db44081186
MS IZ DG completed friends should be displayed on dashboard
2010-06-14 13:17:20 -07:00
maxwell
0ff541ba43
fixed the dumb autotest bug. by adding mocha, it seemed to work. also fixed a bug where authenticate is called to warden and a view IZ MS
2010-06-14 11:05:55 -07:00
maxwell
85e6eb2132
added stray local files
2010-06-13 21:22:52 -07:00
