MrZYX
|
4df13d56e1
|
made that latest change translatable
|
2010-12-05 16:02:52 +01:00 |
|
MrZYX
|
b84b6ea9e4
|
some fixes to translations
|
2010-12-05 16:02:52 +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 |
|
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
|
c320dae589
|
Add a cuke for being invited by someone
|
2010-12-05 00:15:37 -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 |
|
Raphael
|
61e40debb5
|
Fix in find_for_authentication
|
2010-12-04 22:25:28 -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 |
|
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 |
|
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 |
|
danielvincent
|
c4db32c253
|
adding jquery 1.4.4 back re sentientwaffle's fix.
|
2010-12-04 18:59:01 -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 |
|
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
|
948707ea23
|
rolling back jquery. <= 1.4.3 has compatability issues with rails js helpers
|
2010-12-04 17:22:22 -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 |
|
maxwell
|
b9ab799569
|
ironing out invites
|
2010-12-04 16:49:45 -08:00 |
|
maxwell
|
b300adbef5
|
fixed a potentially bad bug with nil invite tokens
|
2010-12-04 16:13:44 -08:00 |
|
maxwell
|
4c3de52f68
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-12-04 16:03:54 -08:00 |
|
maxwell
|
8306cfffde
|
add token back to invite form
|
2010-12-04 16:03:35 -08:00 |
|
danielvincent
|
d1ad2efed1
|
HttpPost job now follows redirects
|
2010-12-04 15:23:54 -08:00 |
|
danielvincent
|
177cc16e2f
|
fixed the build
|
2010-12-04 14:26:13 -08:00 |
|
maxwell
|
88aa67dba7
|
actually put the post in the xml param where we expecting it. also, throw the errors so we know in whats going on in resque
|
2010-12-04 13:54:39 -08:00 |
|
danielvincent
|
34a1a35bf1
|
skip getting started is not ajaxy
|
2010-12-04 12:06:08 -08:00 |
|
maxwell
|
544ab993ac
|
only show the url when the post has photos
|
2010-12-04 11:58:34 -08:00 |
|
danielvincent
|
c29bc0ce65
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-12-03 23:40:25 -08:00 |
|
danielvincent
|
47b6d66b83
|
fixed proportions in stream, etc.
|
2010-12-03 23:38:29 -08:00 |
|
maxwell
|
c5f2e8bb2d
|
now you can not invite yourself. we have a bug as send_contact_request_to was taken out but Invitation still used it
|
2010-12-03 22:58:37 -08:00 |
|
maxwell
|
7dce94814c
|
fixing the invite user job
|
2010-12-03 22:41:16 -08:00 |
|
maxwell
|
94c7b86a55
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-12-03 19:34:12 -08:00 |
|
maxwell
|
0a831cfbf4
|
invites are now on the queue
|
2010-12-03 19:33:54 -08:00 |
|
danielvincent
|
5da5ee26bb
|
two column aspect listing on manage page. made avatars smaller.
|
2010-12-03 16:22:20 -08:00 |
|
maxwell
|
0684c40660
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-12-03 15:51:44 -08:00 |
|
maxwell
|
b8ece9381a
|
fixing up public image show
|
2010-12-03 15:48:27 -08:00 |
|
danielvincent
|
a7823485c7
|
made http calls synchronous. messagehandler enqueues POSTs into resque.
|
2010-12-03 15:26:52 -08:00 |
|
maxwell
|
f4fa3191bc
|
just call Jobs::Receive directly for now
|
2010-12-03 15:03:32 -08:00 |
|
maxwell
|
c99bc05886
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-12-03 13:58:12 -08:00 |
|
maxwell
|
85a85716c6
|
made user sign up and invitation accept slightly nicer, w/tipsy tooltips and instructions
|
2010-12-03 13:57:47 -08:00 |
|
Philip Champon
|
2633dbc268
|
Issue 658: user object creation comes before person object creation,
preventing spurrious handle creation errors, if user creation
fails
|
2010-12-03 14:59:35 -05:00 |
|
danielvincent
|
71cae6b89f
|
Move request mail into resque
|
2010-12-03 11:51:04 -08:00 |
|