Alec Leamas
d572f8fafc
Packaging update
...
Handle git gems by cloning repo to local one, rewriting Gemfile
urls and sending both repos and gems in source packages.
Separate doc dir w licensec.
Gemfile, Gemfile.lock now lives in bundle, linked to application.
Rewrite http git urls to git: to make it uniform & simpler
2010-10-30 18:03:14 +02:00
Alec Leamas
68cba5da98
Merge branch 'se-l10n-update-2' of http://github.com/Hexagon/diaspora into Hexagon-se-l10n-update-2
2010-10-30 09:54:28 +02:00
Raphael
555c15dfef
Simplify validations on user
2010-10-29 16:56:04 -07:00
Hexagon
99661a3240
Added swedish translations
2010-10-30 01:32:32 +02:00
danielvincent
8ec49e685b
going to a non-friend's page contains a way to add them.
2010-10-29 15:43:44 -07:00
zhitomirskiyi
2c0a189df4
removed the session secret from the repo
2010-10-29 12:20:06 -07:00
maxwell
9c2ca15e93
Merge branch 'master' of github.com:diaspora/diaspora
2010-10-29 12:09:32 -07:00
Raphael
d753e31205
Merge remote branch 'ed0h/309-user-choose-language'
...
Add explicit language set to spec in users_controller_spec.rb
Conflicts:
app/models/user.rb
2010-10-29 12:06:14 -07:00
maxwell
47a9b2d189
switching deploy branch to master
2010-10-29 11:39:28 -07:00
maxwell
1e349e6a61
last time
2010-10-29 11:16:50 -07:00
maxwell
1b48572674
MS tests are now green
2010-10-29 11:16:50 -07:00
maxwell
fdb169558a
dont restart servers after db:reset
2010-10-29 11:16:11 -07:00
maxwell
493969e458
trying a timer
2010-10-29 11:16:11 -07:00
maxwell
07b2e7e227
omg i was deploying the wrong branch for the past two hours
2010-10-29 11:15:14 -07:00
maxwell
d89cb53e26
pumping up the zombie sleep to allow for mail to get send out .
2010-10-29 11:13:42 -07:00
maxwell
eddcb71fcb
EM websocket cleanly merged with master. webfingering is now async
2010-10-29 11:11:05 -07:00
maxwell
53e9df5455
pumping up the zombie sleep to allow for mail to get send out .
2010-10-29 11:05:18 -07:00
maxwell
8fe339b03b
EM websocket cleanly merged with master. webfingering is now async
2010-10-29 11:05:17 -07:00
danielvincent
2b4e3e3a41
a person now has a photos#index page.
2010-10-29 10:38:17 -07:00
Alec Leamas
94327264d4
Comments on Swedish diaspora terms, trailing blanks killed
2010-10-29 11:11:56 +02:00
Hexagon
09fb02ec9f
modified: config/locales/diaspora/sv.yml
2010-10-29 00:55:27 +02:00
livefromthemoon@gmail.com
52522c102e
add some basic verification when loading the languages config file
2010-10-28 18:09:25 +02:00
livefromthemoon@gmail.com
c4d8f4e587
remove two useless lines of code
2010-10-28 17:38:45 +02:00
livefromthemoon@gmail.com
b7a586b1a5
allow user to change his language in his settings
2010-10-28 17:29:17 +02:00
danielvincent
1d5b7a87f1
Merge branch 'master' into getting-started
2010-10-27 18:14:08 -07:00
danielvincent
cd726c0ba7
users#getting_started route -> getting_started. getting_started is now a mini-template referring to partials in users/getting_started/
2010-10-27 12:21:25 -07:00
Raphael
16e455958c
Merge remote branch 'hexagon/se-localization'
2010-10-27 11:08:06 -07:00
Raphael
f700eb537a
Add activemodel error message for person to en and fr locales
2010-10-27 10:27:30 -07:00
zhitomirskiyi
634538eff3
IZ MS change back deploy config
2010-10-27 10:13:04 -07:00
zhitomirskiyi
63c740fce7
Merge branch 'master' of github.com:diaspora/diaspora into contact-refactor
2010-10-27 09:53:50 -07:00
danielvincent
a8086f2990
further refinements. added back buttons, more explanation text.
2010-10-26 23:27:26 -07:00
zhitomirskiyi
21c75c08bb
removed the http inspect
2010-10-26 19:19:34 -07:00
zhitomirskiyi
c4b79aebc0
mongo query profing
2010-10-26 18:42:53 -07:00
zhitomirskiyi
0b2e00b7d6
MS IZ the mailer will not be setup unless turned on in the APP_CONFIG
2010-10-26 17:46:19 -07:00
danielvincent
385e1673ab
Merge branch 'master' into getting-started
...
Conflicts:
app/controllers/users_controller.rb
app/views/users/_account.haml
app/views/users/_profile.haml
2010-10-26 16:50:57 -07:00
Raphael
f975199f19
Merge remote branch 'mael/fr-locales'
2010-10-26 16:40:50 -07:00
danielvincent
6e015790a7
settings are more restful with account settings submitting to users#update, and profile settings submitting to person#update
2010-10-26 16:02:53 -07:00
zhitomirskiyi
c0c8c6253c
added a logging line for debugging
2010-10-26 15:13:16 -07:00
danielvincent
69b1b71a5d
removed javascript slider. made each getting_started section its own page. added bio to profile (and changed xml_accessors to xml_readers).
2010-10-26 13:04:47 -07:00
danielvincent
278a74f1f9
draft
2010-10-26 13:04:46 -07:00
maxwell
a992c5fbc2
dont show service if you dont have the keys for it. also, update deploy script
2010-10-25 22:06:53 -07:00
Sarah Mei
33410899d9
Fix for build breakage
2010-10-25 21:38:53 -07:00
danielvincent
a1d00d41e5
deploys back to master
2010-10-25 19:33:23 -07:00
danielvincent
6ff94e67b3
remove unused fb_config.yml files. removed oauth_keys.yml from git, updated .example"
2010-10-25 17:50:04 -07:00
danielvincent
b2e8ebd0bc
OmniauthService -> Service. Cleaned up views.
2010-10-25 17:41:59 -07:00
danielvincent
3d302f8db7
facebook and twitter both use omniauth and are saved as OmniauthServices
2010-10-25 17:41:59 -07:00
maxwell
c489f49a25
DG beginning to collapse twitter&facebook
2010-10-25 17:41:58 -07:00
maxwell
c4ff07b09a
twitter oauth dance complete
2010-10-25 17:41:58 -07:00
Hexagon
1382bd9d08
Fixed header in swedish translation
2010-10-25 21:45:43 +02:00
Hexagon
d617392108
Added/complemented swedish translation
2010-10-25 21:41:32 +02:00
