zhitomirskiyi
|
152998311f
|
added the comments as well as loading of app config
|
2010-11-19 11:25:13 -08:00 |
|
zhitomirskiyi
|
481204a157
|
mongo cloudfiles backup task
|
2010-11-19 10:57:28 -08:00 |
|
MrZYX
|
6f5c3f3258
|
made recent changes translatable and cleanup up en.yml a bit
|
2010-11-19 17:25:45 +01:00 |
|
Jonne Hass
|
f426c08dcc
|
made shared/_contatct_list.html.haml
and the type after "viewing:" in shared/_author_info.html.haml translatable
|
2010-11-19 17:25:05 +01:00 |
|
Alec Leamas
|
50eb0a9242
|
Pkg update
|
2010-11-19 17:04:11 +01:00 |
|
MrZYX
|
7200c007e5
|
made file uploader translatable
|
2010-11-19 15:25:14 +01:00 |
|
maxwell
|
466120cd58
|
fixing extra =
|
2010-11-18 20:07:57 -08:00 |
|
zhitomirskiyi
|
ff5e32d2b8
|
begining of a rake task for mongo backup
|
2010-11-18 18:38:03 -08:00 |
|
Raphael
|
655e92ebdd
|
Add some scopes for Request, take putses out of specs
|
2010-11-18 18:04:29 -08:00 |
|
Raphael
|
bad76d8cef
|
Use pod url in host-meta
|
2010-11-18 17:02:13 -08:00 |
|
zhitomirskiyi
|
c2dcf9a074
|
fixed the invite spec
|
2010-11-18 16:55:44 -08:00 |
|
Raphael
|
78f2f74186
|
Fix photo exporting, I'm not sure how to use
Kernel::system in this case, so using ``
|
2010-11-18 16:41:34 -08:00 |
|
zhitomirskiyi
|
d0d261fdae
|
zero default invites, the rake task starts people with 5 invites
|
2010-11-18 16:23:35 -08:00 |
|
Raphael
|
5a2b3cd0a7
|
Fix build
|
2010-11-18 16:06:44 -08:00 |
|
Raphael
|
6841ffbecc
|
Disable_with on comment form
|
2010-11-18 15:41:51 -08:00 |
|
Raphael
|
c7b8c185bd
|
Disable with on publisher form
|
2010-11-18 15:41:51 -08:00 |
|
maxwell
|
c0d10ef174
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-11-18 15:36:47 -08:00 |
|
maxwell
|
747ab761a0
|
pushing mailer spec for ilya
|
2010-11-18 15:36:30 -08:00 |
|
Alec Leamas
|
5b8eb2cacd
|
Production/test mode somment in config/server.sh
|
2010-11-19 00:34:10 +01:00 |
|
zhitomirskiyi
|
0e171e8504
|
added a fixed the pending request query
|
2010-11-18 15:22:14 -08:00 |
|
zhitomirskiyi
|
c8c0b5c8a2
|
made the service image the same size
|
2010-11-18 15:22:14 -08:00 |
|
maxwell
|
cb23fd495b
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-11-18 15:18:07 -08:00 |
|
maxwell
|
970d56a007
|
basic batch inviter
|
2010-11-18 15:17:22 -08:00 |
|
Raphael
|
22aa0d3f26
|
Updating Gemfile.locl
|
2010-11-18 15:14:01 -08:00 |
|
MrZYX
|
dcbcaefcbe
|
added language codes map
|
2010-11-18 15:13:30 -08:00 |
|
MrZYX
|
60375422e7
|
pulled update for sk.yml from the rails i18n project
|
2010-11-18 15:13:30 -08:00 |
|
MrZYX
|
3f76699805
|
pulled update for et.yml from rails i18n
|
2010-11-18 15:13:30 -08:00 |
|
MrZYX
|
13ca682734
|
added locales from the rails-i18n project, removed rails-i18n parts from existing locales, added script to update rails-i18n locales
|
2010-11-18 15:13:30 -08:00 |
|
Raphael
|
61692c1da6
|
Fix translation missing in inv mailer
|
2010-11-18 12:50:46 -08:00 |
|
maxwell
|
8c092649f2
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-11-18 12:37:02 -08:00 |
|
maxwell
|
585ab020f8
|
move back to magent master
|
2010-11-18 12:36:47 -08:00 |
|
zhitomirskiyi
|
f95fd33ed4
|
typo
|
2010-11-18 12:22:39 -08:00 |
|
zhitomirskiyi
|
9a31d15c92
|
added icons for the connected services and to indicate the rss feed
|
2010-11-18 12:19:58 -08:00 |
|
Raphael
|
187e9ac198
|
Merge remote branch 'jandom/475-Chore-Add-missing-polish-locales'
|
2010-11-18 11:59:55 -08:00 |
|
Raphael
|
c564d2819e
|
Fixing no contacts link in _no_contacts. Thanks to alepane21.
|
2010-11-18 11:55:03 -08:00 |
|
Raphael
|
589c36d1ed
|
Merge remote branch 'hex/duplicate-ids'
|
2010-11-18 11:39:03 -08:00 |
|
Raphael
|
be55384628
|
Add pending spec to invitations
|
2010-11-18 11:21:35 -08:00 |
|
Raphael
|
47dc91fae4
|
Make link to getting started page in cucumber feature work
|
2010-11-18 11:16:18 -08:00 |
|
Matt Baker
|
b2e6caafed
|
Don't show skip link if user.getting_started == false
|
2010-11-18 11:16:18 -08:00 |
|
maxwell
|
597258615b
|
adding star back to title
|
2010-11-18 11:06:17 -08:00 |
|
maxwell
|
3b88121244
|
dammit jammit... dont package always dur
|
2010-11-18 09:24:01 -08:00 |
|
Alec Leamas
|
4599f700e6
|
Show error cause in websocket_server, trailing blanks.
Related to, but does not solve http://bugs.joindiaspora.com/issues/540.
|
2010-11-18 14:51:47 +01:00 |
|
maxwell
|
9882fa183d
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-11-17 23:19:27 -08:00 |
|
maxwell
|
2ffd2d93e3
|
made mailchimp form ssl
|
2010-11-17 23:19:12 -08:00 |
|
danielvincent
|
b8e04d4888
|
rescue jammit if java isn't installed on the system. server will continue starting normally if this is the case.
|
2010-11-17 23:00:40 -08:00 |
|
Sarah Mei
|
d1a745c9cd
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-11-17 22:42:04 -08:00 |
|
danielvincent
|
eda346e283
|
use google's jquery within current protocol (http/https)
|
2010-11-17 22:36:01 -08:00 |
|
Sarah Mei
|
64237534fd
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-11-17 22:31:21 -08:00 |
|
Sarah Mei
|
c19ebcece3
|
Request delete now returns head :ok instead of redirecting. On client side, request div is removed.
|
2010-11-17 22:28:24 -08:00 |
|
maxwell
|
f01fca1877
|
letting jammit do its default thing
|
2010-11-17 22:18:15 -08:00 |
|