Raphael
|
ae6f0fdc51
|
new photo form now loads through ajax
|
2010-08-23 13:58:33 -07:00 |
|
danielvincent
|
d9c091d3f8
|
search box in top nav
|
2010-08-23 12:43:12 -07:00 |
|
Raphael
|
9ef2008613
|
Remove tinymce init block
|
2010-08-23 11:59:58 -07:00 |
|
danielvincent
|
2d21ac0460
|
moving things around
|
2010-08-23 11:05:28 -07:00 |
|
maxwell
|
361adda6cd
|
added group picker. sends the right params, but posts only have one group right now so thats a bummer
|
2010-08-22 22:20: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 |
|
ilya
|
a7a9a98737
|
DG IZ; forgot to add image for add friend button
|
2010-08-18 12:28:15 -07:00 |
|
ilya
|
f5811df5b7
|
DG IZ; added info text to add new friend button
|
2010-08-18 11:59:20 -07:00 |
|
ilya
|
6c729b382f
|
fixed some color on the header
|
2010-08-17 21:50:18 -07:00 |
|
Raphael
|
08de5caf97
|
make signup page look better
|
2010-08-17 17:20:29 -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 |
|
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
|
9947a2abb8
|
RS, DG; latest_status thing now works, started putting signup back in
|
2010-08-10 12:26:43 -07:00 |
|
danielvincent
|
d207c8b955
|
fixed way too high z-index in album div
|
2010-08-09 21:27:17 -07:00 |
|
danielvincent
|
36e3cff1b6
|
resized default user picture to a square and compressed it.
|
2010-08-09 21:16:43 -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
|
acd00c2a59
|
fixed top right buttons on album page, etc. also, made the image loader simpler.
|
2010-08-09 20:14:03 -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 |
|
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
|
b74438a5dc
|
Made comments a little easier to see, especially on photo show page
|
2010-08-04 18:12:12 -07:00 |
|
danielvincent
|
75663b2447
|
DG MS; user can edit photo caption. also, photos have captions.
|
2010-08-04 16:00:59 -07:00 |
|
danielvincent
|
7afe8e12a0
|
DG MS; correctly aligned publisher box submit button
|
2010-08-04 15:39:19 -07:00 |
|
Raphael
|
8abdcf292e
|
Hamiltom picture
|
2010-08-04 15:22:45 -07:00 |
|
danielvincent
|
f3bc651359
|
stuff fades
|
2010-08-02 19:16:01 -07:00 |
|
danielvincent
|
5030fbb8b5
|
Merge branch 'master' into group-top
|
2010-08-02 17:28:17 -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 |
|
Raphael
|
74691228d3
|
RS, IZ; All relevant controllers now create with user.post
|
2010-08-02 16:32:52 -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
|
8658276385
|
Post button back, but needs moving, did latest_message css change in sass
|
2010-08-02 11:21:48 -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
|
dc1a164b67
|
Removing unused function
|
2010-07-30 12:42:39 -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 |
|
ilya
|
1700ce8e18
|
DG IZ; tweaks to album index page
|
2010-07-28 16:12:49 -07:00 |
|
ilya
|
b5b8e29d6a
|
DG IZ album view page brush up
|
2010-07-28 15:33:27 -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 |
|
maxwell
|
75fd69bc67
|
MS; pushing weirdy buble thing
|
2010-07-28 11:14:27 -07:00 |
|
maxwell
|
eb4262dfc7
|
MS merged master
|
2010-07-28 11:13:17 -07:00 |
|
danielvincent
|
ef0a2c465d
|
fixed photo show comment picture bug
|
2010-07-28 10:06:20 -07:00 |
|
danielvincent
|
e2b5af35c1
|
minute changes
|
2010-07-28 00:04:43 -07:00 |
|
danielvincent
|
d710ff6f4a
|
shadows on album titles on album/index
|
2010-07-27 23:08:43 -07:00 |
|
maxwell
|
a57727c1fc
|
Merge branch 'master' of github.com:diaspora/diaspora_rails
|
2010-07-27 16:18:59 -07:00 |
|
maxwell
|
c41dea1e8b
|
MS small profile tweaks
|
2010-07-27 16:18:46 -07:00 |
|
danielvincent
|
7992b1b0e0
|
delete photo button on photo show page instead of delete album.
|
2010-07-27 16:10:42 -07:00 |
|
danielvincent
|
e6d2f51675
|
more visual recovery
|
2010-07-27 16:08:28 -07:00 |
|
danielvincent
|
fdd1a5d93b
|
more recovery
|
2010-07-27 16:04:59 -07:00 |
|
maxwell
|
92cc48beaf
|
Merge branch 'master' of github.com:diaspora/diaspora_rails
|
2010-07-27 15:52:50 -07:00 |
|
maxwell
|
3cecbf1511
|
MS profile page fixes
|
2010-07-27 15:52:42 -07:00 |
|
danielvincent
|
34291340b2
|
trying to get back up to speed
|
2010-07-27 15:50:44 -07:00 |
|
maxwell
|
86e090bac3
|
MS figured out moz gradient business
|
2010-07-27 14:34:16 -07:00 |
|
maxwell
|
9c7b3f0c07
|
Merge branch 'master' of github.com:diaspora/diaspora_rails
|
2010-07-27 14:23:44 -07:00 |
|
maxwell
|
bdca2348a6
|
MS IZ profile page has more useful info, but ultimatly kinda ugly
|
2010-07-27 14:23:31 -07:00 |
|
danielvincent
|
9b0206df1b
|
forgot to add ui stylesheet
|
2010-07-27 12:36:05 -07:00 |
|
danielvincent
|
d4ac19e9ce
|
all form buttons are now using button definition in UI
|
2010-07-27 12:23:21 -07:00 |
|
danielvincent
|
dbc8f0112e
|
some misc design cleanup. album page toggle pending.
|
2010-07-27 12:12:25 -07:00 |
|
danielvincent
|
97daaf81c2
|
made custom css3 buttons (pending FF compatability; works in webkit for now.)
|
2010-07-26 21:48:02 -07:00 |
|
maxwell
|
d73d36f162
|
MS i had broke atom generation in my refactor. now it is fixed
|
2010-07-26 17:39:48 -07:00 |
|
danielvincent
|
9afb8beb25
|
Merge branch 'master' of github.com:diaspora/diaspora_rails
|
2010-07-26 17:04:00 -07:00 |
|
danielvincent
|
ec59b89e83
|
DG IZ; few changes to uploader. added prefetching to photo prev/next links on photo show page
|
2010-07-26 16:57:44 -07:00 |
|
maxwell
|
a9b1954ff6
|
MS status message now updates the big one on the index page...hooray for jquery
|
2010-07-26 16:27:10 -07:00 |
|
danielvincent
|
087cf47b3f
|
DG IZ added the JS file
|
2010-07-26 15:51:30 -07:00 |
|
danielvincent
|
261a7d177d
|
fixed for real
|
2010-07-24 11:09:25 -07:00 |
|
danielvincent
|
9ad8e80982
|
fixed now?
|
2010-07-24 11:00:35 -07:00 |
|
danielvincent
|
1a51d99ad7
|
fixed sidebar?
|
2010-07-24 10:49:01 -07:00 |
|
danielvincent
|
eb15dcb4ce
|
fixed images on friend sidebar
|
2010-07-24 10:35:47 -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 |
|
maxwell
|
c9709dd1e7
|
MS put current status back on page
|
2010-07-24 01:39:15 -07:00 |
|
maxwell
|
8a174d37c7
|
MS trying a dan-like thing in the publisher
|
2010-07-23 23:56:41 -07:00 |
|
danielvincent
|
2646a52cbb
|
header padding fix
|
2010-07-23 22:40:23 -07:00 |
|
danielvincent
|
4c3a51833f
|
user name is bigger
|
2010-07-23 22:35:12 -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 |
|
maxwell
|
21bd875a3f
|
MS DG request bar fix, and some other small tweaks
|
2010-07-21 16:38:33 -07:00 |
|
maxwell
|
695a93ddad
|
DG MS added basic album traversal
|
2010-07-21 14:29:58 -07:00 |
|
danielvincent
|
aece0fc1c7
|
removed duplications used for testing
|
2010-07-21 00:32:38 -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 |
|
maxwell
|
301343ae01
|
DG MS added basic album support
|
2010-07-20 21:28:24 -07:00 |
|
ilya
|
2345975f22
|
DG IZ; fixed show photo always expanding to 100% width
|
2010-07-20 13:31:01 -07:00 |
|
ilya
|
715a6ae770
|
Merge branch 'master' of github.com:diaspora/diaspora_rails
|
2010-07-20 11:50:45 -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 |
|
maxwell
|
453d2ee827
|
RS MS fail. totally made a new bug and fixed it re: resizing
|
2010-07-20 11:50:23 -07:00 |
|
maxwell
|
e856945a94
|
RS MS photos are no longer ginormous, and also a small bug where photos were going to the status message show page.
|
2010-07-20 11:41:50 -07:00 |
|
ilya
|
e08ed8805f
|
DG IZ photo upload form now with all the others
|
2010-07-20 10:00:02 -07:00 |
|
danielvincent
|
04eb66b2e6
|
user has a image url field for user picture
|
2010-07-16 23:02:24 -07:00 |
|
Raphael
|
501620e9fb
|
DG RS; fixed some visual bugs. request link now turns red on new request
|
2010-07-15 18:40:55 -07:00 |
|
maxwell
|
3a785e24fd
|
removed old jquery ajax form thing we never used but made it into the repo
|
2010-07-10 10:42:38 -07:00 |
|
Raphael
|
d00798e982
|
added preventdefault to publisher
|
2010-07-06 11:49:54 -07:00 |
|
ilya
|
b1ca01edb4
|
DG IZ text boxes are round in firefox
|
2010-07-05 20:18:04 -04:00 |
|
ilya
|
e81412f240
|
fixed header shadows in firefox
|
2010-07-05 19:59:54 -04:00 |
|
danielvincent
|
b45a72f41b
|
Merge branch 'master' into color-change
|
2010-07-05 16:40:00 -07:00 |
|
ilya
|
a009bb1565
|
Added the expected behavior of fading out the publisher field(s) if content type is clicked again
|
2010-07-05 05:37:23 -04:00 |
|
danielvincent
|
20b056586d
|
warming up the page. colors were too cold and non-human before.
|
2010-07-05 00:02:16 -07:00 |
|
danielvincent
|
33611abeba
|
Merge branch 'master' of github.com:diaspora/diaspora_rails
|
2010-07-03 23:39:20 -07:00 |
|
danielvincent
|
0001797850
|
moved user's name to the right of their picture
|
2010-07-03 23:39:05 -07:00 |
|
Raphael
|
0c09445919
|
RS; blur in clear_form
|
2010-07-03 23:35:10 -07:00 |
|
danielvincent
|
85cee4064b
|
Merge branch 'master' of github.com:diaspora/diaspora_rails
Conflicts:
public/javascripts/publisher.js
|
2010-07-03 22:45:56 -07:00 |
|
danielvincent
|
e709eba243
|
publisher as a faux nav element.
|
2010-07-03 22:43:11 -07:00 |
|
Raphael
|
a0cdd7cb0e
|
RS; Refactored publisher, tested it, it seems to work perfectly, but I could be wrong.
|
2010-07-03 13:26:11 -07:00 |
|
Raphael
|
cae4f832cf
|
hover fix
|
2010-07-02 15:28:32 -07:00 |
|
Raphael
|
6ab9904f25
|
delete js now applies to new things
|
2010-07-02 15:19:33 -07:00 |
|
danielvincent
|
6ce0f4464f
|
reverted publisher javascript refactor. working again in chrome.
|
2010-07-01 20:04:31 -07:00 |
|
danielvincent
|
1616f5573d
|
DG MS; fixed position of flash message
|
2010-07-01 19:55:38 -07:00 |
|
Raphael
|
90b750acb2
|
Renamed jpegs to jpgs
|
2010-07-01 18:12:00 -07:00 |
|
danielvincent
|
88f0244353
|
Merge branch 'master' of github.com:diaspora/diaspora_rails
|
2010-07-01 17:22:30 -07:00 |
|
danielvincent
|
368f550f65
|
preview text next to diaspora in header
|
2010-07-01 17:22:24 -07:00 |
|
Raphael
|
80b69fd3ec
|
Merge branch 'master' of github.com:diaspora/diaspora_rails
|
2010-07-01 17:13:17 -07:00 |
|
maxwell
|
2b2864b78d
|
now its just a message for ie 6, 7
|
2010-07-01 17:12:21 -07:00 |
|
Raphael
|
d9cff39bed
|
Merge branch 'master' of github.com:diaspora/diaspora_rails
|
2010-07-01 17:09:49 -07:00 |
|
Raphael
|
51e36b9659
|
RS, merged publisher refactor
|
2010-07-01 17:09:35 -07:00 |
|
danielvincent
|
d0560e6c74
|
Merge branch 'master' of github.com:diaspora/diaspora_rails
|
2010-07-01 16:57:58 -07:00 |
|
danielvincent
|
d935db7845
|
newest message font fix
|
2010-07-01 16:54:27 -07:00 |
|
Raphael
|
a70fbc6a4a
|
Changed cap script
|
2010-07-01 16:54:12 -07:00 |
|
maxwell
|
86c6cdcafa
|
Merge branch 'master' of github.com:diaspora/diaspora_rails
|
2010-07-01 16:38:51 -07:00 |
|
maxwell
|
ba984009f8
|
added chrome frame
|
2010-07-01 16:38:32 -07:00 |
|
danielvincent
|
b25880f04a
|
Merge branch 'master' of github.com:diaspora/diaspora_rails
|
2010-07-01 16:25:11 -07:00 |
|
danielvincent
|
03e7071aae
|
fixed nav list/link deal for firefox, html compliance
|
2010-07-01 16:24:51 -07:00 |
|
maxwell
|
6f17e5f28f
|
added chrome frame for ie lameos
|
2010-07-01 16:17:32 -07:00 |
|
danielvincent
|
c0a744b2ce
|
owner picture selector in application helper
|
2010-07-01 15:34:35 -07:00 |
|
maxwell
|
38465c350c
|
RS, MS; Forms now clear
|
2010-07-01 11:19:08 -07:00 |
|
Raphael
|
a7659ae902
|
Marked the problem area in infieldlabels
|
2010-06-30 21:53:05 -07:00 |
|
danielvincent
|
df6ea31d3d
|
Merge branch 'master' of github.com:diaspora/diaspora_rails
|
2010-06-30 13:36:23 -07:00 |
|
Raphael
|
34400594ec
|
RS, AML; fixed jumping to top of page on comment toggle
|
2010-06-30 13:29:20 -07:00 |
|
danielvincent
|
f7e4f1db32
|
Merge branch 'master' of github.com:diaspora/diaspora_rails
|
2010-06-30 13:12:09 -07:00 |
|
Raphael
|
2b0659e21d
|
Comment toggle now applies to socketed posts
|
2010-06-30 08:28:24 -07:00 |
|
danielvincent
|
74aa0debc8
|
stupid sans-serif bug finally squashed
|
2010-06-30 00:30:43 -07:00 |
|
maxwell
|
6bc68fb42e
|
Merge branch 'master' of github.com:diaspora/diaspora_rails
|
2010-06-30 00:27:30 -07:00 |
|
maxwell
|
dc5b321b62
|
sorry for the monster commit.... 4 small chores...1) moved tons of dynamic javascript to haml partials in the new js view folder, and moved some of the js that got put in the application layout into view.js 2. set up a static config prefrence loader in initializers, loaded from yaml 3) fixed the top right login text from being pushed over. 4) fixed a bug when no user is on the node and someone hits the landing page.... you still cant create a new user from there, but now at least it doesnt blow up.
|
2010-06-30 00:27:11 -07:00 |
|
danielvincent
|
a15cd932b6
|
nevermind, nevermind
|
2010-06-29 23:47:39 -07:00 |
|
danielvincent
|
8725ea2d57
|
high box shadow blur kills the client
|
2010-06-29 23:28:15 -07:00 |
|
danielvincent
|
cf8c669e83
|
login screen now black.
|
2010-06-29 23:24:31 -07:00 |
|
maxwell
|
93a4ac6f9c
|
added favicon from pubsite
|
2010-06-29 22:14:39 -07:00 |
|
maxwell
|
448fcf8f89
|
MS RS fixed real name, now profiles are created with a new friend
|
2010-06-29 20:33:55 -07:00 |
|
danielvincent
|
984f5f62b6
|
DG IZ; publisher reflects what type is selected
|
2010-06-29 19:55:50 -07:00 |
|
danielvincent
|
8ff241cdde
|
DG IZ; all comments hidden by default. linking anchor issue.
|
2010-06-29 19:00:54 -07:00 |
|
danielvincent
|
7d6783e446
|
DG IZ; more little changes to UI
|
2010-06-29 18:00:01 -07:00 |
|
danielvincent
|
0c16038e2d
|
Merge branch 'master' of github.com:diaspora/diaspora_rails
Conflicts:
app/views/layouts/application.html.haml
public/stylesheets/application.css
public/stylesheets/sass/application.sass
|
2010-06-29 17:30:29 -07:00 |
|
danielvincent
|
acc782d5b2
|
DG IZ; cool labels fade in
|
2010-06-29 17:27:09 -07:00 |
|
maxwell
|
eebed9d457
|
fixed publisher in chrome and broke it out to a seperate js file
|
2010-06-29 17:04:46 -07:00 |
|
danielvincent
|
39a1874ce3
|
DG IZ; all input fields are now textareas on dashboard page
|
2010-06-29 16:28:12 -07:00 |
|
maxwell
|
a0a0b9d0ad
|
fixed stream bull
|
2010-06-29 15:05:09 -07:00 |
|
maxwell
|
ee9acc5c82
|
thanks to dan, GS works great now MS RS
|
2010-06-29 15:00:30 -07:00 |
|
danielvincent
|
67123c664a
|
Merge branch 'master' of github.com:diaspora/diaspora_rails
Conflicts:
app/views/layouts/application.html.haml
|
2010-06-29 14:36:46 -07:00 |
|
danielvincent
|
5193a20458
|
DG IZ; getting there.
|
2010-06-29 14:34:33 -07:00 |
|
maxwell
|
6532962c1c
|
trying to get google analytics working
|
2010-06-29 13:58:36 -07:00 |
|
maxwell
|
60336bd520
|
trying to get GS working
|
2010-06-29 13:45:54 -07:00 |
|
maxwell
|
f9d4eff7b0
|
Merge branch 'master' of github.com:diaspora/diaspora_rails
|
2010-06-29 12:32:07 -07:00 |
|
danielvincent
|
260805af64
|
DG IZ; publisher box & profile picture placeholder
|
2010-06-29 12:25:36 -07:00 |
|
maxwell
|
a683a2c1aa
|
RS MS added goog analytics
|
2010-06-29 11:45:41 -07:00 |
|
danielvincent
|
01f048b0a6
|
Merge branch 'master' of github.com:diaspora/diaspora_rails
Conflicts:
public/stylesheets/sass/application.sass
|
2010-06-28 22:18:47 -07:00 |
|
danielvincent
|
08d6a46bd8
|
login page
|
2010-06-28 22:18:05 -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 |
|
danielvincent
|
5be5d82eb7
|
Merge branch 'master' of github.com:diaspora/diaspora_rails
|
2010-06-28 20:42:12 -07:00 |
|
ilya
|
30667a5bc9
|
The photo
|
2010-06-28 23:40:34 -04:00 |
|
ilya
|
775aab996a
|
DG IZ picture in the profile
|
2010-06-28 23:39:55 -04:00 |
|
danielvincent
|
ab086e5b0e
|
Merge branch 'master' of github.com:diaspora/diaspora_rails
|
2010-06-28 20:39:34 -07:00 |
|
maxwell
|
36b5a90d34
|
MS figured out how to get comments to come thru the websocket. this is super super super hacky, and kind of terrible, but it works
|
2010-06-28 17:35:38 -07:00 |
|
danielvincent
|
fd082f52bc
|
fixed stream's sans font showing up on linux.
|
2010-06-28 12:35:31 -07:00 |
|
danielvincent
|
462bd96189
|
ui fixup
|
2010-06-27 16:17:42 -07:00 |
|
danielvincent
|
5be27f33ec
|
Merge branch 'master' of github.com:diaspora/diaspora_rails
Conflicts:
app/views/layouts/application.html.haml
app/views/status_messages/_status_message.html.haml
|
2010-06-27 10:32:23 -07:00 |
|
danielvincent
|
39e85754d8
|
nav should be collapsed into a filter list. comments are more clear.
|
2010-06-26 00:07:21 -07:00 |
|
ilya
|
a7d46bffab
|
removed socket.js
|
2010-06-26 02:08:19 -04:00 |
|
ilya
|
f5ecfebcb9
|
Merge branch 'master' of github.com:diaspora/diaspora_rails
|
2010-06-25 23:23:44 -04:00 |
|
ilya
|
d4f528bba8
|
Removed bookmark new page, moved form to index
|
2010-06-25 23:23:37 -04:00 |
|
maxwell
|
4d65cfab09
|
MS^2 Added the friends panel to application layout
|
2010-06-25 19:22:05 -07:00 |
|
maxwell
|
5cade230ac
|
added silly debug toggle
|
2010-06-25 15:33:23 -07:00 |
|
maxwell
|
a673e48317
|
DG MS fixed js for statusmessage
|
2010-06-23 12:07:22 -07:00 |
|
maxwell
|
671772f901
|
MS DG added tinyMCE, now a blog is better than a status messsage
|
2010-06-23 11:58:46 -07:00 |
|
maxwell
|
fba4ce9e3b
|
DG MS; fixed flash message visual bug
|
2010-06-23 11:11:58 -07:00 |
|
maxwell
|
5e5dea85a8
|
pushing small js fixes
|
2010-06-23 10:25:49 -07:00 |
|
maxwell
|
60fa7e3ac4
|
view stuffs
|
2010-06-23 01:26:00 -07:00 |
|
maxwell
|
94de043862
|
fixed not hardcoded port for websockets
|
2010-06-22 17:20:07 -07:00 |
|
maxwell
|
4af10a95fa
|
oops forgot to add jquery_form
|
2010-06-22 16:44:41 -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 |
|
maxwell
|
a0417d13af
|
fixed merge with master
|
2010-06-21 14:38:38 -07:00 |
|
danielvincent
|
06271d5821
|
added dumb partial switcher function in dashboard controller
|
2010-06-21 14:23:59 -07:00 |
|
maxwell
|
655dd64a54
|
websockets work
|
2010-06-21 14:12:05 -07:00 |
|
maxwell
|
7bc165d7a0
|
added js file
|
2010-06-20 22:11:37 -07:00 |
|
danielvincent
|
26d675af11
|
some sass cleanup
|
2010-06-20 18:36:01 -07:00 |
|
danielvincent
|
c542c08e38
|
simpler
|
2010-06-20 17:06:10 -07:00 |
|
danielvincent
|
6647ce34ab
|
status message and bookmark page
|
2010-06-20 14:52:04 -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 |
|
maxwell
|
8019fc8d31
|
working websocket
|
2010-06-19 00:09:58 -07:00 |
|
danielvincent
|
1223011a4f
|
more semi-drastic changes.
|
2010-06-19 00:01:25 -07:00 |
|
danielvincent
|
de8d8d5cb5
|
in the shit
|
2010-06-18 23:32:47 -07:00 |
|
danielvincent
|
c63eac0fd9
|
added line delimiters for post stream on dashboard
|
2010-06-15 22:34:08 -07:00 |
|
maxwell
|
408c2c719d
|
swaped out js for jquery
|
2010-06-15 09:53:19 -07:00 |
|
maxwell
|
3eef53892c
|
DG MS; Dashboard shows the user's most recent update
|
2010-06-14 17:48:21 -07:00 |
|
danielvincent
|
63f5fe15d6
|
nav includes users and status messages
|
2010-06-14 11:55:52 -07:00 |
|
danielvincent
|
5d273ef049
|
removed stray rails.png file
|
2010-06-14 11:51:03 -07:00 |
|
danielvincent
|
98abb75097
|
added blueprint
|
2010-06-14 11:50:17 -07:00 |
|
danielvincent
|
eaeafd3240
|
added authentication via devise
|
2010-06-12 21:56:50 -07:00 |
|
maxwell
|
e068707158
|
added nifty templates, and started a user model. session model is next
|
2010-06-12 15:26:37 -07:00 |
|
Raphael Sofaer
|
0390bbde8a
|
Activerecord this time\!
|
2010-06-11 10:40:49 -07:00 |
|