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 |
|