nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
11673 commits 4 branches 0 tags 121 MiB
Commit graph

2479 commits

Author SHA1 Message Date
Ilya Zhitomirskiy
d6824dcc49 Revert "remove custom logging, added hoptoad backend directly" 
This reverts commit ea72b1ae57.
 2011-10-31 15:12:08 -07:00
Ilya Zhitomirskiy
d868b79937 Revert "require false, in gemfile and require it in the app if configured" 
This reverts commit 6fb213a961.
 2011-10-31 15:11:49 -07:00
Dennis Schubert
60c4e13435 Merge pull request #2279 from lprelle/language_select_for_invitations 
Language select for invitations
 2011-10-31 14:35:38 -07:00
Ilya Zhitomirskiy
6fb213a961 require false, in gemfile and require it in the app if configured 2011-10-31 14:24:29 -07:00
Lennart Prelle
f2123d942d make language for email-invitation available 2011-10-31 21:11:47 +01:00
Ilya Zhitomirskiy
ea72b1ae57 remove custom logging, added hoptoad backend directly 2011-10-31 12:38:00 -07:00
Ilya Zhitomirskiy
82fabbadd1 Revert "remove sort order option from the stream (commented at is too crazy and way to slow on large data sets)" 
This reverts commit 95aac2f352.
 2011-10-31 12:38:00 -07:00
Jonne Hass
419e4cd41a added vi and de_formal; updated locales 2011-10-31 20:18:18 +01:00
danielgrippi
95aac2f352 remove sort order option from the stream (commented at is too crazy and way to slow on large data sets) 2011-10-30 21:46:23 -07:00
Daniel Grippi
d6b68d2f9b Merge pull request #2273 from Pistos/donate-optional 
Make the donation form (right sidebar) optional.
 2011-10-29 21:00:46 -07:00
Sarah Mei
7564089db8 Update tag following flash messages 2011-10-29 08:20:02 -07:00
Sarah Mei
5a1d1386d5 Let's see if the GC settings on ree are helping or hurting. 2011-10-29 08:10:33 -07:00
Pistos
d643f7e893 Make the donation form (right sidebar) optional. Show or hide via application.yml . 2011-10-29 00:42:09 -04:00
Jonne Hass
4b2b2b53b6 Merge branch 'master' of git://gitorious.org/diaspora-l10n-ca/diaspora-l10n-ca 2011-10-28 12:47:01 +02:00
Jonne Hass
b0d6139bed updated 84 locale files [ci skip] 2011-10-28 12:46:57 +02:00
Jonne Hass
da06a950b6 looks like travis has Firefox and Xvfb available again, so no need for installing it 2011-10-28 10:04:16 +02:00
danielgrippi
a46a1d91db Revert "refactor aspects dropdown, (wip, still need to backfill specs)" 
This reverts commit 3d8f971ca9.
 2011-10-27 23:53:55 -07:00
danielgrippi
a01138672e Revert "remove contact-edit from assets" [ci skip] 
This reverts commit efdf597c0d.
 2011-10-27 23:53:33 -07:00
Dan Hansen
efdf597c0d remove contact-edit from assets 2011-10-27 22:21:34 -05:00
danielgrippi
f7afcd96b4 that good, huh? 2011-10-27 20:16:42 -07:00
Dan Hansen
3d8f971ca9 refactor aspects dropdown, (wip, still need to backfill specs) 2011-10-27 22:09:04 -05:00
danielgrippi
0def71d74f add some feedback text & animation; added spec for collapsing tags 2011-10-27 19:57:00 -07:00
danielgrippi
e8169ee581 follow tag from sidebar 2011-10-27 18:42:20 -07:00
danielgrippi
0b18e47b82 connect_to_comment text for federated users 2011-10-27 17:24:25 -07:00
danielgrippi
07a4fb8e96 download photo unavailable prompt 2011-10-27 17:22:33 -07:00
Maxwell Salzberg
94ebc8b37a update title 2011-10-26 17:40:24 -07:00
danielgrippi
96f74cf930 added feedback to all getting_started states. postive feedback, ftw. 2011-10-26 17:34:15 -07:00
Maxwell Salzberg
9789e25c99 fix oembed spec; prevent people from commenting on posts that wont federate 2011-10-26 17:32:27 -07:00
danielgrippi
dd00523616 show flash messages when adding a person to an aspect 2011-10-26 16:36:47 -07:00
Manuel Schölling
bcbc86e502 Retry federation if remote pod is down 2011-10-27 00:36:55 +02:00
Maxwell Salzberg
7e73865147 mangle oembed stuff to prevent content warnings, only support services that work when you mangle them; please let us know if your favorite service works when you gsub out all of the https links 2011-10-26 15:11:31 -07:00
Jordi Mallach
7a228b166e It's 2011: replace <3 with ♥. Go UTF-8‽ ☺ 
The ♥ symbol was introduced in Unicode 1.1 and should be available on
fonts of all modern, UTF-8-aware operating systems.
 2011-10-26 15:07:55 +02:00
danielgrippi
dc742845c9 fix spelling on getting started [ci skip] 2011-10-25 17:50:09 -07:00
Gonzalo Rodriguez
a642a129ac Tweak newhere locale. Not necessarily people like topics they follow. 2011-10-25 01:55:36 -02:00
danielgrippi
5d54fc6c28 removed community spotlight stream link from right side 2011-10-24 20:14:28 -07:00
Maxwell Salzberg
d5e3033308 make a setting to check out the new getting started 2011-10-24 17:10:36 -07:00
danielgrippi
90d9852e08 updated welcoming text re: peter's suggestions 2011-10-24 16:06:56 -07:00
Maxwell Salzberg
08bbce90a9 increase timeout on jobs to see if that helps 2011-10-24 16:01:13 -07:00
Ilya Zhitomirskiy
c447415d9f allowing users to dismiss new user toolips 2011-10-24 15:57:25 -07:00
Ilya Zhitomirskiy
62e12f248c fixed missing translation on the signup and invitation accept pages 2011-10-24 15:07:29 -07:00
danielgrippi
e63e8299b9 fixed up stream/publisher logic; fixed cukes 2011-10-24 14:41:15 -07:00
danielgrippi
59e4955727 added translation keys; some css cleanup 2011-10-24 14:11:36 -07:00
danielgrippi
1bc637d83f new getting started works, needs more love 2011-10-24 14:11:35 -07:00
Ilya Zhitomirskiy
431fa3fd04 removing getting started on first post and having tooltips in the 
publisher
 2011-10-24 14:11:35 -07:00
Ilya Zhitomirskiy
050964b7ec photo upload position, active input, spinny on complete 2011-10-24 14:11:34 -07:00
Ilya Zhitomirskiy
49b46f09cd Saving of first name 2011-10-24 14:11:34 -07:00
Ilya Zhitomirskiy
c7838debcf creating multiple tag_followings 2011-10-24 14:11:34 -07:00
danielgrippi
42d4d4f400 down to two steps; wip. 2011-10-24 14:11:34 -07:00
Ilya Zhitomirskiy
d97d524a7b attempting to tell excon about certs f cent-os 2011-10-24 11:00:00 -07:00
Ilya Zhitomirskiy
d51516fff3 bumped carrierwave, photos can now be downloaded from a url, fetching profile photo job 2011-10-24 11:00:00 -07:00
Jordi Mallach
f12d9b56a7 Avoid using “has just” constructs, as discussed in ddd152505e. 
Fix grammar for plurals for mentions and reshares, too.
 2011-10-23 20:35:28 +02:00
