Raphael
|
de3044fa0a
|
Remove publisher selection remnants, fix posting
|
2010-08-24 15:55:35 -07:00 |
|
danielvincent
|
c3cf135a3f
|
tabs on top
|
2010-08-24 11:33:20 -07:00 |
|
danielvincent
|
86146d195f
|
moving stuff around to the header
|
2010-08-24 11:07:39 -07:00 |
|
danielvincent
|
f9a19e679f
|
made header shorter
|
2010-08-23 15:27:34 -07:00 |
|
danielvincent
|
fb7e945fc2
|
removed useless if/else
|
2010-08-23 14:19:16 -07:00 |
|
danielvincent
|
60b7c30a8a
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-08-23 14:17:26 -07:00 |
|
danielvincent
|
d874ba3b38
|
dropdown menu for user
|
2010-08-23 14:17:05 -07:00 |
|
Raphael
|
5a02f92448
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-08-23 13:58:46 -07:00 |
|
danielvincent
|
d9c091d3f8
|
search box in top nav
|
2010-08-23 12:43:12 -07:00 |
|
Raphael
|
01dac4d173
|
Take tinymce out of layout
|
2010-08-23 11:56:06 -07:00 |
|
danielvincent
|
2d21ac0460
|
moving things around
|
2010-08-23 11:05:28 -07:00 |
|
maxwell
|
756278f498
|
MS added friend search, and allow for autodiscover
|
2010-08-19 12:37:34 -07:00 |
|
ilya
|
21f70c643d
|
DG IZ; moved update_profile from Person into User. removed notify_people methods. temporarily broke album pushing
|
2010-08-18 16:15:10 -07:00 |
|
danielvincent
|
c81ea5a632
|
minor changes
|
2010-08-14 00:21:10 -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
|
a201390123
|
DG, RS; Added fancybox, made the contextual panes fancyboxes, photo adding is all broken
|
2010-08-10 17:59:22 -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
|
838fec4921
|
RS, DG; Working on group nav, fixed some stuff in photo
|
2010-08-09 16:34:06 -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
|
8e6dfe7166
|
DG IZ having an email key makes devise work, ring to deploy
|
2010-08-08 17:00:39 -07:00 |
|
Raphael
|
58addca8dd
|
RS, IZ; extracted and murdered ostatus.
|
2010-08-04 16:00:01 -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
|
a636d97837
|
Removed crash if there was no latest status message
|
2010-07-29 14:38:46 -07:00 |
|
maxwell
|
7a0db375ab
|
MS added rails 3rc
|
2010-07-29 09:59:03 -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 |
|
maxwell
|
eb4262dfc7
|
MS merged master
|
2010-07-28 11:13:17 -07:00 |
|
danielvincent
|
e2b5af35c1
|
minute changes
|
2010-07-28 00:04:43 -07:00 |
|
maxwell
|
3cecbf1511
|
MS profile page fixes
|
2010-07-27 15:52:42 -07:00 |
|
maxwell
|
9dd5c08296
|
fixed two small UI bugs
|
2010-07-27 14:45:04 -07:00 |
|
danielvincent
|
dbc8f0112e
|
some misc design cleanup. album page toggle pending.
|
2010-07-27 12:12:25 -07:00 |
|
danielvincent
|
36abb19e2c
|
added the uploading photo wjava script
|
2010-07-26 15:50:41 -07:00 |
|
maxwell
|
416f128ba8
|
MS pushing code around into seperate files for clairty, many specs moved around to much more sane names. i still need to break out diaspora generator out of webhooks module
|
2010-07-24 15:48:42 -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
|
4c3a51833f
|
user name is bigger
|
2010-07-23 22:35:12 -07:00 |
|
danielvincent
|
4d2b11310b
|
nudged layout
|
2010-07-23 21:34:47 -07:00 |
|
danielvincent
|
e5d298040d
|
little things
|
2010-07-23 21:11:21 -07:00 |
|
danielvincent
|
f6fd6bc9e6
|
added breadcrumb to albums
|
2010-07-23 20:28:10 -07:00 |
|
danielvincent
|
d93c331615
|
moved publisher
|
2010-07-23 20:12:28 -07:00 |
|
danielvincent
|
ad61c290fb
|
took current user's name out of the layout
|
2010-07-23 19:44:34 -07:00 |
|
maxwell
|
21bd875a3f
|
MS DG request bar fix, and some other small tweaks
|
2010-07-21 16:38:33 -07:00 |
|
danielvincent
|
c01e9846cf
|
began album index page. added a larger thumbnail on image upload. also, there is one HUGE memory leak somewhere
|
2010-07-21 00:24:11 -07:00 |
|
ilya
|
7901791ee3
|
DG IZ; added simple image picker for edit profile page. currently displays all images uploaded.
|
2010-07-20 11:50:36 -07:00 |
|
danielvincent
|
55710ffbdb
|
image uploader does two thumbnails
|
2010-07-17 21:10:21 -07:00 |
|