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
|
e2c0ae2cee
|
Merge branch 'master' of github.com:diaspora/diaspora_rails
|
2010-08-04 16:01:37 -07:00 |
|
Raphael
|
c245d8c60c
|
Merging ostatus deletion with selenium start
|
2010-08-04 16:01:19 -07:00 |
|
danielvincent
|
75663b2447
|
DG MS; user can edit photo caption. also, photos have captions.
|
2010-08-04 16:00:59 -07:00 |
|
Raphael
|
58addca8dd
|
RS, IZ; extracted and murdered ostatus.
|
2010-08-04 16:00:01 -07:00 |
|
danielvincent
|
09958bc207
|
DG MS; removed delete friend button from current user's show page
|
2010-08-04 15:43:24 -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
|
6fe00982f2
|
RS, IZ, fixing another error on person show
|
2010-07-30 10:32:36 -07:00 |
|
Raphael
|
0fd35709b1
|
RS, IZ, fixing error on person show with no posts
|
2010-07-30 10:26:00 -07:00 |
|
Raphael
|
e7ef3c06ed
|
Websocketed photos now fade in
|
2010-07-30 10:20:50 -07:00 |
|
ilya
|
27bf29119d
|
restoring display inline
|
2010-07-29 18:03:18 -07:00 |
|
ilya
|
085ea0a665
|
RS, IZ, DG Removing display inline
|
2010-07-29 17:59:44 -07:00 |
|
ilya
|
f6495e2bec
|
RS IZ photos now fade in on the album upload page
|
2010-07-29 17:26:05 -07:00 |
|
Raphael
|
a636d97837
|
Removed crash if there was no latest status message
|
2010-07-29 14:38:46 -07:00 |
|
danielvincent
|
fd4475370d
|
added profile url to author show page
|
2010-07-29 10:30:24 -07:00 |
|
maxwell
|
cb3d6db9b0
|
Merge branch 'master' of github.com:diaspora/diaspora_rails
|
2010-07-29 10:06:11 -07:00 |
|
maxwell
|
7a0db375ab
|
MS added rails 3rc
|
2010-07-29 09:59:03 -07:00 |
|
ilya
|
c8b40001e5
|
IZ album edit page was not added
|
2010-07-28 21:10:35 -07:00 |
|
ilya
|
96a9c9455d
|
DG IZ; make photos in stream larger, because they need love too
|
2010-07-28 17:46:43 -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
|
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 |
|
ilya
|
9e3c6a0936
|
DG IZ; brushed up ostatus user page
|
2010-07-28 12:13:36 -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
|
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
|
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
|
9dd5c08296
|
fixed two small UI bugs
|
2010-07-27 14:45:04 -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
|
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
|
bda87bbeab
|
MS switched request new links to just the request link
|
2010-07-26 18:13:20 -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
|
65acd48885
|
Merge branch 'master' of github.com:diaspora/diaspora_rails
|
2010-07-26 15:52:02 -07:00 |
|
danielvincent
|
36abb19e2c
|
added the uploading photo wjava script
|
2010-07-26 15:50:41 -07:00 |
|
maxwell
|
88c83bb028
|
MS added pagination to the author show page
|
2010-07-26 15:15:42 -07:00 |
|
maxwell
|
47f5c77e1a
|
kinda prettied up the albums page
|
2010-07-26 15:09:02 -07:00 |
|
maxwell
|
d7550568ad
|
added pagination to photo picker on the user profile. still ugly, less sucky
|
2010-07-26 13:55:44 -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 |
|
maxwell
|
2cbdc5413f
|
MS nuked some random non helpful puts statements
|
2010-07-24 12:12:48 -07:00 |
|
danielvincent
|
261a7d177d
|
fixed for real
|
2010-07-24 11:09:25 -07:00 |
|
danielvincent
|
926eacc588
|
mend
|
2010-07-24 10:37:35 -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
|
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 |
|
maxwell
|
302cf54fab
|
MS subscribers should now unsubscribe
|
2010-07-23 21:31:28 -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
|
7eb59a654c
|
Merge branch 'master' of github.com:diaspora/diaspora_rails
|
2010-07-23 20:12:37 -07:00 |
|
danielvincent
|
d93c331615
|
moved publisher
|
2010-07-23 20:12:28 -07:00 |
|
ilya
|
2fa9462e05
|
Next and Previous for photos buttions are now in the center
|
2010-07-23 20:09:52 -07:00 |
|
danielvincent
|
ad61c290fb
|
took current user's name out of the layout
|
2010-07-23 19:44:34 -07:00 |
|
ilya
|
61a9ba7a6e
|
put album owner on unless mine
|
2010-07-23 16:36:59 -07:00 |
|
ilya
|
48975cc59e
|
put album owner on album show page
|
2010-07-23 16:33:10 -07:00 |
|
ilya
|
4eccf63fef
|
Can't upload to other people's album
|
2010-07-23 16:26:05 -07:00 |
|
ilya
|
1c0d5f6e6b
|
Removing destroy link from albums that are not yours
|
2010-07-23 16:07:15 -07:00 |
|
ilya
|
79aa12ee67
|
RS IZ Removing the destroy link from photos
|
2010-07-23 15:59:42 -07:00 |
|
maxwell
|
dfad30e33b
|
MS typo
|
2010-07-22 22:34:30 -07:00 |
|
maxwell
|
3e3fcc57f9
|
MS author author?
|
2010-07-22 22:32:47 -07:00 |
|
maxwell
|
1f414c9347
|
MS so close to subscribing to tantek
|
2010-07-22 22:30:08 -07:00 |
|
maxwell
|
0fdce91756
|
DG MS added views for ostatus following
|
2010-07-22 21:27:43 -07:00 |
|
maxwell
|
3f4219cf94
|
added debugging stuff to index page for ostatus stuffs
|
2010-07-22 20:19:52 -07:00 |
|
maxwell
|
21bd875a3f
|
MS DG request bar fix, and some other small tweaks
|
2010-07-21 16:38:33 -07:00 |
|
maxwell
|
6f7f82e818
|
added helpers for photo show page
|
2010-07-21 15:47:30 -07:00 |
|
maxwell
|
a5f359ef1b
|
MS DG added a safe for viewing photosize
|
2010-07-21 15:08:00 -07:00 |
|
maxwell
|
0f407b11ed
|
MS DG comments now work on photo show page; full size photos now available
|
2010-07-21 14:58:06 -07:00 |
|
maxwell
|
695a93ddad
|
DG MS added basic album traversal
|
2010-07-21 14:29:58 -07:00 |
|
danielvincent
|
d5c28eb9a6
|
album photos as links were too janky; removed
|
2010-07-21 00:42:41 -07:00 |
|
danielvincent
|
5fc2dfa0bb
|
delete links removed from album index
|
2010-07-21 00:40:57 -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 |
|
Raphael
|
afc150c719
|
Reverting reverrsion
|
2010-07-20 11:56:11 -07:00 |
|
Raphael
|
382caf7adc
|
Reverting last commit
|
2010-07-20 11:53:13 -07:00 |
|
Raphael
|
7b6289c78a
|
Took label out of publisher for photo
|
2010-07-20 11:52:38 -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 |
|