Raphael
|
4308f35b4b
|
Changed partial on request index
|
2010-08-10 10:18:16 -07:00 |
|
Raphael
|
d1bedeb993
|
RS, DG; don't show the group-specific nav if there is no group
|
2010-08-10 10:11:13 -07:00 |
|
danielvincent
|
4e062c143b
|
new album partial has a title. album title is in italics in new photo partial
|
2010-08-09 21:29:19 -07:00 |
|
danielvincent
|
d207c8b955
|
fixed way too high z-index in album div
|
2010-08-09 21:27:17 -07:00 |
|
danielvincent
|
988eea4215
|
fixed comment view bug
|
2010-08-09 21:21:35 -07:00 |
|
danielvincent
|
96fa34ea60
|
changed the pop-up boxes. going to probably switch to fancybox jquery plugin... also, fixed the user page so viewing it doesn't throw an error.
|
2010-08-09 21:10:11 -07:00 |
|
danielvincent
|
fd8d92a095
|
moved next/prev links in photo show to be inline with full size link.
|
2010-08-09 20:23:01 -07:00 |
|
danielvincent
|
d712218a14
|
removed commented out stuff on photo_new partial. also, fixed the delete button in photo show.
|
2010-08-09 20:18:20 -07:00 |
|
danielvincent
|
acd00c2a59
|
fixed top right buttons on album page, etc. also, made the image loader simpler.
|
2010-08-09 20:14:03 -07:00 |
|
Raphael
|
91b42ac0e2
|
Specs now mostly pass again, one is failing
|
2010-08-09 18:06:09 -07:00 |
|
Raphael
|
744693e7fb
|
RS, DG; There is now a add friend box on the front page that passes group idto the app
|
2010-08-09 17:33:54 -07:00 |
|
Raphael
|
838fec4921
|
RS, DG; Working on group nav, fixed some stuff in photo
|
2010-08-09 16:34:06 -07:00 |
|
Raphael
|
aebe7b97c0
|
DG RS; added groups. can't delete, but can make new ones
|
2010-08-09 15:58:53 -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 |
|
Raphael
|
33a827c33a
|
RS, DG; Websocket is now working again, users have a channel
|
2010-08-09 13:02:08 -07:00 |
|
ilya
|
890f927492
|
removed references of mine? method in all views
|
2010-08-08 22:53:23 -07:00 |
|
ilya
|
8e6dfe7166
|
DG IZ having an email key makes devise work, ring to deploy
|
2010-08-08 17:00:39 -07:00 |
|
danielvincent
|
a6f5603dc9
|
added email field to login screen. strange error won't let me log in?
|
2010-08-06 23:55:05 -07:00 |
|
danielvincent
|
6f1a596dff
|
small color changes
|
2010-08-06 00:40:44 -07:00 |
|
danielvincent
|
c54d47337b
|
updated button style
|
2010-08-06 00:15:22 -07:00 |
|
Raphael
|
e2c0ae2cee
|
Merge branch 'master' of github.com:diaspora/diaspora_rails
|
2010-08-04 16:01:37 -07:00 |
|
Raphael
|
c245d8c60c
|
Merging ostatus deletion with selenium start
|
2010-08-04 16:01:19 -07:00 |
|
danielvincent
|
75663b2447
|
DG MS; user can edit photo caption. also, photos have captions.
|
2010-08-04 16:00:59 -07:00 |
|
Raphael
|
58addca8dd
|
RS, IZ; extracted and murdered ostatus.
|
2010-08-04 16:00:01 -07:00 |
|
danielvincent
|
09958bc207
|
DG MS; removed delete friend button from current user's show page
|
2010-08-04 15:43:24 -07:00 |
|
danielvincent
|
3d5f27fe5a
|
javascript gets group param for temp testing... friend pictures on group nav displays all people and authors, also for testing
|
2010-08-02 17:27:45 -07:00 |
|
danielvincent
|
102b912878
|
moved group nav to its own partial
|
2010-08-02 16:20:30 -07:00 |
|
danielvincent
|
3e5cecd532
|
Merge branch 'master' into group-top
Conflicts:
public/stylesheets/application.css
public/stylesheets/sass/application.sass
|
2010-08-02 16:09:13 -07:00 |
|
Raphael
|
d503c6541f
|
RS; posted statuses now use the websocket to update latest, time is now styled right
|
2010-08-02 11:13:21 -07:00 |
|
danielvincent
|
5974bf3571
|
group nav is now links to nothing
|
2010-08-01 23:26:24 -07:00 |
|
danielvincent
|
19b633d3a3
|
top nav for groups partially there.
|
2010-08-01 22:26:56 -07:00 |
|
Raphael
|
6fe00982f2
|
RS, IZ, fixing another error on person show
|
2010-07-30 10:32:36 -07:00 |
|
Raphael
|
0fd35709b1
|
RS, IZ, fixing error on person show with no posts
|
2010-07-30 10:26:00 -07:00 |
|
Raphael
|
e7ef3c06ed
|
Websocketed photos now fade in
|
2010-07-30 10:20:50 -07:00 |
|
ilya
|
27bf29119d
|
restoring display inline
|
2010-07-29 18:03:18 -07:00 |
|
ilya
|
085ea0a665
|
RS, IZ, DG Removing display inline
|
2010-07-29 17:59:44 -07:00 |
|
ilya
|
f6495e2bec
|
RS IZ photos now fade in on the album upload page
|
2010-07-29 17:26:05 -07:00 |
|
Raphael
|
a636d97837
|
Removed crash if there was no latest status message
|
2010-07-29 14:38:46 -07:00 |
|
danielvincent
|
fd4475370d
|
added profile url to author show page
|
2010-07-29 10:30:24 -07:00 |
|
maxwell
|
cb3d6db9b0
|
Merge branch 'master' of github.com:diaspora/diaspora_rails
|
2010-07-29 10:06:11 -07:00 |
|
maxwell
|
7a0db375ab
|
MS added rails 3rc
|
2010-07-29 09:59:03 -07:00 |
|
ilya
|
c8b40001e5
|
IZ album edit page was not added
|
2010-07-28 21:10:35 -07:00 |
|
ilya
|
96a9c9455d
|
DG IZ; make photos in stream larger, because they need love too
|
2010-07-28 17:46:43 -07:00 |
|
ilya
|
6f3e7bc78b
|
DG IZ; minor tweaks
|
2010-07-28 17:31:05 -07:00 |
|
ilya
|
03cf61bd7c
|
new user top bar
|
2010-07-28 17:04:56 -07:00 |
|
ilya
|
1700ce8e18
|
DG IZ; tweaks to album index page
|
2010-07-28 16:12:49 -07:00 |
|
ilya
|
3f27e1f67d
|
DG IZ photo spacing now works
|
2010-07-28 14:48:28 -07:00 |
|
ilya
|
5723d91dae
|
DG IZ; moved some buttons around, added album edit page
|
2010-07-28 14:00:02 -07:00 |
|
ilya
|
9e3c6a0936
|
DG IZ; brushed up ostatus user page
|
2010-07-28 12:13:36 -07:00 |
|
maxwell
|
eb4262dfc7
|
MS merged master
|
2010-07-28 11:13:17 -07:00 |
|