MrZYX
|
b84b6ea9e4
|
some fixes to translations
|
2010-12-05 16:02:52 +01:00 |
|
MrZYX
|
81fd4b6992
|
updated locales from the rails i18n project
|
2010-12-05 14:24:00 +01:00 |
|
danielvincent
|
e9742acc32
|
reverting http_post to a working state
|
2010-12-05 02:08:29 -08:00 |
|
danielvincent
|
d7407b7aa6
|
request -> resource
|
2010-12-05 02:03:03 -08:00 |
|
danielvincent
|
737e6084df
|
actually setting the timeout in restclient
|
2010-12-05 01:54:16 -08:00 |
|
Sarah Mei
|
ecc537c737
|
Stub Jobs::ReceiveSalmon.perform in controller test
|
2010-12-05 01:31:19 -08:00 |
|
danielvincent
|
648614aea5
|
add 4 sec timeout to restclient
|
2010-12-05 01:26:31 -08:00 |
|
maxwell
|
53b38a3bca
|
fixing p-controller for real
|
2010-12-05 00:52:45 -08:00 |
|
maxwell
|
65c22020e8
|
fixing photo controllers spec
|
2010-12-05 00:45:13 -08:00 |
|
maxwell
|
2c09c35425
|
MS DG photos now delete sm if they are empty status messages, and status messages delete their photos
|
2010-12-05 00:45:13 -08:00 |
|
maxwell
|
a415ff5c5f
|
fixed the build. made photos dependent destroy with parent status message
|
2010-12-05 00:45:13 -08:00 |
|
Raphael
|
cc3db3d2f3
|
Uhh...
|
2010-12-05 00:20:46 -08:00 |
|
Raphael
|
c320dae589
|
Add a cuke for being invited by someone
|
2010-12-05 00:15:37 -08:00 |
|
Raphael
|
36e1fb8b2c
|
Fix a couple local-posting specs
|
2010-12-04 23:38:31 -08:00 |
|
Raphael
|
c99796f5db
|
Extra spec on find_for_authentication
|
2010-12-04 23:15:22 -08:00 |
|
Raphael
|
c09c060ebb
|
Beginning of user invitation acceptance feature
|
2010-12-04 23:07:52 -08:00 |
|
maxwell
|
03a5514400
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-12-04 23:06:58 -08:00 |
|
maxwell
|
0a8af9e72b
|
DG MS some fixes for getting started
|
2010-12-04 23:05:47 -08:00 |
|
OhaiBBQ
|
4bbbbf6bb1
|
tipsy on sidebar avatars
|
2010-12-05 09:44:10 +03:00 |
|
Raphael
|
61e40debb5
|
Fix in find_for_authentication
|
2010-12-04 22:25:28 -08:00 |
|
maxwell
|
23c446c8bf
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-12-04 21:57:55 -08:00 |
|
Sarah Mei
|
9da69a4b01
|
Mobile log in form is usable. Also, added mixins for sass.
|
2010-12-04 20:45:52 -08:00 |
|
danielvincent
|
03961bce7b
|
removed last reference to invitation fancybox
|
2010-12-04 20:06:24 -08:00 |
|
maxwell
|
fb310560df
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-12-04 19:37:47 -08:00 |
|
Michael Sofaer
|
9e575ea765
|
MS RS Get the fake queue working when it's nested, and push local dispatch onto the queues
|
2010-12-04 19:36:22 -08:00 |
|
danielvincent
|
4c4f5c6aa4
|
dispatch moved to resque. one failing test, globally stubbed out resque enqueue temporarily. TO AMEND.
|
2010-12-04 19:36:22 -08:00 |
|
maxwell
|
68e7fdf6b7
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-12-04 19:34:14 -08:00 |
|
maxwell
|
b56b2fbd1b
|
added spec for periods in usernames; unpendify a couple of specs
|
2010-12-04 19:33:58 -08:00 |
|
Sarah Mei
|
fea6884acc
|
Mobile homepage looks decent.
|
2010-12-04 19:30:14 -08:00 |
|
maxwell
|
b3ca504c40
|
no periods in username
|
2010-12-04 19:28:08 -08:00 |
|
OhaiBBQ
|
1b7749f282
|
typo on last commit
|
2010-12-05 06:21:06 +03:00 |
|
OhaiBBQ
|
05f54e0ebd
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-12-05 06:18:30 +03:00 |
|
OhaiBBQ
|
78ac693dcd
|
only tipsy on avatars in left_pane and manage_aspect_zone
|
2010-12-05 06:17:14 +03:00 |
|
Sarah Mei
|
06cc99b19e
|
git ignores mobile.css
|
2010-12-04 19:16:14 -08:00 |
|
Sarah Mei
|
c3736729c9
|
removing mobile.css from git
|
2010-12-04 19:16:14 -08:00 |
|
danielvincent
|
c4db32c253
|
adding jquery 1.4.4 back re sentientwaffle's fix.
|
2010-12-04 18:59:01 -08:00 |
|
sentientwaffle
|
b303cf6830
|
fixed issue with post deletion confirmation for the latest verison of jquery
|
2010-12-04 18:55:15 -08:00 |
|
Philip Champon
|
47ae57d4dd
|
Issue #650: this closes the netstat on mac problem http://bugs.joindiaspora.com/issues/650
|
2010-12-04 18:52:07 -08:00 |
|
Philip Champon
|
213f1c5e42
|
fixed bsd netstat issue
|
2010-12-04 18:52:07 -08:00 |
|
maxwell
|
8fb97072df
|
Merge branch '583-password-person-conflict' of https://github.com/flah00/diaspora into flah00-583-password-person-conflict
|
2010-12-04 18:40:17 -08:00 |
|
Sarah Mei
|
c9f7866955
|
Random extra spec for people_controller
|
2010-12-04 18:13:15 -08:00 |
|
maxwell
|
23eb192524
|
double the time that notifications are seen on the page
|
2010-12-04 17:45:52 -08:00 |
|
maxwell
|
55c0bd684b
|
remove some puts
|
2010-12-04 17:43:15 -08:00 |
|
maxwell
|
e47730b63f
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-12-04 17:39:19 -08:00 |
|
danielvincent
|
105c788bf8
|
fixed comment js. fadeToggle is only supported in jquery >= 1.4.4
|
2010-12-04 17:37:57 -08:00 |
|
danielvincent
|
948707ea23
|
rolling back jquery. <= 1.4.3 has compatability issues with rails js helpers
|
2010-12-04 17:22:22 -08:00 |
|
Michael Sofaer
|
a522655a19
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-12-04 17:19:11 -08:00 |
|
Michael Sofaer
|
3ca89bde57
|
Put photos create spec back in. I am not going to check who left it pending.
|
2010-12-04 17:18:08 -08:00 |
|
danielvincent
|
4251a3a093
|
prompt to 'get the conversation started' on new aspect page fades out when first message in aspect is posted
|
2010-12-04 17:02:29 -08:00 |
|
maxwell
|
b9ab799569
|
ironing out invites
|
2010-12-04 16:49:45 -08:00 |
|