maxwell
|
3625a5f2f1
|
display a basic message for when nothing was searched for
|
2010-12-09 16:51:58 -08:00 |
|
Raphael
|
3a4caca397
|
Fix photo uploading in profile photos, style photo upload button better
|
2010-12-09 13:06:31 -08:00 |
|
danielvincent
|
faf27fe05a
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-12-08 17:06:39 -08:00 |
|
danielvincent
|
46793179db
|
people#show displays shows public posts for non-contacts as well
|
2010-12-08 16:53:24 -08:00 |
|
maxwell
|
10df61a504
|
order of birthday is now correct for US english, also, you birthday actually sticks on the getting started page
|
2010-12-08 16:35:48 -08:00 |
|
maxwell
|
1f8f07f48d
|
added slightly better error message on aspect update failure
|
2010-12-08 14:21:14 -08:00 |
|
MrZYX
|
806d193f64
|
updated locales
|
2010-12-08 19:21:13 +01:00 |
|
Hexagon
|
80c5c5c9f5
|
Cleaning up revert of #619 pull
|
2010-12-07 22:20:26 +01:00 |
|
MrZYX
|
b1663a710c
|
updated locales. huge thank you to all contributors at 99translations
|
2010-12-07 21:32:15 +01:00 |
|
Raphael
|
9442553504
|
Refactor aspectscontroller and aspect_contacts.haml
|
2010-12-06 17:20:21 -08:00 |
|
Raphael
|
1f71474f0f
|
Small copy change
|
2010-12-06 13:36:20 -08:00 |
|
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 |
|
MrZYX
|
81fd4b6992
|
updated locales from the rails i18n project
|
2010-12-05 14:24:00 +01:00 |
|
Sarah Mei
|
9da69a4b01
|
Mobile log in form is usable. Also, added mixins for sass.
|
2010-12-04 20:45:52 -08:00 |
|
Sarah Mei
|
fea6884acc
|
Mobile homepage looks decent.
|
2010-12-04 19:30:14 -08:00 |
|
danielvincent
|
addbaaeb70
|
JSON::Pure::Generator::State fix when using resque. huge thanks to this post: http://blog.ethanvizitei.com/2010/11/json-pure-ruins-my-morning.html
|
2010-12-04 13:16:30 -08:00 |
|
Iuri Kothe
|
7d847e16d0
|
Added missing translations
|
2010-12-04 18:16:56 -02:00 |
|
danielvincent
|
34a1a35bf1
|
skip getting started is not ajaxy
|
2010-12-04 12:06:08 -08:00 |
|
Iuri Kothe
|
f22289ae0a
|
Added missing translations
|
2010-12-04 13:49:59 -02:00 |
|
maxwell
|
0a831cfbf4
|
invites are now on the queue
|
2010-12-03 19:33:54 -08:00 |
|
danielvincent
|
a7823485c7
|
made http calls synchronous. messagehandler enqueues POSTs into resque.
|
2010-12-03 15:26:52 -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 |
|
maxwell
|
8e8398fdea
|
change the assets to only package in production mode
|
2010-12-03 11:39:38 -08:00 |
|
Raphael
|
3cb0064835
|
Take out server start logging for now, maybe put in a more useful one later"
|
2010-12-03 11:29:49 -08:00 |
|
Raphael
|
d35badd7ea
|
Remove log rotator, it seems to be disrupting log_overrider
|
2010-12-03 11:02:28 -08:00 |
|
MrZYX
|
dd326699bd
|
changed back consumer_token to consumer_key as its not only more consistent with twitters website it also causes less support (less users complaining that their twitter integration is broken) :)
|
2010-12-03 16:04:37 +01:00 |
|
MrZYX
|
a605ab482b
|
made sender address in notifier.rb configurable. This fixes #657
|
2010-12-03 15:49:34 +01:00 |
|
danielvincent
|
7fdbc9015b
|
swapped new invitation lightbox for a proper page.
|
2010-12-03 00:57:53 -08:00 |
|
Raphael
|
3ee246d873
|
Merge branch 'resque-receive'
Conflicts:
Gemfile.lock
|
2010-12-02 19:42:05 -08:00 |
|
maxwell
|
579a288351
|
public posts are now accessible by your friends, and facebook and twitter include a permalink. we prob want to link shorten these bad boys(and it has a max length of 140 chars, with a permalink), also, facebook and twitter posting are sync, but that will make it more reliable
|
2010-12-02 18:48:50 -08:00 |
|
maxwell
|
11f04a060e
|
frustrated
|
2010-12-02 18:48:50 -08:00 |
|
maxwell
|
b9131c0e46
|
pushing to my website for further debugging
|
2010-12-02 18:47:48 -08:00 |
|
maxwell
|
38d9d75162
|
posts now have public permalinks
|
2010-12-02 18:47:48 -08:00 |
|
Raphael
|
8798f05ff7
|
Revert "Revert redis merge to fix bugs on master"
This reverts commit 30698d674b.
|
2010-12-02 15:33:26 -08:00 |
|
Raphael
|
30698d674b
|
Revert redis merge to fix bugs on master
|
2010-12-02 15:20:27 -08:00 |
|
Raphael
|
236fbc7cc7
|
Final adjustments to fix resque worker
|
2010-12-02 12:35:26 -08:00 |
|
Raphael
|
6cfa6577a5
|
Add first resque job
|
2010-12-02 12:35:26 -08:00 |
|
Raphael
|
cee5e4c26e
|
Bring in resque recipes and rake tasks
|
2010-12-02 12:35:26 -08:00 |
|
danielvincent
|
8cb2a3a79a
|
resque init, config, gemfile
|
2010-12-02 12:35:26 -08:00 |
|
Raphael
|
db0106f13c
|
Rename EMWebfinger to Webfinger, clean up some related things
|
2010-12-02 12:35:25 -08:00 |
|
Sarah Mei
|
a09f299cfa
|
Revert "Added translation scaffold for inflection of nouns by grammatical gender in some languages."
This reverts commit 65c796572d.
|
2010-12-01 22:29:32 -08:00 |
|
Sarah Mei
|
d5c32b6a56
|
Revert "Genderize#translate fixed and enhanced (now it accepts User objects to fix the gender)."
This reverts commit eb2d186a12.
|
2010-12-01 22:29:27 -08:00 |
|
maxwell
|
e18b918676
|
MS DG only show three comments by default
|
2010-12-01 18:09:41 -08:00 |
|
Raphael
|
8d853a88a3
|
Remove some old views, clean up routes, clean up.
|
2010-12-01 15:38:56 -08:00 |
|
Raphael
|
f0df1ec8df
|
Remove dev utilities controller
|
2010-12-01 15:38:56 -08:00 |
|
Raphael
|
ef083c6770
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-12-01 11:21:36 -08:00 |
|
Raphael
|
5791ffba79
|
Add administrative mail method
|
2010-12-01 11:20:10 -08:00 |
|
Paweł Wilk
|
eb2d186a12
|
Genderize#translate fixed and enhanced (now it accepts User objects to fix the gender).
|
2010-12-01 17:29:04 +01:00 |
|
Paweł Wilk
|
65c796572d
|
Added translation scaffold for inflection of nouns by grammatical gender in some languages.
|
2010-12-01 17:29:04 +01:00 |
|