Jordi Mallach
84bd00577d Update Catalan translation of devise to fe78a69. 2011-10-23 20:18:01 +02:00
Jordi Mallach
89f5f6e727 Update Catalan translation to ddd1525. 2011-10-23 20:10:26 +02:00
Jordi Mallach
bfae64d805 Fix grammar for the singular case. 2011-10-23 20:08:11 +02:00
Jonne Hass
e643e8491f updated 55 locale files [ci skip] 2011-10-23 15:34:56 +02:00
Gonzalo Rodriguez
ddd152505e Fix like notification message grammar. Fixes #2222. 2011-10-23 05:17:33 -02:00
Justin Thomas
f18846bf92 communtiy is community 2011-10-22 19:17:00 -07:00
danielgrippi
7577ad4e81 deprication support for featured_users key in application.yml. 2011-10-21 17:45:06 -07:00
danielgrippi
794247d07b MS DG; rename soup to stream; fix a bunch of translations 2011-10-21 14:44:02 -07:00
danielgrippi
79ec50a16c DG MS; added setting for displaying spotlight members in soup stream 2011-10-21 14:44:02 -07:00
danielgrippi
34816f3a7f add ability to email suggestions for community spotlight members 2011-10-20 12:08:05 -07:00
danielgrippi
44b58d707f featured users => community spotlight 2011-10-20 11:50:58 -07:00
Maxwell Salzberg
9bf60d71e4 make sign up pages ppretty 2011-10-20 11:26:40 -07:00
danielgrippi
ed473e0f46 touch up welcome page 2011-10-19 18:44:09 -07:00
Jonne Hass
2141496014 updated 57 locale files [ci skip] 2011-10-18 20:40:44 +02:00
danielgrippi
4896d056c7 move public option into aspect dropdown in publisher 2011-10-17 15:04:35 -07:00
Sarah Mei
98ef5212f3 Merge branch 'tag_stream_api' 2011-10-16 15:47:20 -07:00
Manuel Schölling
02a3c3f88b Introduced Shareable 2011-10-16 13:58:35 +02:00
Maxwell Salzberg
58d496e146 MS SM WIP 2011-10-15 22:11:23 -07:00
Maxwell Salzberg
8029cb0784 SM MS basic api wip. able to get a users public profile 2011-10-15 18:57:13 -07:00
Jonne Hass
4e17df17fc Merge branch 'master' of git://gitorious.org/diaspora-l10n-ca/diaspora-l10n-ca 2011-10-15 15:06:11 +02:00
Jonne Hass
eb20f7e2f8 updated 84 locale files [ci skip] 2011-10-15 15:06:06 +02:00
Jordi Mallach
01aecabfae Update Catalan translation to 01d7b95. 2011-10-15 13:44:50 +02:00
danielgrippi
ce309ebad3 update application.yml.example to reflect redis cache changes 2011-10-14 15:49:06 -07:00
Maxwell Salzberg
01d7b9507b DG MS; ajax in the soup 2011-10-14 11:17:25 -07:00
danielgrippi
9013903b14 featured users -> community spotlight 2011-10-13 23:33:57 -07:00
Maxwell Salzberg
44b0887e0a who wants a goat that fetches SOAP?!! 2011-10-13 22:26:15 -07:00
Gonzalo
12ddf00e16 Merge pull request #2165 from Pistos/issue-2136-wrong-aspect-button-text 
Issue 2136 wrong aspect button text
 2011-10-12 18:47:27 -07:00
Ilya Zhitomirskiy
d5d4b9d555 Merge pull request #2145 from bagilevi/fix-omniauth-rack-bug-1824 
Fixes omniauth & rack-1.2 bug #1824
 2011-10-12 16:13:51 -07:00
Daniel Grippi
238e106267 Merge pull request #2012 from Flink/deploy-resque-assets-fixed 
Added task to capistrano to copy assets of resque-web (fixed)
 2011-10-12 16:10:30 -07:00
Pistos
1c543e3bea Fixed the issue without breaking the aspects dropdown on the [other] user profile page. 2011-10-12 09:51:30 -04:00
Pistos
e013e4103f Corrected English for button text when no aspects are selected in publisher. 2011-10-11 23:44:41 -04:00
Pistos
cc1fea92e6 Whitespace cleanup. 2011-10-11 23:44:28 -04:00
Gonzalo Rodriguez
f655b12e98 Refactor display setup for De/select_all aspects link 2011-10-12 00:06:25 -02:00
Maxwell Salzberg
139ddd726a wip oembed refactor. still need to make a oembed_helper, and move some tests to their new home, but e but we are looking preeeetttttyyyy good. 2011-10-11 16:10:14 -07:00
Manuel Schölling
f3ea8f424f Added oEmbed support 2011-10-11 16:08:47 -07:00
Ilya Zhitomirskiy
4c9b45b9c8 WIP 2011-10-11 10:57:26 -07:00
danielgrippi
a2b79d0338 touch up header 2011-10-11 08:00:36 -07:00
Jonne Hass
8bc67f983c Merge branch 'master' of git://gitorious.org/diaspora-l10n-ca/diaspora-l10n-ca 2011-10-11 14:07:31 +02:00
Jonne Hass
6ff2bdd300 updated locales and added sq, uk and en_1337 2011-10-11 13:03:11 +02:00
Dan Hansen
71681d1bc7 load mail jobs in an initializer so Resque::Helper.constantize doesn't throw UninitializedConstant 
when resque tried to get the constant "Mail" from the "Jobs" module it got the inherited constant "Mail" (ruby gem) instead of Jobs::Mail
 2011-10-09 23:39:56 -05:00
Levente Bagi
6e60d932c0 Fixes omniauth & rack-1.2 bug #1824 
Rack 1.2's request.url method is buggy, as it gets the host part from
HTTP_X_FORWARDED_HOST, but the port from SERVER_PORT (which should be
used in conjuction with SERVER_ADDR).

This way, if the app is run behind a reverse proxy, it will create a
URL with <public_host>:<private port>, and pass this to Facebook,
so Facebook will redirect back to the URL with the wrong port.

Upgrading Rack requires upgrade to Rails 3.1.

This temporary solution configures OmniAuth using a copy of the newer
version of Rack::Request.
 2011-10-09 01:03:22 +01:00
Gonzalo Rodriguez
7994c4d43f 1 new notifications must be 1 new notification 2011-10-08 21:36:58 -02:00
Maxwell Salzberg
2b22e1dab5 make the links on featued users tile be the tag with the name in the link. added a following count to tags 2011-10-07 12:19:28 -07:00
Your Name
5b9fbd19ed moar specs, a little perf upgrade for base_stream#person 2011-10-06 17:13:04 -07:00
Your Name
55ffc44a42 wip 2011-10-06 17:13:04 -07:00
Your Name
b8984e7eaf didn't like my language 2011-10-06 15:52:30 -07:00
Your Name
619f5fd56e move featured users to the other side and make a little sidebar widget for it 2011-10-06 12:27:02 -07:00
Maxwell Salzberg
cdce54bbda MS SM featured users stream. because we do what we want 2011-10-05 21:12:02 -07:00
Gonzalo Rodriguez
fa58fbe272 Typo on english locale 2011-10-06 00:42:56 -02:00
Gonzalo Rodriguez
30a13674e8 Edit aspect pencil was messed up with the title on the home page 2011-10-05 22:44:57 -02:00
Maxwell Salzberg
513b2cb5bc make the aspect edit page a little more helpful for empty state. a loonngggg way to go 2011-10-05 15:07:35 -07:00
Maxwell Salzberg
d91ea4b9ce adding support for message bus email service 2011-10-05 12:06:19 -07:00
Maxwell Salzberg
85e51a6dd7 wip 2011-10-05 12:06:19 -07:00
Jordi Mallach
3a62b10384 Updated Catalan translation to ad9dcd8. 2011-10-04 13:19:46 +02:00
Sarah Mei
ec1ae8c07e Aaaand now we need to install firefox too 2011-10-03 22:19:25 -05:00
Sarah Mei
f76aeb1b39 Apparently they forgot to install xvfb as well. 2011-10-03 22:06:23 -05:00
Sarah Mei
911d9094d8 Go back to copying in the /etc/init.d/xvfb script since the Travis workers apparently don't have it anymore. 2011-10-03 21:58:00 -05:00
Maxwell Salzberg
ad9dcd8542 holy guacamole. mentions page and tag following pages, plus a huge stream refactor 2011-10-03 15:23:10 -07:00
Maxwell Salzberg
429ac42502 added tag follow feature, mention page feature. is now pretty easy to add new types of streams, but some more refactoring could make it even nicer 2011-10-03 15:22:14 -07:00
Maxwell Salzberg
b5c3f2c615 wip 2011-10-03 15:22:14 -07:00
Pistos
9d8fdb4659 Added Gentoo's CA certs location to the comments in the example config. 2011-10-03 16:30:26 -04:00
Pistos
20f9ff8555 Whitespace cleanup. 2011-10-03 16:30:16 -04:00
Gonzalo Rodriguez
0b97a3525a Merge branch 'aspect_nav_rework' 2011-10-02 21:08:12 -02:00
Howard Lin
1ffb706946 User email lookup is now case insensitive 2011-10-01 19:50:39 -07:00
Gonzalo Rodriguez
d3a5bc1fb8 Merge branch 'master' into aspect_nav_rework 2011-10-01 03:58:50 -03:00
Maxwell Salzberg
5348c72209 add sqlite method; fix chubbies cukes 2011-09-30 14:27:54 -07:00
Paul Spieker
0c12471feb add username blacklist 2011-09-30 14:17:04 +02:00
Maxwell Salzberg
b27a8dd330 fix up info sidebar" 2011-09-29 12:51:00 -07:00
danielgrippi
6b73527379 vcuculo's fixes (flattened mobile.scss into mobile boilerplate's css instead of just flipping the load order) 2011-09-29 10:19:03 -07:00
Jonne Hass
68f15a8a34 fix ca.yml 2011-09-29 14:37:10 +02:00
Jonne Hass
a6977c55a2 Merge branch 'master' of git://gitorious.org/diaspora-l10n-ca/diaspora-l10n-ca 2011-09-29 14:35:12 +02:00
Jonne Hass
710f241b42 updated 21 locale files [ci skip] 2011-09-29 14:34:17 +02:00
Ilya Zhitomirskiy
1fe9de328b removing newrelic resque for now 2011-09-28 18:47:42 -07:00
Ilya Zhitomirskiy
1da0bf5d95 changed the load order for newrelic 2011-09-28 18:34:56 -07:00
Ilya Zhitomirskiy
95c8986b8e added new relic resque support 2011-09-28 17:53:29 -07:00
Gonzalo Rodriguez
74d00d7db4 Merge branch 'master' into aspect_nav_rework 2011-09-28 19:52:15 -03:00
Jordi Mallach
2e86e9ece7 Fix a variable and add missing ellipsis. 2011-09-28 21:18:52 +02:00
Jordi Mallach
b712586ca3 Updated Catalan translation to d2d205e. 2011-09-28 21:11:10 +02:00
danielgrippi
d2d205ee08 make autoexpand work 2011-09-28 11:21:14 -07:00
danielgrippi
64113eb8f2 increment counter on comment add 2011-09-27 21:09:27 -07:00
danielgrippi
ea357a96ef expand&collapse comments; added comment form (wip) 2011-09-27 21:09:27 -07:00
danielgrippi
f2f14c2894 fixed ajax for likes 2011-09-27 21:09:26 -07:00
danielgrippi
645af37358 more touchup; added placeholder for reaction tabs on post show; added more mobile boilerplate / compatability; apple splash page asset 2011-09-27 21:09:26 -07:00
danielgrippi
00e561dd01 comments -> reactions 2011-09-27 21:09:26 -07:00
danielgrippi
8c586c4567 added html5 boilerplate meta tags to mobile; stripped functionality to add back 2011-09-27 21:09:25 -07:00
Gonzalo Rodriguez
372a472fbf Empty aspect stream when no aspect selected on the left nav 2011-09-27 23:46:02 -03:00
Gonzalo Rodriguez
e0ffd7c63e Merge branch 'master' into aspect_nav_rework 
Conflicts:
	features/posts_from_main_page.feature
	public/javascripts/aspect-filters.js
	spec/javascripts/aspect-filters-spec.js
 2011-09-27 00:08:05 -03:00
