danielvincent
|
b9be543ef6
|
DG IZ; reshare redirects to specific page
|
2010-09-22 15:32:11 -07:00 |
|
danielvincent
|
474cf77708
|
DG IZ; reposting now works. redirects to a template missing page, though.
|
2010-09-22 15:05:51 -07:00 |
|
danielvincent
|
b019ade588
|
minor changes from production
|
2010-09-20 21:50:06 -07:00 |
|
danielvincent
|
f50b70da9e
|
DG IZ; removed stray mustache
|
2010-09-20 18:14:12 -07:00 |
|
danielvincent
|
e588d7ab6a
|
DG IZ moving friends is now ajaxy
|
2010-09-20 17:26:20 -07:00 |
|
danielvincent
|
40c96fc619
|
DG IZ; click to edit rollover text on aspect manage page
|
2010-09-20 15:53:56 -07:00 |
|
danielvincent
|
5a9b0fbd03
|
tabs rounded
|
2010-09-19 22:16:58 -07:00 |
|
danielvincent
|
14ad24ba7e
|
visual tweaks on header. moved upload a file button to header on album#show
|
2010-09-19 14:27:20 -07:00 |
|
MrZYX
|
7c62a5adf7
|
fixed drag & drop on aspect manage page
|
2010-09-19 09:57:58 +08:00 |
|
danielvincent
|
b5a2971302
|
search results for people now look like the stream
|
2010-09-18 17:49:52 -07:00 |
|
Rick Waldron
|
535f6ed334
|
More clean up to decrementRequestsCounter()
|
2010-09-18 08:05:51 +08:00 |
|
Rick Waldron
|
fcdc1d914c
|
Cached all reused match selector sets, moved synchronous functions into callbacks where needed for optimization; Moved all DOM manip into $(function () {} )
|
2010-09-18 08:04:47 +08:00 |
|
Rick Waldron
|
773839308c
|
Moved .live(...) into $(function() {}) block - DOM logic should not be left to synchronously execute outside of a DOMContentLoaded closure
|
2010-09-18 08:03:59 +08:00 |
|
danielvincent
|
292a38e694
|
DG IZ; arrow keys work in fancybox. removed background color change on close button on hover
|
2010-09-16 18:55:54 -07:00 |
|
danielvincent
|
755e2a744c
|
DG IZ; dropzones now light up when dragging on aspect page
|
2010-09-16 17:30:49 -07:00 |
|
danielvincent
|
d74c4bd117
|
DG IZ; use focus instead of click
|
2010-09-16 16:47:10 -07:00 |
|
danielvincent
|
0c7ba49e34
|
DG IZ; aspect deletion
|
2010-09-16 16:03:18 -07:00 |
|
maxwell
|
649839567d
|
MS added pagination to the search page
|
2010-09-16 11:47:34 -07:00 |
|
Raphael
|
708e9f88a5
|
Spell our own name right
|
2010-09-15 17:56:18 -07:00 |
|
Daniel Vincent Grippi
|
c1414c5207
|
flash messages are now colored on session wall
|
2010-09-15 16:59:44 -07:00 |
|
Daniel Vincent Grippi
|
fe35d60b13
|
hack on aspect nav for ff & chrome compatability
|
2010-09-15 11:44:56 -07:00 |
|
Daniel Vincent Grippi
|
ac7fb673c5
|
show add new friend links on aspect manage page
|
2010-09-15 11:25:39 -07:00 |
|
Raphael
|
89ac38f630
|
Sass licenses changed
|
2010-09-15 11:00:55 -07:00 |
|
Raphael
|
d9eb3abd9d
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-09-15 10:59:00 -07:00 |
|
Raphael
|
aa3ebe372c
|
License notices replaced
|
2010-09-15 10:58:48 -07:00 |
|
Daniel Vincent Grippi
|
73dab4b3ef
|
fixed stream elements
|
2010-09-15 10:17:37 -07:00 |
|
Raphael
|
5d303518c2
|
Adding in COPYRIGHT, AUTHORS, and blueprint attribution
|
2010-09-15 10:09:42 -07:00 |
|
Daniel Vincent Grippi
|
1d04c89b48
|
header tweak
|
2010-09-15 00:39:48 -07:00 |
|
Daniel Vincent Grippi
|
b77260af6b
|
Decrement request counter on request action
|
2010-09-14 21:24:57 -07:00 |
|
Daniel Vincent Grippi
|
12e15ba3a1
|
forgot a paren
|
2010-09-14 21:17:27 -07:00 |
|
Daniel Vincent Grippi
|
6c2c3d9157
|
working?
|
2010-09-14 21:16:16 -07:00 |
|
Daniel Vincent Grippi
|
aaaa10b7e4
|
more testing
|
2010-09-14 21:12:56 -07:00 |
|
Daniel Vincent Grippi
|
509c16d953
|
debugging js
|
2010-09-14 21:10:10 -07:00 |
|
Daniel Vincent Grippi
|
8a59f3b26e
|
aspect manage less rounded
|
2010-09-14 20:42:08 -07:00 |
|
Daniel Vincent Grippi
|
c763a663ac
|
z-index fix
|
2010-09-14 20:37:31 -07:00 |
|
Daniel Vincent Grippi
|
f2c6e7b820
|
made group manage a little nicer
|
2010-09-14 20:35:30 -07:00 |
|
Daniel Vincent Grippi
|
0782e0b199
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-09-13 19:54:56 -07:00 |
|
maxwell
|
15651a7bb6
|
IZ MS group manage page can now add friends to groups
|
2010-09-13 18:10:07 -07:00 |
|
Daniel Vincent Grippi
|
5ecbb28dc7
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-09-13 17:57:59 -07:00 |
|
Daniel Vincent Grippi
|
c059069144
|
albums don't show publisher, refactored css
|
2010-09-13 17:57:30 -07:00 |
|
maxwell
|
63b3513a12
|
MS IZ removed the links to the requests index
|
2010-09-13 16:53:33 -07:00 |
|
Daniel Vincent Grippi
|
0e5ef9e005
|
more informative 400 and 500 pages
|
2010-09-13 15:24:15 -07:00 |
|
Daniel Vincent Grippi
|
94765906e0
|
forgot licenses on javascript files.
|
2010-09-13 14:43:24 -07:00 |
|
Daniel Vincent Grippi
|
4c15b1a01c
|
added license to every single goddamn file. also, put one in the root dir.
|
2010-09-13 14:23:50 -07:00 |
|
Daniel Vincent Grippi
|
3be86c2b5c
|
fixed tab bug in ff
|
2010-09-13 11:51:25 -07:00 |
|
Daniel Vincent Grippi
|
6aeaea1b7d
|
removed some things. also, comment buttons are now css-ified when they come through the socket
|
2010-09-13 11:42:41 -07:00 |
|
Daniel Vincent Grippi
|
200b0045f7
|
Merge branch 'master' of github.com:diaspora/diaspora
Conflicts:
public/stylesheets/application.css
public/stylesheets/sass/application.sass
|
2010-09-13 11:22:05 -07:00 |
|
Daniel Vincent Grippi
|
8c80174e73
|
removed some unneeded sass
|
2010-09-13 11:16:59 -07:00 |
|
Raphael
|
1312728b88
|
Merge branch 'master' of github.com:diaspora/diaspora
Conflicts:
public/stylesheets/application.css
public/stylesheets/sass/application.sass
|
2010-09-13 11:16:45 -07:00 |
|
Raphael
|
aa0a00d9cb
|
Finish moving to aspects, DB reset required
|
2010-09-13 11:15:08 -07:00 |
|
Daniel Vincent Grippi
|
7579c0ec50
|
more cleanup
|
2010-09-13 11:05:10 -07:00 |
|
Daniel Vincent Grippi
|
f5565025cb
|
removed glyphish icons
|
2010-09-13 10:44:20 -07:00 |
|
Raphael
|
9837340eb2
|
Rename files from group to aspect
|
2010-09-13 10:43:15 -07:00 |
|
Daniel Vincent Grippi
|
a74e00c159
|
removed hover user menu
|
2010-09-13 10:40:09 -07:00 |
|
Raphael
|
44a1f82da9
|
Rename group to aspect
|
2010-09-13 10:38:38 -07:00 |
|
Daniel Vincent Grippi
|
ede03fe1d5
|
added graident back into firefox
|
2010-09-13 10:23:24 -07:00 |
|
ilya
|
3014c4d057
|
silly little thing
|
2010-09-12 23:22:20 -07:00 |
|
ilya
|
0896efa5d6
|
now requests are called requested people, same css but less hacky selection
|
2010-09-12 22:54:53 -07:00 |
|
ilya
|
3bd686143f
|
need to send it without data
|
2010-09-12 22:10:50 -07:00 |
|
ilya
|
593f620216
|
a tiny change should make the things fadeout
|
2010-09-12 21:57:15 -07:00 |
|
Daniel Vincent Grippi
|
1874ebe51d
|
forgot to map to group ids in retraction
|
2010-09-12 21:33:39 -07:00 |
|
ilya
|
6b7f0888d0
|
Testing ignore friend request on remote
|
2010-09-12 19:56:23 -07:00 |
|
ilya
|
9b07c780c3
|
the acceptance now works need to do the ignores and unfriend bucket
|
2010-09-11 23:31:43 -07:00 |
|
ilya
|
b1dcc4cf43
|
testing request acceptance on remote
|
2010-09-11 21:58:01 -07:00 |
|
Daniel Vincent Grippi
|
db5d000757
|
made a sticky request link on the bottom of every page
|
2010-09-11 12:09:55 -07:00 |
|
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
|
95765139d6
|
link color less morbid.
|
2010-09-10 23:37:16 -07:00 |
|
Daniel Vincent Grippi
|
9c7e0e3bcb
|
minor sass tweaks
|
2010-09-10 23:16:46 -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
|
d3a8e27833
|
DG IZ; selector fix
|
2010-09-10 15:37:59 -07:00 |
|
Daniel Vincent Grippi
|
8afb590128
|
small fix
|
2010-09-10 15:28:11 -07:00 |
|
Daniel Vincent Grippi
|
4770616a26
|
DG IZ; small fix
|
2010-09-10 15:19:04 -07:00 |
|
Daniel Vincent Grippi
|
82a31228fa
|
DG IZ; requests bar added to group/edit
|
2010-09-10 15:07:55 -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
|
a15bf73287
|
minor textbox css fix
|
2010-09-08 23:35:07 -07:00 |
|
Daniel Vincent Grippi
|
1c2bfa64a1
|
cleaned login page resources
|
2010-09-08 23:30:08 -07:00 |
|
Daniel Vincent Grippi
|
bb30b69685
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-09-08 20:52:43 -07:00 |
|
Daniel Vincent Grippi
|
134bdab49d
|
group header now has a page_title field.
|
2010-09-08 20:52:35 -07:00 |
|
maxwell
|
3cf7938028
|
MS fixing pagination numbers and couple of other things
|
2010-09-08 20:51:46 -07:00 |
|
maxwell
|
2ce4fb27fa
|
MS; removing some dumb user stuff
|
2010-09-08 20:39:05 -07:00 |
|
maxwell
|
2a9e988b1f
|
MS fixing the zindex on the search
|
2010-09-08 20:03:01 -07:00 |
|
Daniel Vincent Grippi
|
e6114e76f5
|
MS DG more tweaking
|
2010-09-08 19:39:24 -07:00 |
|
Daniel Vincent Grippi
|
ca780f3560
|
DG MS; hide debug info by default. also, made the text lighter.
|
2010-09-08 16:35:30 -07:00 |
|
Daniel Vincent Grippi
|
1e6b309163
|
DG MS; tweaking top nav and publisher.
|
2010-09-08 14:34:42 -07:00 |
|
Daniel Vincent Grippi
|
20d5043e81
|
DG MS; moved tabs around up top
|
2010-09-08 12:52:28 -07:00 |
|
Daniel Vincent Grippi
|
f7dd0b10b9
|
DG MS; changed the gear on top nav to not be a tab
|
2010-09-08 12:34:08 -07:00 |
|
Daniel Vincent Grippi
|
36730978ca
|
login page is more elegant
|
2010-09-08 11:37:54 -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 |
|
Daniel Vincent Grippi
|
2daa31b7bf
|
added a line to the bottom of the publisher
|
2010-09-06 17:28:09 -07:00 |
|
Daniel Vincent Grippi
|
39c366e2e9
|
group edit button up top.
|
2010-09-06 17:22:57 -07:00 |
|
Daniel Vincent Grippi
|
48415b4de8
|
cleaned up group edit a little
|
2010-09-06 13:01:24 -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 |
|
Daniel Vincent Grippi
|
7e909d4034
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-08-31 16:38:52 -07:00 |
|
Daniel Vincent Grippi
|
f9c2e0e76d
|
moved publisher down.wn. header is now a dark grey instead of black.
|
2010-08-31 13:07:11 -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
|
a886b8ddbc
|
made photos for album previews 200x200, small thumbnails now at 50x50
|
2010-08-26 15:13:33 -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 |
|
Raphael
|
c3b75703ac
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-08-25 11:35:56 -07:00 |
|
Raphael
|
3121cf57d3
|
Refactored top nav haml, added non-functional gear link next to group
|
2010-08-25 11:35:50 -07:00 |
|
ilya
|
ea1c3e10ec
|
forgotten to add the actual images
|
2010-08-25 10:19:13 -07:00 |
|
ilya
|
75d5f19a7d
|
added photos to tom and korth
|
2010-08-25 10:17:31 -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
|
d3c10f8777
|
made left column in layout a little wider
|
2010-08-24 19:02:00 -07:00 |
|
Raphael
|
5779610659
|
messed with the views
|
2010-08-24 18:31:16 -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 |
|
maxwell
|
204c910f66
|
MS fixing small bugs, adding a very dump list of a groups that a friend is in for you
|
2010-08-24 15:47:44 -07:00 |
|
maxwell
|
de335e7366
|
MS messed with the temporary group picker thing: whatever, it is less annoying
|
2010-08-24 14:37:47 -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
|
a8803a1c0b
|
fixed flash messages
|
2010-08-23 17:40:59 -07:00 |
|
danielvincent
|
2b125fdc66
|
fixed left friends bar a bit
|
2010-08-23 17:00:40 -07:00 |
|
danielvincent
|
1f59d2ccc4
|
minor ui tweaks
|
2010-08-23 15:55:19 -07:00 |
|
danielvincent
|
f9a19e679f
|
made header shorter
|
2010-08-23 15:27:34 -07:00 |
|
danielvincent
|
41b3117a41
|
removed that annoying rollover on diaspora text
|
2010-08-23 15:13:27 -07:00 |
|
danielvincent
|
4e996f8412
|
user name darker
|
2010-08-23 14:30:20 -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 |
|
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 |
|