Raphael
|
fffd3aebfc
|
Added remote is true to stream partials, no more redirecting
|
2010-07-02 15:36:07 -07:00 |
|
danielvincent
|
df3fe6c2a9
|
DG IZ RS; deletion now gets sent through the websocket
|
2010-07-02 15:16:28 -07:00 |
|
Raphael
|
737614e04b
|
google analytics for real
|
2010-07-01 22:20:57 -07:00 |
|
Raphael
|
418635aa72
|
Added google to session wall layout
|
2010-07-01 22:13:55 -07:00 |
|
danielvincent
|
1616f5573d
|
DG MS; fixed position of flash message
|
2010-07-01 19:55:38 -07:00 |
|
danielvincent
|
4f7579a5db
|
DG MS; fixed delete button bug on stream
|
2010-07-01 19:49:56 -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 |
|
maxwell
|
2b2864b78d
|
now its just a message for ie 6, 7
|
2010-07-01 17:12:21 -07:00 |
|
maxwell
|
8d1ec57fa4
|
beefed it up to ie 7
|
2010-07-01 17:07:36 -07:00 |
|
maxwell
|
8e94fc5b4f
|
added mean message
|
2010-07-01 17:05:14 -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 |
|
maxwell
|
b0a3feb30c
|
fixed g analytics
|
2010-07-01 15:51:17 -07:00 |
|
danielvincent
|
c0a744b2ce
|
owner picture selector in application helper
|
2010-07-01 15:34:35 -07:00 |
|
danielvincent
|
99d12964b6
|
to warzombie, user must have email tom@joindiaspora.com, and there musn't be a bomb in the lasanga
|
2010-07-01 10:55:22 -07:00 |
|
ilya
|
5285753486
|
IZ warzombie route, the method is in the dsashboard controller
|
2010-07-01 13:28:17 -04:00 |
|
maxwell
|
428284abeb
|
sorry about that, removed tiny mce, but we still had things which inited it
|
2010-07-01 09:15:27 -07:00 |
|
maxwell
|
cb23766012
|
Merge branch 'master' of github.com:diaspora/diaspora_rails
|
2010-07-01 09:03:04 -07:00 |
|
maxwell
|
01132e3dc0
|
pushing js changes
|
2010-07-01 09:02:38 -07:00 |
|
Raphael
|
27d29d5d40
|
RS; I should have figured this one out way earlier...
|
2010-07-01 01:22:37 -07:00 |
|
maxwell
|
da59078b64
|
fixed small js bug so it only adds to the base route (or page 1 on pagination)
|
2010-06-30 17:49:45 -07:00 |
|
maxwell
|
9631977597
|
RS MS comments propagate, and show up IN REAL TIME
|
2010-06-30 17:29:32 -07:00 |
|
Raphael
|
3d976ca47e
|
RS, a little bit of autolinking in statuses and comments
|
2010-06-30 08:36:51 -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
|
cf8c669e83
|
login screen now black.
|
2010-06-29 23:24:31 -07:00 |
|
danielvincent
|
e159b8f7f4
|
Merge branch 'master' of github.com:diaspora/diaspora_rails
Conflicts:
app/views/friends/show.html.haml
|
2010-06-29 20:56:44 -07:00 |
|
danielvincent
|
19c41fb6be
|
DG IZ; comments show and hide
|
2010-06-29 20:53:49 -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
|
97cd3fb413
|
DG IZ; comment count in status message partial
|
2010-06-29 19:08:23 -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
|
7961d11669
|
uncommenting get satisfaction
|
2010-06-29 17:09:07 -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 |
|
ilya
|
775aab996a
|
DG IZ picture in the profile
|
2010-06-28 23:39:55 -04:00 |
|
ilya
|
0fa11806ba
|
Merge branch 'master' of github.com:diaspora/diaspora_rails
|
2010-06-28 21:32:18 -04:00 |
|
ilya
|
b5b9c647d7
|
DG IZ Created the profile model & friend view now shows the information
|
2010-06-28 21:32:09 -04: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 |
|
maxwell
|
f4a8671854
|
fixed the remote socket updating bug? we will see
|
2010-06-28 16:15:30 -07:00 |
|
maxwell
|
b6c6316886
|
trying to fix status message bug
|
2010-06-28 15:03:45 -07:00 |
|
maxwell
|
d9a6bb7ba2
|
merged my socket changes
|
2010-06-28 14:52:43 -07:00 |
|
maxwell
|
5cf2e3c3ea
|
commiting so i can pull
|
2010-06-28 14:47:23 -07:00 |
|
ilya
|
44b25e3eaa
|
DG IZ; fixed javascript bug. stream fades in recents again.
|
2010-06-28 17:02:26 -04:00 |
|
danielvincent
|
762cbcb0f2
|
Merge branch 'master' of github.com:diaspora/diaspora_rails
Conflicts:
app/views/comments/_comment.html.haml
app/views/layouts/application.html.haml
|
2010-06-28 12:09:35 -07:00 |
|
ilya
|
a540f09109
|
RS, IZ; Added ids to views
|
2010-06-28 14:46:43 -04:00 |
|
maxwell
|
60091012bf
|
on client connect, websockets now tell the server where the user is. nothing more
|
2010-06-28 01:12:21 -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 |
|
maxwell
|
b017f1b0f9
|
forgot to add partial file to git...sorry
|
2010-06-26 23:43:30 -07:00 |
|
Maxwell Salzberg
|
b804bdc220
|
forgot to take out a debug line. i kept comments in, but they prevent a new post to be sent from the database to the view. on refresh everything works. also moved comments to its own partial so we can add it to all posts
|
2010-06-26 15:40:33 -07:00 |
|
danielvincent
|
39e85754d8
|
nav should be collapsed into a filter list. comments are more clear.
|
2010-06-26 00:07:21 -07:00 |
|
maxwell
|
a6c33b3e7b
|
Merge branch 'master' of github.com:diaspora/diaspora_rails
|
2010-06-25 22:15:49 -07:00 |
|
maxwell
|
ec01e2c016
|
Comments now working, but no AJAX, need to refresh to see them
|
2010-06-25 22:15:41 -07:00 |
|
ilya
|
a7f6eaefdf
|
no friends panel on page
|
2010-06-26 00:47:21 -04:00 |
|
ilya
|
d9ffb0d07d
|
RS IZ No Friends list before signin
|
2010-06-25 23:53:04 -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
|
faa5d21636
|
Change the form_for not to need a message passed, and adding it to the home page
|
2010-06-25 19:58:40 -07:00 |
|
maxwell
|
4d65cfab09
|
MS^2 Added the friends panel to application layout
|
2010-06-25 19:22:05 -07:00 |
|
ilya
|
2557271dcc
|
removed users link
|
2010-06-25 21:57:18 -04:00 |
|
maxwell
|
884af9a3b6
|
added debug partial
|
2010-06-25 15:35:40 -07:00 |
|
maxwell
|
5cade230ac
|
added silly debug toggle
|
2010-06-25 15:33:23 -07:00 |
|
maxwell
|
e558d4833f
|
DG MS fixing tests
|
2010-06-24 20:45:49 -07:00 |
|
maxwell
|
fb7ed9e0e7
|
DG MS pushing a small show page fix
|
2010-06-23 15:25:46 -07:00 |
|
maxwell
|
9fa26f020e
|
DG MS; clicking on a person's name redirects to that person's post stream
|
2010-06-23 14:32:51 -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
|
663b99924f
|
Merge branch 'master' of github.com:diaspora/diaspora_rails
|
2010-06-23 01:26:06 -07:00 |
|
maxwell
|
60fa7e3ac4
|
view stuffs
|
2010-06-23 01:26:00 -07:00 |
|
Maxwell Salzberg
|
523cb6f15f
|
DG; Post belongs to a Person, and a Person has many Posts. Also, added Person for real this time
|
2010-06-22 23:27:31 -07:00 |
|
Maxwell Salzberg
|
9a44578c37
|
DG; Person is now the parent of Friend and User
|
2010-06-22 23:11:55 -07:00 |
|
maxwell
|
fd5d7c63ad
|
messy application.haml file i know, but now the sockets only update pages which want their data
|
2010-06-22 18:59:11 -07:00 |
|
maxwell
|
94de043862
|
fixed not hardcoded port for websockets
|
2010-06-22 17:20:07 -07:00 |
|
maxwell
|
aa7a2da3d1
|
put debug back into websocket
|
2010-06-22 16:23:15 -07:00 |
|
maxwell
|
cc89cd5cda
|
reload object before send to websocket
|
2010-06-22 16:12:15 -07:00 |
|
maxwell
|
989949a8c9
|
added pretty (but dumb) update of sockets, and fixed some tests which broke as a result. needs better tests and the code is U G L Y
|
2010-06-22 15:14:55 -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
|
3a8394bd59
|
Merge branch 'master' of github.com:diaspora/diaspora_rails into 192_magic_funhouse
|
2010-06-21 19:24:07 -07:00 |
|
maxwell
|
f696ffc3a6
|
fixed up some views, but some stuff feels like it broke
|
2010-06-21 16:46:19 -07:00 |
|
danielvincent
|
1233c60f6f
|
DG IZ; user's real name displayed on top of every page
|
2010-06-21 16:09:48 -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
|
3581f7a7d6
|
merged in socket
|
2010-06-20 22:13:24 -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 |
|
maxwell
|
2f6a11f018
|
fixed the stupid addressable bug, also started playing with 1.9.2...sorry for the spaced out commit
|
2010-06-19 14:42:23 -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 |
|
maxwell
|
d4bf2f539d
|
DG MS; removed signup link and route
|
2010-06-18 10:48:37 -07:00 |
|
danielvincent
|
da9f33aa72
|
fixed post stream to ascend by time
|
2010-06-16 17:35:39 -07:00 |
|
danielvincent
|
c63eac0fd9
|
added line delimiters for post stream on dashboard
|
2010-06-15 22:34:08 -07:00 |
|
maxwell
|
9e89b2e0a7
|
DG MS did some basic work on the dashboard controller and some super basic fallback partial view
|
2010-06-15 21:08:29 -07:00 |
|
maxwell
|
e6f3fc1d38
|
DG MS more test cleanup and removed a deprecation warning
|
2010-06-15 17:38:12 -07:00 |
|
danielvincent
|
45c926f790
|
DG RS; added blog posts, cleaned up unnecessary warden mocks in all controller specs
|
2010-06-15 11:09:47 -07:00 |
|
danielvincent
|
99d9e50ed6
|
Merge branch 'master' of github.com:diaspora/diaspora_rails
|
2010-06-15 10:12:14 -07:00 |
|
danielvincent
|
d70cf5b7a7
|
DG RS; fixed newest messages bug in view. moved to helper.
|
2010-06-15 10:11:28 -07:00 |
|
maxwell
|
408c2c719d
|
swaped out js for jquery
|
2010-06-15 09:53:19 -07:00 |
|
maxwell
|
1a1887f77f
|
DG MS completed bookmark story
|
2010-06-14 20:20:19 -07:00 |
|
maxwell
|
58dfefc3ca
|
added home to nav bar
|
2010-06-14 18:50:38 -07:00 |
|
maxwell
|
3c3c194ed5
|
Merge branch 'master' of github.com:diaspora/diaspora_rails
|
2010-06-14 17:48:50 -07:00 |
|
maxwell
|
3eef53892c
|
DG MS; Dashboard shows the user's most recent update
|
2010-06-14 17:48:21 -07:00 |
|
ilya
|
08e64450f3
|
IZ Removed the - for = deprication warning in views, the devise ones are hardcoded so maybe they'll be gone on next version
|
2010-06-14 20:34:03 -04:00 |
|
maxwell
|
4532c39e93
|
DG MS; Status messages have owner field; defaults to user
|
2010-06-14 17:13:07 -07:00 |
|
maxwell
|
db44081186
|
MS IZ DG completed friends should be displayed on dashboard
|
2010-06-14 13:17:20 -07:00 |
|
maxwell
|
960db53b9b
|
MS IZ DG completed crud for friend
|
2010-06-14 13:12:17 -07:00 |
|
danielvincent
|
63f5fe15d6
|
nav includes users and status messages
|
2010-06-14 11:55:52 -07:00 |
|
danielvincent
|
4584f1309e
|
Merge branch 'blueprint'
|
2010-06-14 11:51:56 -07:00 |
|
danielvincent
|
98abb75097
|
added blueprint
|
2010-06-14 11:50:17 -07:00 |
|
maxwell
|
0ff541ba43
|
fixed the dumb autotest bug. by adding mocha, it seemed to work. also fixed a bug where authenticate is called to warden and a view IZ MS
|
2010-06-14 11:05:55 -07:00 |
|
maxwell
|
29c6f9fa0f
|
DG, MS, IZ; status messages now functional
|
2010-06-13 22:11:16 -07:00 |
|
maxwell
|
85e6eb2132
|
added stray local files
|
2010-06-13 21:22:52 -07:00 |
|
maxwell
|
28ba205ef3
|
blerg rspec cache sux
|
2010-06-13 21:08:17 -07:00 |
|
maxwell
|
865d7d18cb
|
user login now drops to a dashboard page
|
2010-06-13 20:00:31 -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 |
|