Ilya Zhitomirskiy
f9172c8733 added aspect dropdown to the getting started page, renamed the button to be add contact 2011-09-26 17:32:37 -07:00
Ilya Zhitomirskiy
675908a57d added an expanation of what connecting services does(getting started), also indicate services whick are connected connected services 2011-09-26 16:04:25 -07:00
Ilya Zhitomirskiy
afd1913de4 added a link to resque-web from admin page 2011-09-26 10:25:29 -07:00
danielgrippi
131166841a added logged out page referencing mobile 2011-09-25 11:58:44 -07:00
Maxwell Salzberg
95ad709324 change that profile url to something I like slightly better 2011-09-24 23:44:21 -07:00
Maxwell Salzberg
049eb74ab2 added route to grab users profile picture if you know their username 2011-09-24 23:33:14 -07:00
Jonne Hass
6ffcec0885 updated 53 locale files [ci skip] 2011-09-24 21:08:18 +02:00
Ilya Zhitomirskiy
461cb22109 in the getting started featured tags are now followable 2011-09-23 17:06:21 -07:00
Ilya Zhitomirskiy
494ab8b13b added community welcome and a non-mandatory wording 2011-09-23 14:56:33 -07:00
Raphael Sofaer
2e96f0121e simplify multi-server spec running with foreman. couldn't really get it automated tonight, not sure why. 2011-09-22 00:24:01 -04:00
Ilya Zhitomirskiy
f8c05851f6 added an email link to the right section 2011-09-21 14:40:59 -07:00
Ilya Zhitomirskiy
4fb62afa2d getting stated links open in new tabs, translated a string 2011-09-21 14:12:37 -07:00
Ilya Zhitomirskiy
c98f2d1664 added a weekly user stat for admin 2011-09-21 13:23:09 -07:00
Sarah Mei
346e1f1c87 SPELL CHECK PLZ. 2011-09-20 21:56:17 -07:00
Loïc Guitaut
fe8fb9ff31 Added task to capistrano to copy assets of resque-web (fixed) 2011-09-20 23:31:56 +02:00
Maxwell Salzberg
8187fb9ddb clean up and move help widget up the page 2011-09-20 10:05:39 -07:00
Jonne Hass
70c2fda2ca Merge branch 'master' of git://gitorious.org/diaspora-l10n-ca/diaspora-l10n-ca 2011-09-20 18:42:56 +02:00
Sarah Mei
3a9d8f0f38 ARRRGGGHH *twitch* *twitch* 2011-09-19 22:00:00 -07:00
Ilya Zhitomirskiy
352be4d0c0 added the have support section and reworded the donation section to be clearer 2011-09-19 15:29:19 -07:00
Jonne Hass
473642234d updated locales and pulled in NN 2011-09-19 15:36:12 +02:00
Jordi Mallach
ff5919f43f Change "Click this link" to "Follow this link". 
As discussed with @rsofaer in 9797e04957,
"follow" is more device-neutral, better for mobile browser users.
 2011-09-18 22:46:31 +02:00
Jordi Mallach
d006ca9850 Merge branch 'master' of git://github.com/diaspora/diaspora 2011-09-18 03:21:57 +02:00
Jonne Hass
661d5d3bbc pull in ur-PK 2011-09-18 00:56:04 +02:00
Jordi Mallach
98aa2a0196 Update Catalan translation to 91e6499. 2011-09-17 21:50:37 +02:00
Jordi Mallach
021f704de7 Add trailing dot. 2011-09-17 21:47:57 +02:00
Jonne Hass
d498110b3d updated 117 locale files [ci skip] 2011-09-17 17:32:01 +02:00
Maxwell Salzberg
bc1aef4999 MS IZ start to implement followed tags in the stream 2011-09-16 18:19:34 -07:00
Maxwell Salzberg
17b5e7b066 move admin rack to its own file 2011-09-16 13:33:05 -07:00
Jonne Hass
7ab963f859 whoops, fix my typo 2011-09-16 22:27:19 +02:00
Jonne Hass
b706edf76f pull in parallel_testing to speed up rspec 
- Initally run rake parallel:create
- After each schema change run rake parallel:prepare
- To run rspec super fast run rake parallel:spec
- Todo fix upstreams summary logger
 2011-09-16 22:14:12 +02:00
Jonne Hass
fcff5a6774 do not break on not updated application.yml for mount_resque_web 2011-09-16 22:03:38 +02:00
Maxwell Salzberg
55999bc443 resolve route conflicts 2011-09-16 12:49:47 -07:00
Ilya Zhitomirskiy
f1a8b1fd6f added the namespace constraint back to the envelope, protocol route, data type is now plain xml 2011-09-16 08:53:13 -07:00
Loïc Guitaut
a739c4f308 Ability to mount resque jobs monitoring directly into Diaspora* routes 
As resque-web is considered as a debug tool, route is disabled for
production by default, and can be enabled via the `mount_resque_web` key
in application.yml.
 2011-09-16 02:40:57 +02:00
danielgrippi
3f84dd066f can't access git on heroku 2011-09-14 18:07:54 -07:00
danielgrippi
084ed0e838 dont tell faraday to get a custom ca file, hopefully heroku does magic to make sure they work 2011-09-14 18:07:53 -07:00
danielgrippi
c1b46e557f added redis to go support in redis 2011-09-14 18:07:53 -07:00
Jonne Hass
70a9f3fd94 made openssl verify mode configurable for SMTP 2011-09-14 20:55:29 +02:00
danielgrippi
91e649977c MS DG update copyright 2011-09-14 11:23:12 -07:00
Jonne Hass
d7a7154424 Revert "lets set the example collation to utf8_general_ci instead of utf8_bin, #1395" 
This reverts commit eb85cdab5b.
 2011-09-14 14:01:53 +02:00
Maxwell Salzberg
df87b398c7 MS DG; fixed cucumber 2011-09-13 16:14:31 -07:00
Jonne Hass
10df8ef2c8 updated 6 locale files [ci skip] 2011-09-14 00:43:19 +02:00
Jonne Hass
cecd6ca5a1 Lets take another try at a consistent single process mode handling 
Revert "dont call settingslogic single process mode, use the hash accessor so it is not required"

This reverts commit 57de976396.
 2011-09-13 22:29:56 +02:00
Jonne Hass
eb85cdab5b lets set the example collation to utf8_general_ci instead of utf8_bin, #1395 2011-09-13 17:45:53 +02:00
Maxwell Salzberg
665facaeb0 DG MS renamed private dispatcher; started refactor including public 
dispatcher
 2011-09-12 17:02:40 -07:00
