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

2042 commits

Author SHA1 Message Date
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