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
Paweł Wilk
279b08ae4a
Added inflection of nouns by the grammatical gender for some languages.
...
- New module I18n::Backend::Genderize keeps configuration and adds :gender option to translate().
- Module methods in Genderize allow fast checking if language needs gender and guessing gender.
- jQuery in views/users/edit.html.haml shows and hides grammatical gender select list when needed.
- Span and select list in views/users/edit.html.haml allows to choose grammatical gender.
- Key :grammatical_gender in User model keeps grammatical gender information.
- Added some methods to language_helper.rb.
- UsersController is aware of grammatical gender and is able to guess it when "getting started".
2010-12-01 17:29:04 +01:00
danielvincent
601284a171
make profile photo action uses :remote=>true rails ajax helpers. added photos#make_profile_photo.
2010-11-30 15:58:26 -08:00
maxwell
ec05c21472
profile now knows about three images sizes, even in federation case
2010-11-30 13:40:41 -08:00
maxwell
17a890676e
added a link in footer to this instances code. obey the agpl yo.
2010-11-29 16:46:43 -08:00
maxwell
808b4af5c7
adding warning to startup about making sure mongo is bound to localhost
2010-11-29 14:50:38 -08:00
Hexagon
d69bca28ef
Merge branch 'master' of github.com:diaspora/diaspora
2010-11-29 22:56:01 +01:00
Hexagon
7bb32de899
Fixed #638 , forcing trailing slash on pod url
2010-11-29 22:55:43 +01:00
MrZYX
d8bc610adb
Merge branch '99translations' of ../diaspora-fork
2010-11-29 22:09:36 +01:00
MrZYX
f94e079006
updated locales - finish is at 100% - thanks to all contributors
2010-11-29 21:53:52 +01:00
masterdot
35feccbb2c
added support for tracking via piwik.
...
if piwik_id is not set no javascript will be included. it may be both enabled, aganalytics and piwik.
2010-11-29 10:26:47 +01:00
Hexagon
e05c113e27
Merge branch 'master' of https://github.com/jamiew/diaspora
2010-11-28 20:33:40 +01:00
MrZYX
673fd38a2c
updated locales - big thank you to all people at 99translations
2010-11-28 15:33:17 +01:00
danielvincent
d7c5e12d64
move photo-show js to assets. remove EM::next_tick from controller#create actions. make photo show pages render again.
2010-11-28 02:30:25 -05:00
danielvincent
3ada121d0b
contact-js as its own file
2010-11-28 00:29:22 -05:00
Jamie Wilkinson
0906f38f6d
Use HAML ugly mode in production
2010-11-27 14:32:57 -08:00
Hexagon
5a90cfd680
Fixed #580 , exception when using phusion passenger, thanks yarishima42
2010-11-27 12:53:37 +01:00
MrZYX
434a4dab67
Merge branch 'more-translatable' of ../diaspora-fork
2010-11-27 02:51:32 +01:00
MrZYX
ad6d6d5efa
lib/em-websocket.rb is now even more translatable
2010-11-27 02:43:49 +01:00
MrZYX
d502588fd6
Merge branch '99translations' of ../diaspora-fork
2010-11-27 01:52:12 +01:00
MrZYX
c213b42d10
updated locales - some are at 100% again - as always all the credits are going to the users at 99translations.com
2010-11-27 01:51:27 +01:00
Maxwell Salzberg
0d8488a5f7
set default to false for invites being off
2010-11-26 16:38:49 -08:00
Maxwell Salzberg
8aa37e5e81
pod != seed
2010-11-26 16:37:46 -08:00