Maxwell Salzberg
6b0507949c updated salmon to let us not always encrypt the header 2011-09-12 14:05:31 -07:00
Jonne Hass
5ae96efdf6 fix oauth keys, deep_merge vs deep_merge! my bad 2011-09-12 22:28:13 +02:00
Maxwell Salzberg
57de976396 dont call settingslogic single process mode, use the hash accessor so it is not required 2011-09-12 08:42:38 -07:00
Jonne Hass
37787605aa updated 44 locale files [ci skip] 2011-09-12 00:00:58 +02:00
Jonne Hass
41effa7bd2 load oauth_keys.yml.example as default so I don't have to touch my oauth_keys.yml to have the specs pass on my machine 2011-09-11 23:45:14 +02:00
Jonne Hass
96fc057974 correct Rails.logger call in resque initializer 2011-09-11 22:07:54 +02:00
Lennart Prelle
40ac7b7620 make string in authorizations translateable 2011-09-11 17:20:54 +02:00
Jonne Hass
cce2ab2151 cleaned up application.yml.example 2011-09-11 14:45:47 +02:00
Jonne Hass
bdd6b9127a overlooked one last old single process check 2011-09-11 14:19:26 +02:00
Jonne Hass
a614985d83 made single process mode configuration more consistent 
* SINGLE_PROCESS_MODE environment variable takes precedence over
  application.yml setting
* SINGLE_PROCESS environment variable takes precedence over
  SINGLE_PROCESS_MODE environment variable to be backward compatible
 2011-09-11 13:54:14 +02:00
Jonne Hass
79a8ab709f updated 77 locales [ci skip] 2011-09-11 03:20:59 +02:00
Maxwell Salzberg
1fa01a811e DG MS; updated text to reflect the fact that hiding posts now 
mutes notifications as well
 2011-09-09 10:52:19 -07:00
Maxwell Salzberg
328269e40d re-added single process mode to the example 2011-09-09 10:10:10 -07:00
Maxwell Salzberg
bea76a4801 move the ugly type check into the ugly method, to keep all the ugly in 
one place; restore listening to single process mode in resque; move the
exception handling to inside the method, rather than around the
intializer, and log when resque errors happen in development in single
process mode
 2011-09-09 08:58:06 -07:00
Manuel Schölling
0b28376216 Fixed some texts in "Getting Started" that were not translatable 2011-09-09 01:15:54 +02:00
Maxwell Salzberg
cd7640a971 add resque timeout 2011-09-08 10:46:36 -07:00
Gonzalo Rodriguez
04786bc43e Improvements on aspect navigation rework 2011-09-08 02:13:15 -03:00
Gonzalo Rodriguez
6131d5d29d Merge branch 'master' into aspect_nav_rework 2011-09-08 01:54:49 -03:00
Jonne Hass
2addd32274 shit we violoated the LDML 
close #1920

* added two to pluralizations, see
  http://www.unicode.org/reports/tr35/tr35-21.html#Language_Plural_Rules
* updated pluralization rules to CLDR 2.0.1
 2011-09-08 02:00:46 +02:00
Maxwell Salzberg
faa44c0a91 make redis url configurable via app config 2011-09-07 15:59:38 -07:00
danielgrippi
d6689ba923 remove mime type :mobile from mime_types as the mobile_fu gem already registers it 2011-09-07 13:03:49 -07:00
Jonne Hass
daca5b0bc4 updated locales 2011-09-07 16:39:16 +02:00
Jonne Hass
b38cf47661 rename config/script_server_config.yml to config/script_server.yml to remove redundancy 2011-09-07 03:30:43 +02:00
Jonne Hass
7beb2bb7e5 updated locales 2011-09-06 17:54:14 +02:00
Jonne Hass
a6d5fe68cb no need to install firefox on travis anymore; no need to come up with 
custom Xvfb init script anymore; lets try out travis notifications
 2011-09-06 15:27:23 +02:00
Maxwell Salzberg
7ff11188b6 update gemfile 2011-09-05 13:28:08 -07:00
Maxwell Salzberg
13eb7fbb7b forgot to remove js file from mobile assets 2011-09-05 11:03:57 -07:00
Maxwell Salzberg
a7602c4fd1 update jquery mobile 2011-09-05 10:51:36 -07:00
Dan Hansen & Gonzalo Rodriguez
2057c8fcf1 Aspect navigation rework started.. 
ToDo:
  * Fix failing posts cuke, seems to be timing issue
  * Populate stream title when no aspects selected
  * All aspects selected by default?
 2011-09-05 02:02:07 -03:00
Jonne Hass
c682eb8a7a updated locales 2011-09-05 02:30:30 +02:00
Jonne Hass
d1a5e627ba export DB in script/server 2011-09-04 19:51:24 +02:00
Jonne Hass
6403cbded6 note to self: don't use debian manpages for ubuntu stuff… 2011-09-04 16:03:39 +02:00
Jonne Hass
19302078a2 improve aptitude command a bit 2011-09-04 15:55:45 +02:00
Jonne Hass
1a9e0162f9 really fix sed 2011-09-04 15:31:42 +02:00
Jonne Hass
6a268e08d6 fix sed in before-travis.sh 2011-09-04 15:21:07 +02:00
Jonne Hass
03110c466f use -q2 again for aptitude since -q3 doesn't seem to have any effect 2011-09-04 15:09:34 +02:00
Jonne Hass
835c4447f6 I just want to see if this works :P 
- Removed launchy since I couldn't find any use of it
- Ruby 1.9 seems to need em-synchrony explictly
- No need to recreate the Gemfile.lock on Travis if proper :platforms
options are used in the Gemfile
- Removed group :development, :test and moved the stuff in the
corresponding sections
- Install adapter Gems according to the env var DB, install al if it is
unset
- Merged database.yml.postgres into database.yml.example. Bonus point:
easier switching between mysql and postgres
- May break everything but lets see what CI says
 2011-09-04 14:53:28 +02:00
Sarah Mei
689fd7ec94 Include both mysql and pg in the Gemfile tp reduce travis startup time. 2011-09-03 22:48:56 -07:00
Sarah Mei
bf954f3e6a Need to rebundle if we switch the Gemfile for postgres 2011-09-03 21:52:57 -07:00
Sarah Mei
7c24a1a1fb How about we switch the Gemfile *before* we bundle install? 
PSA: don't drink & code, kids.
 2011-09-03 21:50:49 -07:00
