danielgrippi
775e7b6b2b
Merge branch 'master' into follow
...
Conflicts:
features/step_definitions/user_steps.rb
2011-05-17 11:33:35 -07:00
MrZYX
401b198bbf
--amend
2011-05-17 16:02:37 +02:00
MrZYX
00c6631f11
replaced SOCKET_PORT in config/server.sh with the setting from config/app_config.yml; respect single_process_mode setting in app_config.yml in script/server
2011-05-17 16:00:47 +02:00
danielgrippi
7042b43799
use appconfig instead of config
2011-05-16 18:54:50 -07:00
danielgrippi
55d39521c4
rescue redis connection attempts in websocket
2011-05-16 18:34:37 -07:00
danielgrippi
8821043ed7
work in process
2011-05-16 18:27:12 -07:00
danielgrippi
8d7b0b2c4c
take out animations in inf scroll.
2011-05-16 16:55:24 -07:00
danielgrippi
7eaca0346c
Merge branch 'master' into follow
...
Conflicts:
config/assets.yml
public/stylesheets/sass/_mixins.scss
spec/models/user/posting_spec.rb
2011-05-16 14:56:28 -07:00
MrZYX
8c1e64a080
updated locales
2011-05-16 21:02:15 +02:00
MrZYX
20231891d2
updated locales
2011-05-15 22:57:08 +02:00
MrZYX
7e6cae9f96
updated locales
2011-05-15 01:32:06 +02:00
Sarah Mei
43ab8cfcfa
Tell devise that :mobile is a navigational format.
2011-05-14 15:46:56 -07:00
Sarah Mei
c8e9225dfb
For the love of god, normal Rails logs in test & development.
...
There's now a setting in app_config.yml, :enable_splunk_logging, which if true outputs godawful machine-readable splunk logs. It's false in test and development, and true elsewhere.
2011-05-14 13:29:54 -07:00
danielgrippi
666fb76bfc
login as its own js file. accounted for the autofil state
2011-05-13 22:27:08 -07:00
Raphael Sofaer
32ceb278bf
Restore deploy.rb
2011-05-13 16:35:55 -07:00
Raphael Sofaer
a4f81c6410
Finish fixing password changing and keeping emails downcased
2011-05-13 16:32:07 -07:00
Raphael Sofaer
f8b7307441
Downcase emails upon inviting
2011-05-13 16:32:07 -07:00
Raphael Sofaer
a46ff394b1
update devise_invitable and devise
2011-05-13 16:32:07 -07:00
danielgrippi
402e84708b
ms iz; everything is green, the sharewith is translated in js, fixed the clicking on the checkbox bug
2011-05-13 16:05:37 -07:00
MrZYX
b7540ba6ab
updated locales
2011-05-14 00:04:43 +02:00
danielgrippi
c200c386fb
pulled new aspect into modal window
2011-05-13 11:58:18 -07:00
danielgrippi
60a60733df
Merge branch 'master' into follow
...
Conflicts:
app/controllers/aspects_controller.rb
app/controllers/contacts_controller.rb
app/controllers/people_controller.rb
app/controllers/photos_controller.rb
app/controllers/tags_controller.rb
app/helpers/notifications_helper.rb
app/models/notifications/new_request.rb
app/models/user_preference.rb
public/javascripts/view.js
spec/controllers/aspects_controller_spec.rb
spec/controllers/contacts_controller_spec.rb
spec/controllers/home_controller_spec.rb
spec/controllers/post_visibilities_controller_spec.rb
spec/controllers/requests_controller_spec.rb
spec/mailers/notifier_spec.rb
spec/models/user_spec.rb
2011-05-12 15:49:51 -07:00
danielgrippi
4280417e41
broke out dropdown into its own partial. aspect dropdown on person show. user menu fixed
2011-05-11 18:33:17 -07:00
Jerin Philip
ae2a0528b7
Edited config/locales/diaspora/ml.yml via GitHub
2011-05-12 05:43:30 +05:30
Jerin Philip
0a84f3d011
Edited config/locales/diaspora/ml.yml via GitHub
2011-05-12 05:43:30 +05:30
Jerin Philip
ca1f148094
Edited config/locales/diaspora/ml.yml via GitHub
2011-05-12 05:43:30 +05:30
Anish A
ae5e37a3c2
Added rest of jerrinphilip's translations
2011-05-12 05:43:30 +05:30
Anish A
bd4aa14a3c
Translations of jerrinphilip
2011-05-12 05:42:28 +05:30
danielgrippi
7893129435
prevent user from hitting aspectmemberships controller before response on dropdowns
2011-05-11 17:07:58 -07:00
Raphael Sofaer
cb49d1f4ea
fixed the formatting on emails
2011-05-11 17:02:05 -07:00
danielgrippi
9f3044838d
Views for contactscontroller#sharing almost done, cuke for editing aspect memberships started
2011-05-11 14:53:43 -07:00
Raphael Sofaer
b8d9610877
added translation to the likes popup, made the notification models a little clearer
2011-05-11 13:50:26 -07:00
danielgrippi
ebb17ff70c
few cucumber steps failing. wip.
2011-05-11 11:08:30 -07:00
danielgrippi
dfeb4f3a13
use .js response convention for remote likeke behavior
2011-05-11 11:08:30 -07:00
danielgrippi
8b081a48b4
likes controller now has destroy method. commented out dislikes from views. unlike links not functional.
2011-05-11 11:08:29 -07:00
MrZYX
4a24e90671
updated locales
2011-05-11 17:04:47 +02:00
zhitomirskiyi
469d5b99a2
WIP added a share view, tests are red
2011-05-09 16:55:22 -07:00
MrZYX
35d929c217
updated locales
2011-05-09 13:40:28 +02:00
Raphael Sofaer
ffd96d989c
Update publisher callback to use ContentUpdater
2011-05-08 20:31:13 -07:00
Dan Hansen
fc25c9bedb
Flash message handling is now a widget
2011-05-08 10:53:09 -05:00
MrZYX
8261547ed9
added arabic
2011-05-08 01:02:33 +02:00
MrZYX
3ee6fc0403
Merge branch 'master' of git://gitorious.org/diaspora-l10n-ca/diaspora-l10n-ca
2011-05-08 01:00:16 +02:00
MrZYX
92089f97e9
updated locales
2011-05-08 01:00:09 +02:00
Jordi Mallach
0e23434542
Updated Catalan translation to 2c4954b.
2011-05-07 15:20:35 +02:00
MrZYX
989d178987
updated locales
2011-05-07 00:39:24 +02:00
Arzumy MD
2c4954bac8
spec for application_helper#page_title, with default text
2011-05-06 00:14:18 +08:00
Anish A
cb9901d18b
Added rest of jerrinphilip's translations
2011-05-05 10:19:17 +05:30
Anish A
63e334c2f0
Translations of jerrinphilip
2011-05-05 10:19:17 +05:30
danielgrippi
648a10e6d3
Merge branch 'master' into follow
...
Conflicts:
app/controllers/requests_controller.rb
app/controllers/tags_controller.rb
app/helpers/aspects_helper.rb
app/views/notifications/index.html.haml
config/routes.rb
public/javascripts/aspect-edit.js
public/javascripts/contact-list.js
spec/integration/receiving_spec.rb
spec/models/user/connecting_spec.rb
spec/models/user/posting_spec.rb
2011-05-04 11:35:35 -07:00
MrZYX
a71c4b3f69
added japanese
2011-05-04 15:47:02 +02:00
