Daniel Vincent Grippi
|
7fefdd3753
|
minor cleanup
|
2010-09-11 08:59:25 -07:00 |
|
Daniel Vincent Grippi
|
266a896bde
|
mtweaking comments in stream
|
2010-09-10 23:55:33 -07:00 |
|
Daniel Vincent Grippi
|
0c5ab4f20e
|
undo for now
|
2010-09-10 15:44:36 -07:00 |
|
Daniel Vincent Grippi
|
ef6ce98c12
|
DG IZ alert on dragging a request, trying to check
|
2010-09-10 15:41:58 -07:00 |
|
Daniel Vincent Grippi
|
8afb590128
|
small fix
|
2010-09-10 15:28:11 -07:00 |
|
Daniel Vincent Grippi
|
136eb61b02
|
DG IZ; groups = relations. now you can rename groups in the manage relation page
|
2010-09-10 14:52:11 -07:00 |
|
Daniel Vincent Grippi
|
5812bbd1f1
|
removed group name edit madness from javascript.
|
2010-09-09 09:35:32 -07:00 |
|
Daniel Vincent Grippi
|
1c2bfa64a1
|
cleaned login page resources
|
2010-09-08 23:30:08 -07:00 |
|
Daniel Vincent Grippi
|
20d9334ce1
|
DG IZ; changed the photo uploader to drag and drop. now works in firefox.
|
2010-09-07 17:20:48 -07:00 |
|
Daniel Vincent Grippi
|
41afd86fe7
|
DG IZ; fixed photos.
|
2010-09-07 12:03:43 -07:00 |
|
ilya
|
9a4edc419c
|
DG IZ first commit from the car, now can change groups a couple of times
|
2010-08-31 22:55:50 -07:00 |
|
ilya
|
98db03d36e
|
the group edit resets the data started to reset the from id attr
|
2010-08-31 10:46:49 -07:00 |
|
ilya
|
82ff7dc4e4
|
the person bg color now reset to white, need to reset the original group param and reset the moves var so that one can submit again
|
2010-08-29 20:38:59 -07:00 |
|
ilya
|
9a5f7b4675
|
IZ now the bg color of the moved people changes to blue and changes back to white when you move them back, still need to reset to white on submit and make it pretty
|
2010-08-29 20:23:20 -07:00 |
|
ilya
|
990be921f3
|
added an switch to reset the data if the thing is moved into the original group
|
2010-08-27 18:17:08 -07:00 |
|
Daniel Grippi & Raphael Sofaer
|
cf161cb8cf
|
publisher box back up top
|
2010-08-27 16:09:10 -07:00 |
|
Raphael
|
5ff1bdae90
|
Groups can now be batch edited
|
2010-08-27 12:23:20 -07:00 |
|
danielvincent
|
81438678cd
|
Refactored more photo js out to photos.js. That should be it for that refactor
|
2010-08-26 17:10:19 -07:00 |
|
danielvincent
|
239ae048cc
|
group names are now editable
|
2010-08-26 15:02:13 -07:00 |
|
Raphael
|
19e8aa5c35
|
Refactored view js
|
2010-08-26 11:06:35 -07:00 |
|
maxwell
|
9b690b863a
|
droping things
|
2010-08-25 21:53:04 -07:00 |
|
Raphael
|
6d3d37b7c6
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-08-25 18:20:37 -07:00 |
|
Raphael
|
2c54fee1af
|
Adding minified jquery
|
2010-08-25 18:20:21 -07:00 |
|
maxwell
|
a26229223c
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-08-25 18:07:49 -07:00 |
|
Raphael
|
e714e0d457
|
Comment sets now pop open on receiving a new comment
|
2010-08-25 18:00:53 -07:00 |
|
maxwell
|
22f63a4c44
|
MS IZ added the move friend method
|
2010-08-25 16:58:07 -07:00 |
|
Raphael
|
be6dc1d443
|
Delete tinymce
|
2010-08-25 13:58:16 -07:00 |
|
Raphael
|
2c89a96e79
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-08-25 13:56:49 -07:00 |
|
Raphael
|
9d2653ecd4
|
Move some stuff out of document ready
|
2010-08-25 13:56:38 -07:00 |
|
maxwell
|
c9e64ae209
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-08-25 13:54:27 -07:00 |
|
maxwell
|
6a613c3304
|
addded the draggable javascript
|
2010-08-25 13:53:53 -07:00 |
|
Raphael
|
f8d63052d4
|
Remove stream lives from ready block
|
2010-08-25 13:52:59 -07:00 |
|
Raphael
|
17636f4fd2
|
View modifications, refactored stream javascript to another file
|
2010-08-25 13:51:16 -07:00 |
|
danielvincent
|
f4b3a2eb3a
|
more cleaning up of comment box. javascript stuff.
|
2010-08-24 20:49:32 -07:00 |
|
danielvincent
|
501f98b9e1
|
fixed comments from not showing. also, touched them up a bit.
|
2010-08-24 20:13:37 -07:00 |
|
Raphael
|
3f5df61810
|
minor tab tweaks
|
2010-08-24 16:38:42 -07:00 |
|
Raphael
|
de3044fa0a
|
Remove publisher selection remnants, fix posting
|
2010-08-24 15:55:35 -07:00 |
|
Raphael
|
5a02f92448
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-08-23 13:58:46 -07:00 |
|
Raphael
|
ae6f0fdc51
|
new photo form now loads through ajax
|
2010-08-23 13:58:33 -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 |
|
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
|
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
|
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 |
|
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 |
|
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 |
|
danielvincent
|
f3bc651359
|
stuff fades
|
2010-08-02 19:16: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 |
|
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 |
|
Raphael
|
dc1a164b67
|
Removing unused function
|
2010-07-30 12:42:39 -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 |
|
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
|
d93c331615
|
moved publisher
|
2010-07-23 20:12:28 -07:00 |
|
maxwell
|
695a93ddad
|
DG MS added basic album traversal
|
2010-07-21 14:29:58 -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 |
|
ilya
|
e08ed8805f
|
DG IZ photo upload form now with all the others
|
2010-07-20 10:00:02 -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
|
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
|
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 |
|
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 |
|
Raphael
|
51e36b9659
|
RS, merged publisher refactor
|
2010-07-01 17:09:35 -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 |
|
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 |
|
Raphael
|
34400594ec
|
RS, AML; fixed jumping to top of page on comment toggle
|
2010-06-30 13:29:20 -07:00 |
|
Raphael
|
2b0659e21d
|
Comment toggle now applies to socketed posts
|
2010-06-30 08:28:24 -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 |
|
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
|
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
|
ee9acc5c82
|
thanks to dan, GS works great now MS RS
|
2010-06-29 15:00:30 -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
|
a683a2c1aa
|
RS MS added goog analytics
|
2010-06-29 11:45:41 -07:00 |
|
maxwell
|
46ab63de36
|
added will pagination action.
|
2010-06-28 21:56:58 -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 |
|
ilya
|
a7d46bffab
|
removed socket.js
|
2010-06-26 02:08:19 -04:00 |
|
ilya
|
d4f528bba8
|
Removed bookmark new page, moved form to index
|
2010-06-25 23:23:37 -04: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
|
655dd64a54
|
websockets work
|
2010-06-21 14:12:05 -07:00 |
|
maxwell
|
7bc165d7a0
|
added js file
|
2010-06-20 22:11:37 -07:00 |
|
maxwell
|
8019fc8d31
|
working websocket
|
2010-06-19 00:09:58 -07:00 |
|
maxwell
|
408c2c719d
|
swaped out js for jquery
|
2010-06-15 09:53:19 -07:00 |
|
Raphael Sofaer
|
0390bbde8a
|
Activerecord this time\!
|
2010-06-11 10:40:49 -07:00 |
|