Sarah Mei
1cc7026b59 First try at postgresql support on travis. 2011-09-03 21:44:13 -07:00
Sarah Mei
949423ccda Make YAML::ENGINE syck under ruby 1.9 to fix travis 1.9 build issue 2011-09-03 19:52:39 -07:00
Sarah Mei
8f9a0a032d Remove debugging output from travis script. 2011-09-03 19:22:01 -07:00
Sarah Mei
460b734b9e Must bundle exec rake on travis to avoid stack-level-too-deep rake errors. 2011-09-03 19:07:25 -07:00
Sarah Mei
60301d5a93 More debug output in travis. Also, use --without development production in the rebundle, same as in the original bundle. 2011-09-03 18:46:20 -07:00
danielgrippi
66836e53d2 Aspect dropdowns read 'All Aspects' if all aspects are selected 2011-09-03 18:38:12 -07:00
Sarah Mei
aa1aaaa0d8 Add --trace to debug the stack level too deep error on the travis 1.9 build. 2011-09-03 18:30:19 -07:00
Sarah Mei
024574534b Add execute bit to before-travis.sh 2011-09-03 18:03:42 -07:00
Sarah Mei
77149a9623 Move travis startup script to its own file. Add GC settings for REE and -q2 for aptitude install. 2011-09-03 17:57:18 -07:00
Sarah Mei
392db905cb Put the xvfb pidfile in /tmp instead of /root 2011-09-03 13:45:26 -07:00
Sarah Mei
2eca2c0f40 Add /etc/init.d script for xvfb. Copy it into place before trying to use it on travis. 2011-09-03 13:35:13 -07:00
MrZYX
b1f283c995 updated locales 2011-09-01 23:18:47 +02:00
MrZYX
6ef8edc9c1 updated locales 2011-08-31 20:34:45 +02:00
danielgrippi
1198670383 Added Foreman gem. Run Diaspora using foreman start (will start everything except mySQL. Passing in a -p flag will let you specifiy the port. Also: I took single_process_mode out of app config and made it an environment variable. If you want to boot a lightweight server, run SINGLE_PROCESS=true rails s. 2011-08-29 14:38:07 -07:00
danielgrippi
f2fb431fed condense asset declarations; include all js in widget and helper directories (this is what we've already been doing) 2011-08-27 22:22:20 -07:00
danielgrippi
802dd989a8 remove javascript in lieu of css; feature is still failing 2011-08-27 22:04:30 -07:00
Gonzalo Rodriguez
b9dbe0ecdd Closes #1827. Minor text fix on Getting Started page 2011-08-27 21:32:58 -03:00
MrZYX
5b51dde195 updated locales 2011-08-27 23:00:33 +02:00
Dan Hansen
27d4fd8176 fix retractions, fix likes, backfill likes widget tests, remove typo from jasmine.yml, remove unneeded js files 
require confirmation for comments in js, get rid of rails helper
 2011-08-26 15:24:07 -05:00
Dan Hansen
d75ef8d020 made backtotop a widget, added jquery-debounce 2011-08-26 12:30:28 -05:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
a40543e15c a user now has the option to disable reshare email notifications 2011-08-25 17:16:09 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
8c9a585337 reshares now have notifications, slight refactor of the notification helper 2011-08-25 17:16:09 -07:00
MrZYX
ded85fb225 updated locales 2011-08-25 00:10:14 +02:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
7fd7fa968c fixed the email from header issues and backfilled few tests 2011-08-22 17:38:40 -07:00
MrZYX
f8a030d761 updated locales 2011-08-22 23:16:30 +02:00
MrZYX
87cd09a936 fix string concat 2011-08-22 23:09:51 +02:00
Dan Hansen
4a64a172d1 Merge branch 'master' of github.com:diaspora/diaspora into js-refactor-merged 
Conflicts:
	spec/javascripts/stream-spec.js
 2011-08-21 20:57:01 -05:00
Dan Hansen
545611fffa green? 2011-08-21 20:45:51 -05:00
Andrej Kacian
b772b8354d Fixed misplaced translations for no tags on own profile 2011-08-22 01:55:36 +02:00
Gonzalo Rodriguez
4ccb5f778a Missing js for contacts page. Aspect renaming wasn't working. 2011-08-21 20:31:16 -03:00
MrZYX
1b5698c1f5 updated locales 2011-08-21 17:09:16 +02:00
Dan Hansen
3ed50cab94 Merge branch 'master' of github.com:diaspora/diaspora into js-refactor-merged 
Conflicts:
	app/views/status_messages/bookmarklet.html.haml
	config/assets.yml
	db/schema.rb
	public/javascripts/contact-edit.js
	public/javascripts/publisher.js
	public/javascripts/view.js
 2011-08-20 14:40:56 -05:00
Gonzalo Rodriguez
f1cf81772b Closes #1386. On conversations, disable Reply button once pressed 2011-08-20 15:51:39 -03:00
Maxwell Salzberg
bb5ada6533 create a wrapper class for devise mailer, both so we can resquify it and so we can inject helpers 2011-08-19 15:57:10 -07:00
Maxwell Salzberg
fe78a69161 combine invitation emails 2011-08-19 12:15:11 -07:00
MrZYX
f2e25c5fc5 updated locales 2011-08-19 20:39:26 +02:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
c3bcb9c962 Revert "Revert "Merge branch 'issue1586-aspectdropdown-when-posting'"" 
This reverts commit a407f12463.
 2011-08-18 16:48:20 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
a407f12463 Revert "Merge branch 'issue1586-aspectdropdown-when-posting'" 
This reverts commit 2777f16f4f, reversing
changes made to 8b278adff6.
 2011-08-18 16:16:14 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
b1e95def4a Merge branch 'master' into issue1586-aspectdropdown-when-posting 2011-08-18 12:59:00 -07:00
Gonzalo Rodriguez
2d54d9a97e Validate presence of message text on conversations. Closes #1329. 2011-08-17 23:52:31 -03:00
MrZYX
1da481d362 updated locales 2011-08-17 21:26:59 +02:00
Raphael Sofaer
f2e079f532 Revert "Move the include of splunklogging into the appconfig check" 
This reverts commit 25752e9f93.
 2011-08-16 15:04:51 -07:00
Raphael Sofaer
cc3eeac98e Merge the aspect dropdown in the publisher with master, some things are still broken 2011-08-16 14:59:53 -07:00
Raphael Sofaer
25752e9f93 Move the include of splunklogging into the appconfig check 2011-08-16 12:26:57 -07:00
MrZYX
1e53261606 updated locales 2011-08-16 19:43:57 +02:00
danielgrippi
32ae21a213 removed user invite counter, as it was already depricated 2011-08-15 15:15:43 -07:00
MrZYX
78aa6d0943 updated locales 2011-08-15 14:01:36 +02:00
MrZYX
a9312daf69 fixed syntax error in ml.yml 2011-08-15 13:50:05 +02:00
Anish A
e7f1c3d251 malayalam localization stage 3. diaspora completed 2011-08-15 14:03:17 +05:30
Anish A
2cea39672e malayalam localization stage 2. javascript completed 2011-08-15 14:03:17 +05:30
Anish A
a3ac384aa5 malayalam localization restarted. devise.ml.yml completed 2011-08-15 14:03:17 +05:30
MrZYX
7e59193e2c updated locales 2011-08-13 23:54:14 +02:00
Raphael Sofaer
f60ce932b1 Localize string 2011-08-13 09:44:40 -07:00
danielgrippi
a8d37fb3fc Move Facebook inviter view into the contacts layout, rather than a facebox 2011-08-12 17:05:01 -07:00
Raphael Sofaer
3831c13a4a Move the app/models/jobs folder to match the name of the module 2011-08-12 15:56:26 -07:00
danielgrippi
7e901d0220 remove shapado 2011-08-12 11:12:30 -07:00
MrZYX
6e0630c43f updated locales 2011-08-11 22:21:32 +02:00
Raphael Sofaer
0b00616b8c Create appConfig option for following diasporahq 2011-08-11 12:01:14 -07:00
Raphael Sofaer
a2043671ce Move comment email subject line code into models 2011-08-11 10:46:15 -07:00
Dan Hansen
2e9040e227 merged with master, 7 cukes failing. jasmine is green. need to remove rails.js helpers so things suck less 2011-08-10 23:57:33 -07:00
danielgrippi
db645e8da8 merged publics/show and posts/show 2011-08-10 18:07:38 -07:00
Raphael Sofaer
350a4b4f6d Fix 500 on invitations new on unknown facebook user... bad solution, maybe we should just delete the offending invitations? 2011-08-10 16:42:08 -07:00
Raphael Sofaer
f30df2c88d Fix invitation email subject 2011-08-10 12:10:02 -07:00
Maxwell Salzberg
2d6a69cdc8 fix for 500s in liked emails for reshares and activity streams photos 2011-08-10 10:25:43 -07:00
Maxwell Salzberg
d22e5e7598 make some getting started text slightly cleaner 2011-08-10 09:38:54 -07:00
Sarah Mei
0b02653f44 Merge pull request #1694 from ticho/tag-list-has-unfollow-icon 
Add a "unfollow" icon to each tag in followed tags listing
 2011-08-09 21:44:21 -07:00
Maxwell Salzberg
7b1ff4cd7b more mobile site compatability. edit profile now is a switch hitter, adding flash to the signup form 2011-08-09 18:02:50 -07:00
Andrej Kacian
2a970145c8 Added icon to directly unfollow a tag to listing of followed tags. 2011-08-09 22:45:06 +02:00
danielgrippi
aac72b12e7 added hoptoad support, API key read from application.yml 2011-08-09 10:46:15 -07:00
Raphael Sofaer
46d6bbff5a Remove stray comma. 2011-08-08 19:02:07 -07:00
MrZYX
f370769fe7 updated locales 2011-08-09 03:19:28 +02:00
MrZYX
d3c73502cd Merge branch 'master' of git://gitorious.org/diaspora-l10n-ca/diaspora-l10n-ca 2011-08-07 22:56:52 +02:00
MrZYX
b412f379e0 updated locales 2011-08-07 22:56:44 +02:00
Manuel Schölling
8b99ae9cb6 Changed translation and fixed misspelled function call 2011-08-07 22:00:23 +02:00
Manuel Schölling
fead6032f7 Issue 1586: added a aspect drop down next to the submit button in the publisher 2011-08-07 12:51:32 +02:00
Andrej Kacian
077d8fd2fe Fixes #1587 by changing globe icon tooltip when switching between public and limited post in publisher. 2011-08-06 23:37:21 +02:00
Sarah Mei
ac063ed938 Show stack traces in cucumber. How did this get turned off? Did we used to have a separate cucumber environment? 2011-08-06 12:46:15 -07:00
Jordi Mallach
afd08a7b94 Aspects are... intuitive. 2011-08-06 18:06:33 +02:00
Jordi Mallach
a622a5b1ee Updated Catalan translation to 5eadc7d. 2011-08-06 18:02:44 +02:00
MrZYX
e9f4495b53 add english pirate so we get people to actually do it 2011-08-06 16:59:19 +02:00
MrZYX
2a0ca46949 updated locales 2011-08-06 16:56:39 +02:00
Maxwell Salzberg
700927e40f remove user stubbing 2011-08-05 18:59:04 -07:00
Raphael Sofaer
13afd9fb7b Don't route nonexistent actions to ProfileController 2011-08-05 18:39:17 -07:00
Maxwell Salzberg
b4d4499299 adding invite email 2011-08-05 18:32:25 -07:00
MrZYX
4a43441194 updated locales 2011-08-06 01:18:38 +02:00
Raphael Sofaer
5eadc7d41c Fix the last broken jasmine spec by restoring the #no_posts div 2011-08-05 15:09:16 -07:00
danielgrippi
5cea922cb8 fixed & updated facebox (1.3) 2011-08-05 14:32:58 -07:00
danielgrippi
75c3107035 made signing up and accepting an invitation look a little nicer 2011-08-05 12:36:53 -07:00
Maxwell Salzberg
d04c904f72 dont run if you do not have featured users set 2011-08-03 18:37:35 -07:00
danielgrippi
99ac976594 fix redirects around getting_started and aspect/index 2011-08-03 18:07:43 -07:00
danielgrippi
987d334764 fixed tests, translations, initalizer 2011-08-03 18:02:58 -07:00
danielgrippi
23c2eaf1c5 added a real profile description on the welcome tab 2011-08-03 18:02:58 -07:00
danielgrippi
e23439d193 fix cucumber; temporarily remove fetch featured users initilizer 2011-08-03 18:02:57 -07:00
danielgrippi
120cf9835b added more translations; welcome text switch 2011-08-03 18:02:57 -07:00
danielgrippi
b8b4ad3d84 added helpers for each of the getting started steps; make step sections dull if completed 2011-08-03 18:02:56 -07:00
danielgrippi
303b23883d added featured users, left nav, and search boxes into getting started 2011-08-03 18:02:56 -07:00
danielgrippi
d51e495925 fetch featured users from remote servers on app init unless already in the db 2011-08-03 18:02:56 -07:00
danielgrippi
6369eefdbe added translations to getting started 2011-08-03 18:02:56 -07:00
MrZYX
eb16d15c42 updated locales 2011-08-04 00:02:30 +02:00
Raphael Sofaer
5967f01dab Take out PostsFake, now that we ajax in comments it's not worth the extra complications 2011-08-03 11:09:21 -07:00
Raphael Sofaer
25bf4ce074 Don't cache bust in production 2011-08-02 16:48:30 -07:00
MrZYX
b3b370db1b updated locales 2011-08-03 00:54:45 +02:00
danielgrippi
25e4f5d0ae dg ms; made no posts text on person show more explicit 2011-08-02 12:53:36 -07:00
danielgrippi
66315eca18 capitalize reshare when there are no reshares 2011-08-02 10:40:36 -07:00
Raphael Sofaer
8b74d2afe1 Revert "fixed the build" 
This reverts commit b9120fca80.
 2011-08-02 10:18:32 -07:00
danielgrippi
b9120fca80 fixed the build 2011-08-02 10:17:06 -07:00
Raphael Sofaer
406ab7a073 Delete a stray file, some cleanup 2011-08-02 09:47:17 -07:00
Raphael Sofaer
a469f09c01 Fix hovercard conflict with vanity urls 2011-08-01 18:22:29 -07:00
Raphael Sofaer
d7ac6c4713 Link the no_tags text to a tag page, we should make tags#index something meaningful one day. 2011-08-01 17:59:19 -07:00
MrZYX
31ea1227a4 updated locales 2011-08-02 00:46:40 +02:00
danielgrippi
6daf7f5ad9 add prompt to add more contacts if user has less than 2 contacts on aspect index 2011-08-01 15:31:13 -07:00
danielgrippi
756a20ecd4 link a user to featured users if user has zero contacts 2011-08-01 15:19:51 -07:00
Jakob Kramer
5ccebd3893 fix wrong string 'Reshare orignial' 2011-08-01 15:03:02 +02:00
Sarah Mei
b7b1c6b276 Fix interaction between I18n fallbacks and our interpolation fallback code. Refactor I18n tests into their own file. Remove some test support code that made it hard to test I18n. 2011-07-30 22:41:46 -07:00
MrZYX
1a350c16fd updated locales 2011-07-30 21:53:12 +02:00
Maxwell Salzberg
7956eb7d51 update the jquery (only for mobile site) as jquery mobile requires jquery 1.6. why this did not break yesterday when I did it is beyond me 2011-07-30 09:36:28 -07:00
danielgrippi
905a982d35 add two more default aspects for new users 2011-07-29 19:21:18 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
3a6f0583c7 added featured users dg iz 2011-07-29 19:00:15 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
e42d7273a8 featured users section 2011-07-29 19:00:15 -07:00
Maxwell Salzberg
d55a21c458 just kidding. totally going to namespace users 2011-07-29 18:53:46 -07:00
Maxwell Salzberg
d407be036e i am not a number! include username in the main url of a local user! 2011-07-29 18:53:46 -07:00
MrZYX
289126b984 updated locales 2011-07-29 23:51:49 +02:00
Raphael Sofaer
b56838e5b1 Fall back to english on MissingInterpolationError 2011-07-29 14:30:20 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
00571b84cd completed donate option 2011-07-29 11:33:30 -07:00
Maxwell Salzberg
b2bce9e1b2 update jquery mobile to beta1 2011-07-28 23:32:41 -07:00
MrZYX
6c9f8ca782 Merge branch 'master' of git://gitorious.org/diaspora-l10n-ca/diaspora-l10n-ca 2011-07-29 01:43:04 +02:00
MrZYX
33cecf111d updated locales 2011-07-29 01:42:59 +02:00
danielgrippi
ee95def580 removed js from the view. added grabbing hand while moving aspects 2011-07-28 15:34:01 -07:00
danielgrippi
6e25a6a0f1 touched up reshare view 2011-07-28 13:46:16 -07:00
Jordi Mallach
7a55d6f974 Update Catalan translation to e4a81fb. 2011-07-28 15:14:21 +02:00
Andrej Kacian
e4a81fbc8a Use "Sending..." instead of "Posting..." for new conversation. 2011-07-27 23:09:05 +02:00
MrZYX
00b0519ed3 updated locales 2011-07-27 21:52:44 +02:00
MrZYX
ea5db03bdf Merge branch 'master' of git://gitorious.org/diaspora-l10n-ca/diaspora-l10n-ca 2011-07-26 18:41:47 +02:00
MrZYX
b95fd33eac updated locales 2011-07-26 18:41:26 +02:00
Jordi Mallach
0237c54452 Merge branch 'master' of git://github.com/diaspora/diaspora 2011-07-26 10:27:45 +02:00
Jordi Mallach
835005ef02 Update Catalan translation to 658e836. 2011-07-26 10:27:29 +02:00
Andrej Kacian
658e836f4c Make the "No tags" string translatable 2011-07-25 23:09:53 +02:00
Jordi Mallach
c5e3f7a231 Update Catalan translation to 384a71b. 2011-07-25 17:03:22 +02:00
Jordi Mallach
1471500166 Merge branch 'master' of git://github.com/diaspora/diaspora 2011-07-25 17:00:32 +02:00
Jordi Mallach
dcda19bc17 Update Catalan translation to e88c1510. 2011-07-25 16:53:54 +02:00
Jordi Mallach
1707612628 Add missing space. 2011-07-25 16:40:12 +02:00
Jordi Mallach
986306f03c Fix overcapitalisation in reshare strings. 2011-07-25 16:27:29 +02:00
Jonne Hass
384a71bdc4 Merge pull request #1614 from ticho/1603-likes-i18n-fix 
Fix for issue #1603 - use different i18n string for comment likes count
 2011-07-25 07:20:24 -07:00
MrZYX
6425bdc47c added esperanto to the available languages 2011-07-25 15:38:17 +02:00
MrZYX
47e2f70e96 Merge branch 'master' of git://gitorious.org/diaspora-l10n-ca/diaspora-l10n-ca 2011-07-25 13:25:42 +02:00
MrZYX
072e48462b updated locales 2011-07-25 13:25:16 +02:00
Jordi Mallach
e88c151031 Harmonise spelling of ‘email’ and capitalisation. 
Use ‘email’ everywhere and avoid capitalisation where it’s not needed.
 2011-07-25 12:37:40 +02:00
Jordi Mallach
7503b0775c Merge branch 'master' of git://github.com/diaspora/diaspora 2011-07-25 12:26:00 +02:00
maxwell
7a5852e73a fix a bug with openssl keys in development. note to future max and 
rafi.  never monkey patch anything on the top of a completely random
model. never again. ever.

TODO: look into replacing a monkey patch on a to_s in User#generate_key
that makes the single test green, but my dell had a heart attack other
places, that might just be sqlite3 or my dell
 2011-07-24 20:06:07 -07:00
Raphael Sofaer
241999f72a MS RS translated reshares 2011-07-22 17:58:52 -07:00
Raphael Sofaer
00885be738 Provide feedback when a user tries to double-reshare 2011-07-22 17:43:05 -07:00
Andrej Kacian
c1e5a83f15 Fix for issue #1603 - use different i18n string for comment likes count 2011-07-22 19:57:18 +02:00
Raphael Sofaer
7382dfb7be Multi-server spec now successfully passes along a reshare 2011-07-21 18:23:33 -07:00
Raphael Sofaer
e19fb6d0f8 Use authority instead of host in order to get the port as well. 2011-07-21 18:23:33 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
bd1c8efe54 wip integration servers 2011-07-21 18:23:33 -07:00
danielgrippi
509a435cc9 moving to not including the post in the reshare xml 2011-07-21 18:22:17 -07:00
Maxwell Salzberg
06f886ad77 WIP reshare 2011-07-21 18:22:17 -07:00
Maxwell Salzberg
df62f58156 fixed the safe_buffer issues 2011-07-21 14:32:09 -07:00
Raphael Sofaer
9797e04957 Merge remote branch 'yolk/348-change-email-with-confirmation' into merge_email_change 
Conflicts:
	app/controllers/users_controller.rb
	config/locales/diaspora/en.yml
	db/schema.rb
	spec/controllers/users_controller_spec.rb
	spec/mailers/notifier_spec.rb
 2011-07-19 10:44:00 -07:00
Jordi Mallach
956e2ead27 Update Catalan translation to 713f4dc. 2011-07-18 12:15:42 +02:00
Jordi Mallach
d8fce7a9db Merge branch 'master' of git://github.com/diaspora/diaspora 2011-07-18 12:14:36 +02:00
Andrej Kacian
713f4dcc9d Fix for issue #1600: Missing string for translation ("Recent notifications") 2011-07-17 17:04:51 +02:00
Jordi Mallach
ae298e803a Updated Catalan translation to 12cb51d. 2011-07-17 07:49:14 +02:00
Jordi Mallach
2262bb4dca Merge branch 'master' of git://github.com/diaspora/diaspora 2011-07-17 07:38:13 +02:00
danielgrippi
12cb51d194 take ':' out of translation 2011-07-15 21:32:01 -07:00
danielgrippi
c4b715f3ff fixed emails to show avatars, have subject lines that allow threading in email clients, and relevant content previews 2011-07-15 21:22:29 -07:00
Jonne Hass
8cfd2e02e1 Merge pull request #1583 from Gallaecio/master 
Update of Galician (gl) translation
 2011-07-15 15:28:42 -07:00
Adrián Chaves Fernández (Gallaecio)
bd8bedc22a Had forgotten to use the right string delimiters (not needed, but hey, I want to do things right\!). 2011-07-15 12:05:07 +02:00
Adrián Chaves Fernández (Gallaecio)
282f68e624 Review of Galician (gl) translation of Diaspora finished. 2011-07-15 11:59:47 +02:00
Adrián Chaves Fernández (Gallaecio)
92b06323d3 Added correct string delimiters to the last strings of ‘diaspora/gl.yml’ file. 2011-07-15 11:55:53 +02:00
Adrián Chaves Fernández (Gallaecio)
80b72a9213 Minor (translation) fix for a string, the one related to the “time ago”. 2011-07-15 11:48:08 +02:00
Adrián Chaves Fernández (Gallaecio)
db22c60578 Minor (translation) fix for a string, the one related to the “time ago”. 2011-07-15 11:44:50 +02:00
Adrián Chaves Fernández (Gallaecio)
effd951f58 Finished the review of the Galician (gl) translation of ‘diaspora/(lang).yml’ file. 2011-07-15 11:40:55 +02:00
MrZYX
d88e86681d updated locales 2011-07-14 20:29:55 +02:00
Adrián Chaves Fernández (Gallaecio)
8816e82ad4 Started revision of Galician (gl) translation of ‘diaspora/(lang).yml’ file. Progress: around 50%. 2011-07-14 18:20:07 +02:00
Adrián Chaves Fernández (Gallaecio)
5111279bfd Removed unneeded character (probably problematic) after a string. 2011-07-14 12:59:15 +02:00
Adrián Chaves Fernández (Gallaecio)
cade8c4d04 Fixed usage of the wrong delimiter for strings with variables. 2011-07-14 12:55:59 +02:00
Adrián Chaves Fernández (Gallaecio)
0653f4fa4f Updated Galician (gl) translation of ‘devise.yml’ file. 2011-07-14 12:38:52 +02:00
Jordi Mallach
2ea2e55353 Updated Catalan translation to 03e79da. 2011-07-13 20:18:32 +02:00
Arzumy MD
03e79da171 fixed missing i18n key for no_services 2011-07-13 12:17:47 +08:00
Raphael Sofaer
14759b2c80 Use person_link in notifications_helper, move hovercard css out to a file 2011-07-12 16:21:03 -07:00
Raphael Sofaer
c622c08d49 Clarify already invited 2011-07-12 15:13:45 -07:00
MrZYX
7e84747a52 clean up routes.rb a bit 2011-07-12 16:47:04 +02:00
MrZYX
5934616422 Merge branch 'master' of git://gitorious.org/diaspora-l10n-ca/diaspora-l10n-ca 2011-07-12 15:12:00 +02:00
MrZYX
8863bb2091 updated locales 2011-07-12 15:08:44 +02:00
MrZYX
2a15a17983 rails-i18n is now a gem 2011-07-12 15:04:48 +02:00
danielgrippi
2e15b6a61e Likes in comments, cache counter disabled for now. 2011-07-11 15:00:48 -07:00
Raphael Sofaer
eafe6a7c85 Merge branch 'ajaxy-comments' 2011-07-11 14:05:45 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
594c9b02b1 A admin is now able to allow open invitations 2011-07-11 13:32:02 -07:00
Raphael Sofaer
3f555eefc4 Server side of ajaxy comments done, need to modify comments/_comments and make it work. 2011-07-11 09:11:16 -07:00
Jordi Mallach
676035f0c2 Updated Catalan translation to 97ca10d. 2011-07-11 15:51:36 +02:00
Raphael Sofaer
2fb0fce1a8 Nest likes and comments routes in the post route 2011-07-10 21:44:34 -07:00
danielgrippi
e09ddef361 DH DG; lightboxin wip 2011-07-10 21:08:34 -07:00
Raphael Sofaer
934ae80a5f Take index route off until I actually make it 2011-07-10 20:26:38 -07:00
Raphael Sofaer
97ca10ddda Huge commit I know, but move show and destroy routes into PostsController and PostsController#show into PublicsController 2011-07-10 20:06:31 -07:00
manuels
30b2a6fe88 Corrected german translation (from noun to verb for 'mention') 2011-07-09 07:12:04 -07:00
MrZYX
ed23406f57 Merge branch 'master' of git://gitorious.org/diaspora-l10n-ca/diaspora-l10n-ca 2011-07-08 01:36:18 +02:00
MrZYX
7a7cfbf33f updated locales 2011-07-08 01:32:57 +02:00
Jordi Mallach
2e67549dc7 Updated Catalan translation to 738487b. 2011-07-07 14:43:52 +02:00
Jordi Mallach
84072305c5 Merge branch 'master' of git://github.com/diaspora/diaspora 2011-07-07 14:34:41 +02:00
danielgrippi
b1fc87ea30 add basic overview page to admin controller 2011-07-06 19:08:09 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
738487b381 moved the are you sure dialog into a translation 2011-07-06 16:34:51 -07:00
Jordi Mallach
355e29c237 Better messages for following. 2011-07-07 00:34:19 +02:00
Jordi Mallach
fcb3d843e5 Fix names and indentation of some keys. Oops. 2011-07-06 23:47:24 +02:00
Jordi Mallach
5cac35ed27 Updated Catalan translation to c3e477f2. 2011-07-06 23:47:24 +02:00
danielgrippi
76382b074c fix jammit warnings; specs 2011-07-06 14:32:40 -07:00
danielgrippi
fd015129c4 final touchups to hovercard 2011-07-06 13:51:19 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
1c79c2c6f0 made aspect_dropdown ajax in (created route), in the process of removing aspect_membership js responses 2011-07-06 12:45:16 -07:00
Dan Hansen
e852940382 HOVERCARD 2011-07-06 12:45:16 -07:00
Daniel Grippi
030e7663f4 Merge pull request #671 from disconn3ct/deploy-current-branch 
deploy the currently checked-out branch
 2011-07-06 10:07:44 -07:00
Dis McCarthy
bf4fb994f5 deploy the currently checked-out branch 2011-07-06 10:41:19 -04:00
MrZYX
78ba1590e5 Merge branch 'master' of git://gitorious.org/diaspora-l10n-ca/diaspora-l10n-ca 2011-07-06 15:44:46 +02:00
MrZYX
b7e86673e8 updated locales 2011-07-06 15:41:29 +02:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
c3e477f2c5 Color the follow tag button 2011-07-05 15:03:26 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
2d8b5bd54c refactored the controller, moved flash message into translations 2011-07-05 15:03:26 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
f0d9d318e8 a user can now follow and unfollow a tag 2011-07-05 15:03:26 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
1e4ee472b7 WIP you can now follow a tag, needs a clean up, and ajax love 2011-07-05 15:03:26 -07:00
danielgrippi
47aab723bd fix message focus bug 2011-07-05 12:17:23 -07:00
Jordi Mallach
10f40043cc Merge branch 'master' of git://github.com/diaspora/diaspora 2011-07-05 10:28:49 +02:00
Jordi Mallach
99abd474c1 Updated Catalan translation to ecd7976. 2011-07-05 10:28:26 +02:00
danielgrippi
ecd79766ce remove aspect badges 2011-07-04 22:36:21 -07:00
Raphael Sofaer
4f056dca8e Ajax in likes in stream 2011-07-04 22:10:30 -07:00
Jordi Mallach
9248a34c89 Updated Catalan translation to 85d6eb70. 2011-07-05 02:06:57 +02:00
Jordi Mallach
035b8893c9 Merge branch 'master' of git://github.com/diaspora/diaspora 2011-07-05 01:56:51 +02:00
danielgrippi
9debec4410 fix the build. 2011-07-04 16:53:43 -07:00
danielgrippi
85d6eb70e7 fix cubbies info page (removed reference to token, changed infographic) 2011-07-04 16:14:05 -07:00
Maxwell Salzberg
b645a77be9 translate a string in services#index view 2011-07-04 13:59:44 -07:00
Maxwell Salzberg
2f1118f95f refactor AppConfig to guess what services are configured, and clean up the services view for a user. also, add a box so people can realize what they can connect 2011-07-04 13:54:05 -07:00
Jordi Mallach
c4c0846ed3 Updated Catalan translation to 9ec9055. 2011-07-04 19:02:20 +02:00
MrZYX
b8ff203af8 updated locales 2011-07-04 01:19:17 +02:00
danielgrippi
8a8f8db9ad Merge branch 'notifications' 2011-07-02 17:53:55 -07:00
danielgrippi
9ec905560c visual touchups, show loading gif right away 2011-07-02 17:53:07 -07:00
Maxwell Salzberg
f4ca8898f6 adding old school resque inline send. confusion b/c Resque.inline is a newer feature 2011-07-02 12:10:25 -07:00
Maxwell Salzberg
2d9d9bd1a1 Revert "Revert "remove perform delegate: use a gem that unobtrusivly does the same"" 
This reverts commit 696779d589.
 2011-07-02 12:05:26 -07:00
Maxwell Salzberg
696779d589 Revert "remove perform delegate: use a gem that unobtrusivly does the same" 
the connection adapter messes with single process mode...
This reverts commit dd752d7dd9.
 2011-07-02 12:01:31 -07:00
Maxwell Salzberg
dd752d7dd9 remove perform delegate: use a gem that unobtrusivly does the same 
thing. use built in resque inline method for single process mode
 2011-07-02 11:57:10 -07:00
Raphael Sofaer
ac832f160c Trying to figure out the travis-ci database configuration 2011-07-02 00:15:35 -07:00
Raphael Sofaer
49d905c719 Some more translation stuff. @MrZYX the content thing in the Diaspora ID explanation is messed up, what's the best way to get bold text into the translation string? 2011-07-01 23:27:53 -07:00
danielgrippi
8bf6ad45a5 various bugfixes, added missing translations, made all tests pass (rspec, cucumber, jasmine) 2011-07-01 22:04:36 -07:00
danielgrippi
f90dc0996a More visual cleanup; top nav; edit aspects 2011-07-01 16:12:14 -07:00
danielgrippi
cd9be3904b publisher rework 2011-07-01 10:51:45 -07:00
danielgrippi
60077bd70a minor visual changes, more or less. facebox headers are now white. 2011-07-01 10:51:45 -07:00
danielgrippi
ca76db4550 DG RS left nav almost there. touched up publisher, among other things 2011-07-01 10:49:19 -07:00
MrZYX
84ae3e6b96 Merge branch 'master' of git://gitorious.org/diaspora-l10n-ca/diaspora-l10n-ca 2011-07-01 00:11:06 +02:00
MrZYX
705dec4e02 updated locales 2011-07-01 00:11:01 +02:00
Jordi Mallach
dfa0a4eb71 Update Catalan translation to 91f984c. 2011-06-30 14:20:12 +02:00
Raphael Sofaer
91f984c2ad Diaspora handle is really confusing, we should just say ID 2011-06-29 14:59:30 -07:00
MrZYX
6519ffcd33 updated locales 2011-06-29 21:10:58 +02:00
Raphael Sofaer
1af945de11 Merge branch 'master' into oauth 
Conflicts:
	Gemfile
	Gemfile.lock
	app/models/app_config.rb
	app/models/post.rb
	db/schema.rb
	public/stylesheets/sass/application.sass
	spec/lib/webfinger_spec.rb
 2011-06-28 17:13:38 -07:00
parimbra
47512db147 better description for #tags 2011-06-28 19:47:19 +05:30
Raphael Sofaer
a0214a0a35 MIIIIIIIIIIKE 2011-06-27 23:22:08 -07:00
Dan Hansen & Maxwell Salzberg
37aeb2fa36 add CSS and refactor to new file 2011-06-27 19:51:35 -07:00
danielgrippi
73fe74c834 updated selenium driver to work with FF5; added translations to contacts/index; fixed cucumber 2011-06-27 18:58:29 -07:00
Raphael Sofaer
5884a900a2 Get rid of manage 2011-06-24 16:55:40 -07:00
danielgrippi
a9b7cd1254 nicer auth prompt. wip. 2011-06-23 12:40:47 -07:00
MrZYX
c6f045dfb7 updated locales 2011-06-23 14:06:54 +02:00
Raphael Sofaer
a987b198fd Fix search in PG 2011-06-22 15:09:00 -07:00
Raphael Sofaer
e8552fc417 Fix direct query execution issues in PG by using select_values/select_rows instead of execute. 2011-06-22 14:47:59 -07:00
Raphael Sofaer
04b0705733 Faraday follows redirects 2011-06-22 12:53:18 -07:00
MrZYX
cb59930749 Merge branch 'master' of git://gitorious.org/diaspora-l10n-ca/diaspora-l10n-ca 2011-06-18 23:18:15 +02:00
MrZYX
d34d623b62 updated locales 2011-06-18 23:18:04 +02:00
Jordi Mallach
9a6c175dbd Better message for what's on your mind. 2011-06-17 21:14:50 +02:00
Ilya Zhitomirskiy
ef0e48a7ff A user can now revoke an application's token iz ms 2011-06-13 16:48:52 -07:00
Ilya Zhitomirskiy
3d77186d35 added authorizations page where a user can see all of their authorized applications 2011-06-13 15:40:55 -07:00
MrZYX
abedcc1cc3 updated locales 2011-06-10 02:15:03 +02:00
Ilya Zhitomirskiy
a03423309d fixed the getting started step 3, ignore the CA certs in developement is now in initializer, changed the 'login' -> 'connect' [to facebook] png 2011-06-09 15:12:35 -07:00
Ilya Zhitomirskiy
808754f8bd added the cert bundle for facebook http things 2011-06-08 18:20:47 -07:00
Raphael Sofaer
d9d66a5c31 WIP auth form and more oauth stuff 2011-06-08 11:55:11 -07:00
MrZYX
69efeb0179 updated locales 2011-06-08 19:13:20 +02:00
danielgrippi
67eaafe3a9 Chubbies no longer saves diaspora_handle from the browser 2011-06-06 15:42:58 -07:00
MrZYX
10b8f88e97 Merge branch 'master' of git://gitorious.org/diaspora-l10n-ca/diaspora-l10n-ca 2011-06-06 23:06:51 +02:00
MrZYX
be8e61ec1d updated locales 2011-06-06 23:06:32 +02:00
Jordi Mallach
cd2c37a19f Updated Catalan translation to 686464c. 2011-06-06 14:39:57 +02:00
Sarah Mei
ba9df59977 Fix migration for ruby 1.9. Move YAML check into application.rb, and add guard for ruby 1.8.x. 2011-06-04 20:12:34 -07:00
vidkun
b0879dd880 Changed yaml parser to work around bug #1120 2011-06-04 19:50:09 -07:00
MrZYX
158223319e updated locales 2011-06-05 00:59:58 +02:00
danielgrippi
e121b0fe6d Chubbies now sees that it has no secret and registers itself. 2011-06-03 16:22:38 -07:00