danielvincent
|
18cd4b858a
|
broke out group index and show
|
2010-08-14 00:27:43 -07:00 |
|
danielvincent
|
c81ea5a632
|
minor changes
|
2010-08-14 00:21:10 -07:00 |
|
danielvincent
|
a7eab9e50c
|
minor section header tweaks (album stuff)
|
2010-08-13 23:20:39 -07:00 |
|
danielvincent
|
f7e43ee3d0
|
photo fancybox indicates progress. unfortunately, it doesn't reset after you close it right now...
|
2010-08-12 00:27:26 -07:00 |
|
danielvincent
|
013a6d0849
|
add photo is now in a fancy-pancy box
|
2010-08-11 20:45:57 -07:00 |
|
danielvincent
|
97b04fc0d7
|
nevermind
|
2010-08-11 20:12:10 -07:00 |
|
danielvincent
|
3e1081acaa
|
commented out tinyMCE js for the time being
|
2010-08-11 20:09:16 -07:00 |
|
Raphael
|
eb36190188
|
DG, RS; Albums create failure prettier
|
2010-08-11 18:13:23 -07:00 |
|
Raphael
|
144d673dac
|
DG, RS; album button looks better
|
2010-08-11 17:16:20 -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
|
355aba75df
|
RS, DG; removing the last link_to_person
|
2010-08-11 10:02:45 -07:00 |
|
Raphael
|
cc070ba168
|
RS, DG; Removed fancybox gone mad from photo adder
|
2010-08-10 18:08:27 -07:00 |
|
Raphael
|
a201390123
|
DG, RS; Added fancybox, made the contextual panes fancyboxes, photo adding is all broken
|
2010-08-10 17:59:22 -07:00 |
|
Raphael
|
bd7ce5250f
|
renamed the route for signup. also, removed the link from the login page: get_to_the_choppa
|
2010-08-10 17:14:58 -07:00 |
|
Raphael
|
37bf5b45f1
|
RS, DG; You now can't open the photo upload form while photos are uploading
|
2010-08-10 16:56:19 -07:00 |
|
Raphael
|
3104eeebc9
|
RS, DG; Photo websocket margins fixed
|
2010-08-10 16:40:25 -07:00 |
|
Raphael
|
a9ebe44b1d
|
Merge branch 'friend-refactor' of github.com:diaspora/diaspora_rails into friend-refactor
|
2010-08-10 16:03:54 -07:00 |
|
Raphael
|
0fb55be7a0
|
RS, DG; You can now sign up to be a user on a seed
|
2010-08-10 16:03:38 -07:00 |
|
maxwell
|
016c8fa471
|
MS IZ taking out URL options in sockets helper. hopefully the websocket doesnt blow up
|
2010-08-10 14:11:41 -07:00 |
|
maxwell
|
b5f962c725
|
trying root path in host meta
|
2010-08-10 13:58:17 -07:00 |
|
maxwell
|
0ffe893f8a
|
MS IZ merging diffs
|
2010-08-10 12:37:04 -07:00 |
|
maxwell
|
71612ba33d
|
changing some webfinger resources
|
2010-08-10 12:36:00 -07:00 |
|
Raphael
|
9947a2abb8
|
RS, DG; latest_status thing now works, started putting signup back in
|
2010-08-10 12:26:43 -07:00 |
|
Raphael
|
a48fbaaf59
|
RS, DG; DashboardsController has been eliminated.
|
2010-08-10 11:36:00 -07:00 |
|
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 |
|