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

3030 commits

Author SHA1 Message Date
fhsdi2
931e4c4f41 Fix uncapitalization of a word 2013-01-26 16:09:34 -02:00
Jonne Haß
b654fb2d02 one unicorn worker should be enough for development 2013-01-26 13:28:40 +01:00
Ruxton
40fdf3819b Added DailyMotion & Twitter oEmbeds 2013-01-25 22:31:44 +08:00
Ruxton
89042078ca Oembed Update - Added instagram, better display for rich/photo 2013-01-22 22:37:36 +08:00
Fabián Rodríguez
d7574a9efb add locale to aspects 2013-01-16 19:59:10 -02:00
Fabián Rodríguez
29c48ca557 Add ability to toggle aspects 2013-01-16 19:33:19 -02:00
Diaspora Europe
fe2a6b5f85 Write unicorn stderr and stdout log 2013-01-16 13:11:33 +01:00
Jordi Mallach
d795ed2e3e Update Catalan translation to 597ab20. 2013-01-09 01:31:58 +01:00
Jordi Mallach
56357ce0bd Updated Catalan translation to 2d3df3e. 2013-01-09 01:22:25 +01:00
Florian Staudacher
b320e50236 bump Rails to 3.2.11 
see:
http://weblog.rubyonrails.org/2013/1/8/Rails-3-2-11-3-1-10-3-0-19-and-2-3-15-have-been-released/
 2013-01-09 00:09:07 +01:00
Jonne Haß
38eba6703e add Armenian pluralization rule 2013-01-03 23:32:50 +01:00
Jonne Haß
11f82c794e Bump to Rails 3.2.10 as per CVE-2012-5664 
https://groups.google.com/group/rubyonrails-security/browse_thread/thread/c2353369fea8c53
 2013-01-02 23:40:46 +01:00
Blaž Hrastnik
d3f5f34fa0 Load the entire lib folder refactor. 
Removed hack, replaced with a proper solution.
 2012-12-30 13:08:16 +01:00
Florian Staudacher
0092acd492 re-add hovercards 
* added a presenter for hovercard json
* added new backbone view for handling hovercard JS
* refactoring of PeopleController

* finished the backbone js version of hovercards
* don't try to make people_controller more restfull, out of scope
  just add a new route and use that for hovercard json
* added spec for people_controller#hovercard
* add new exception for "AccountClosed" to be able to raise from anywhere

* removed legacy code, since everything got ported to backbone
  (except the "cache" stuff, but that's not strictly necessary)
 2012-12-28 22:37:13 +01:00
movilla
597ab20715 Show error and flash-notice when sending messages to non contacts 2012-12-26 12:23:37 +01:00
movilla
ceace52762 Add progress percentage to upload images 2012-12-20 21:24:09 +01:00
Florian Staudacher
ff173e233c add cucumber feature for taking screenshots of important pages 
- for before/after comparisons,
including rake tasks for easily generating the images from command line
 2012-12-17 20:25:34 +01:00
Yury Bulka
d8dae23bc2 Fix typos, small improvements to Ukrainian translation 2012-12-09 13:55:26 +02:00
Yury Bulka
ae55f5ab9d Fixed and improved Ukrainian translation 2012-12-09 13:24:02 +02:00
Jonne Haß
2fcf729f64 don't use a rails method in a pre-rails environment 2012-12-08 00:50:30 +01:00
Jonne Haß
459df9b735 Merge pull request #3791 from movilla/suggest_member 
Translation "suggest member" of Community Spotlight
 2012-12-06 09:34:01 -08:00
movilla
491c2a537c Add feature contact pod admin 2012-12-06 15:26:49 +01:00
movilla
65376a604b Allow translation of "suggest member" of Community Spotlight 2012-12-06 13:15:34 +01:00
Jonne Haß
bf27cca03a Do not generate paths like /a/b/c/config/boot.rb/../../Gemfile to require and open things, create a proper path instead. 2012-11-30 18:16:56 +01:00
Jonne Haß
2a7a0b7b99 * made number of unicorn worker processes configurable 
* made configuration loader indepenent of rails
* corrected mismatch between example and default config (server.db/server.database)
 2012-11-30 14:00:25 +01:00
Jonne Haß
669dd87b11 extract configruation system to a gem 2012-11-30 13:35:59 +01:00
Dennis Schubert
656e52360f Remove REEs garbage collection [ci skip] 
We are not using REE anymore, so...
 2012-11-29 22:57:38 +01:00
Jonne Haß
7aa0726971 use file? instead of exists? to check for correct ca bundle path 2012-11-27 21:14:44 +01:00
Jonne Haß
7b548fd571 Merge pull request #3713 from davecocoa/feature/3630-backbone-ify-followed-tags 
port tagFollowings to BackBone
 2012-11-25 09:30:47 -08:00
rschaden
49d4079065 add email validation to invitations 2012-11-25 14:25:20 +01:00
Jonne Haß
f1aeecc00b force typhoeus (and thus curl) to use diaspora.yml's CA bundle 2012-11-21 17:28:39 +01:00
Jonne Haß
60aa1ffe2e post release version bump [ci skip] 2012-11-20 22:02:54 +01:00
Florian Staudacher
eea59b0918 Merge branch 'release/0.0.2.0' 
Conflicts:
	Changelog.md
	config/defaults.yml
 2012-11-20 19:11:48 +01:00
Jonne Haß
1af49a0477 updated 78 locale files [ci skip] 2012-11-20 18:54:27 +01:00
Jonne Haß
e9bccb8afe get rid of string concat of translatable strings in getting started 2012-11-18 17:24:43 +01:00
David McMullin
97664cb880 port tagFollowings to BackBone 2012-11-12 21:37:00 +00:00
Braulio Martinez
3260bada38 Remove posts#new action from Rails and related tests 2012-11-07 23:14:35 -02:00
Dennis Schubert
ba5b779cd0 Make Devise remember the session for 2 weeks. Fix #3472 2012-11-06 22:24:57 +01:00
Besnik
1d3493909d updating sq locale 2012-11-06 19:46:51 +01:00
Jonne Haß
2a45470232 Merge branch 'feature/fix-facebook-public-posts' of git://github.com/jaywink/diaspora into feature/fix_services 
Conflicts:
	Changelog.md
	app/models/services/facebook.rb
	spec/models/services/facebook_spec.rb
 2012-11-02 11:31:47 +01:00
Jason Robinson
e974d2934f Always use basic Facebook Graph API to post messages, fixes public posts. Remove unnecessary Facebook opengraph config items 2012-11-02 00:23:33 +02:00
Jonne Haß
f91ca7d650 added short description to the server section [ci skip] 2012-10-27 11:45:26 +02:00
Jonne Haß
5a70311fe7 update and fix services 2012-10-25 17:54:18 +02:00
Florian Staudacher
e0d50c8522 bump version to 0.0.1.2 2012-10-24 19:54:37 +02:00
Florian Staudacher
f0eacc801b Merge pull request #3611 from MrZYX/feature/cleanup_rake_tasks 
rake tasks cleanup
 2012-10-21 06:33:46 -07:00
Jonne Haß
f0ef4a764e refactor script/server and associated stuff 2012-10-19 12:25:15 +02:00
Jonne Haß
811ef66b1c No need for Gentoo having its own certificate_authorities example 2012-10-13 18:53:42 +03:00
Fabián Rodríguez
40f5314184 adds password_confirmation field to registration page 2012-10-11 19:45:52 -02:00
Jonne Haß
e6ec41930b Merge branch 'hotfix/0.0.1.1' into develop 
Conflicts:
	Changelog.md
	config/defaults.yml
 2012-10-09 22:37:53 +02:00
Jonne Haß
3eb628c2a3 fix french javascript pluralization rule and add specs for locale loading 2012-10-09 22:36:30 +02:00
Jonne Haß
8493dfe86d post release version bump [ci skip] 2012-10-08 13:22:43 +02:00
Jonne Haß
1f9f0c2932 Changing release mode to true, hopefully the last commit ever violating the branching model. DO NOT BACKPORT THIS COMMIT TO DEVELOP 2012-10-07 15:08:21 +02:00
Jonne Haß
fdc5811e1e made hy available, temporarily switched to git release of rails-i18n to fix #3023 [ci skip] 2012-10-07 14:30:29 +02:00
Jonne Haß
bd9b4543dc updated 15 locale files [ci skip] 2012-10-07 14:19:48 +02:00
Jonne Haß
5b73176d07 make diaspora.yml.example a bit clearer about sections [ci skip] 
thanks to @hfase01 for pointing that out
 2012-10-01 15:43:21 +02:00
Jonne Haß
5c7a9c1ce6 Release cleanup, closes #3620 
* remove un-/underused gems
* remove their associated files
* remove some parallel_tests leftovers
 2012-09-30 22:26:23 +02:00
Florian Staudacher
8678c14735 Merge pull request #3589 from MrZYX/refactor_config 
New configuration system, details: see changelog
 2012-09-30 13:07:40 -07:00
Jonne Haß
f42c4799ac updated plural rules [ci skip] 2012-09-28 16:07:48 +02:00
Jonne Haß
468982f3cc updated 28 locale files [ci skip] 2012-09-28 16:07:37 +02:00
Jonne Haß
d04d6faab7 correct dumb typo in diaspora.yml.example 2012-09-28 14:54:45 +02:00
Jonne Haß
a0d60e7333 Remove unused rake tasks, make cumber rake file the vanilla one 2012-09-27 17:07:33 +02:00
Jonne Haß
234b76a936 properly integrate asset_sync 2012-09-26 20:23:45 +02:00
Jonne Haß
e05c6e8897 drop heroku, heroku_san and associated rake tasks and files 2012-09-26 20:21:20 +02:00
Jonne Haß
ce728f6b7b add possibility to embed a resque worker into the unicorn process 2012-09-26 20:19:38 +02:00
Jonne Haß
2a4db54db9 New configuration system 
* Throw away old system
* Add new system
* Add new example files
* Replace all calls
* add the most important docs
* Add Specs
* rename disable_ssl_requirement to require_ssl
* cloudfiles isn't used/called in our code
* since community_spotlight.list is only used as enable flag replace it with such one and remove all legacy and irelevant codepaths around it
* die if session secret is unset and on heroku
* First basic infrastructure for version information
 2012-09-26 20:19:37 +02:00
Jonne Haß
1277cf92b2 refactor ci scripts 2012-09-23 19:00:52 +02:00
Jonne Haß
0a1be1400d Merge pull request #3603 from movilla/translation_ignore_user_popup 
traslation popup ignore user => /stream
 2012-09-22 13:47:34 -07:00
movilla
812fce7181 traslation popup ignore user /stream 2012-09-22 22:07:17 +02:00
Jonne Haß
24c1c908f7 remove routes to removed controller 2012-09-22 14:16:28 +02:00
Jonne Haß
6c1a1ec6d2 it's enviroNment 2012-09-15 18:52:12 +02:00
Jonne Haß
48dcccf7b3 Unify redis initialization 
REDISTOGO_URL is now deprecated in favor of REDIS_URL which is supported by the redis gem too.
 2012-09-15 18:23:22 +02:00
Jonne Haß
3e935e1104 use present to check if redis_url is empty 2012-09-12 22:30:08 +02:00
Jonne Haß
70a9218ea5 add thread_safe true to redis initialization because resque does it too now 2012-09-12 22:17:14 +02:00
Jonne Haß
142e38e78b update devise 2012-09-12 13:29:57 +02:00
Jonne Haß
ab0ad630df strip last beta leftovers and fix syntax errors, travis is kinda down, lets hope nothing breaks while I sleep 2012-09-12 05:48:12 +02:00
Jonne Haß
51bde9bf66 updated 8 locale files [ci skip] 2012-09-11 18:40:54 +02:00
Jonne Haß
a9ebe42b9f turn mailer on in test env so the stubs can take action 2012-09-07 22:12:07 +02:00
Jonne Haß
d27408d8a9 set perform_deliveries, this should fix #3524 2012-09-07 21:46:13 +02:00
Jonne Haß
3ae76cd5eb updated 14 locale files [ci skip] 2012-09-06 15:47:32 +02:00
Jonne Haß
b1173950e4 updated 26 locale files, made Sinhala and Interlingua available [ci skip] 2012-08-31 21:01:37 +02:00
Jonne Haß
984db998d3 Merge pull request #3517 from ruby-ve/locale-es_VE 
new translation
 2012-08-28 17:10:07 -07:00
Jonne Haß
b7c18be1e7 updated 19 locale files [ci skip] 2012-08-29 00:12:38 +02:00
Johan
3e3701f325 adding devise.es-VE.yml es-VE.yml javascript.es-VE.yml 2012-08-28 02:50:04 -04:30
Maxwell Salzberg
61f40fc6bf Revert "rails admin is conflicting with client side validations: see https://github.com/sferik/rails_admin/issues/985" 
This reverts commit b70165b97f.
 2012-08-28 00:19:35 -07:00
Maxwell Salzberg
b70165b97f rails admin is conflicting with client side validations: see https://github.com/sferik/rails_admin/issues/985 2012-08-28 00:07:52 -07:00
Jonne Haß
e12ea34ed0 updated 17 locale files [ci skip] 2012-08-13 01:00:50 +02:00
Jonne Haß
311e20bf20 updated 12 locale files [ci skip] 2012-08-05 12:53:47 +02:00
Adrián Chaves Fernández (Gallaecio)
950ad57a49 Updated the Galician (gl) translation. 2012-08-05 08:25:10 +02:00
Jonne Haß
42b8e8f1ea if you have a : in a translatable string and no %{} you already know you're doing it wrong [ci skip] 2012-08-04 19:46:29 +02:00
Jonne Haß
87a091ced1 updated 25 locale files [ci skip] 2012-07-24 22:10:39 +02:00
Florian Staudacher
b9c4e8a02f let the 'toggle mobile' link show in the footer, refactored layout a bit 2012-07-22 15:25:51 +02:00
Jonne Haß
ec7ae5c2c9 fix gl locale 2012-07-12 13:18:12 +02:00
Jonne Haß
98d70d3be3 Merge branch 'master' of git://gitorious.org/diaspora-l10n-ca/diaspora-l10n-ca 2012-07-12 13:11:28 +02:00
Jonne Haß
6f5929c50f updated 6 locale files [ci skip] 2012-07-12 13:11:21 +02:00
Jordi Mallach
049c5e602e Catalan translation updated to 8c8ff1f. 2012-07-12 13:05:03 +02:00
Jordi Mallach
05eccde08e Update Catalan translation to 8c8ff1f. 2012-07-12 12:54:34 +02:00
Florian Staudacher
ea8f358a9a use unminified jQuery textchange plugin 2012-07-10 17:58:34 +02:00
Adrián Chaves Fernández (Gallaecio)
17c4370894 Updated the Galician (gl) translation. 2012-07-08 14:58:58 +02:00
Jonne Haß
24f406073c updated 16 locale files [ci skip] 2012-07-08 01:53:03 +02:00
Lawrence Leonard "Larry" Gilbert
37b6045c04 Clarify warning shown when single_process_mode used in production 2012-07-04 18:02:40 -07:00
Jonne Haß
827bb82e5b make serbian translation available 2012-07-02 16:44:46 +02:00
Jonne Haß
168c0ee228 updated 41 locale files [ci skip] 2012-07-02 16:40:22 +02:00
Jonne Haß
8c8ff1f8b8 there's no need anymore to specify all possible pluralization keys unless there are other keys alongside them 2012-06-24 12:43:15 +02:00
Jonne Haß
c9e54700ff string concatenation is still bad 2012-06-24 12:21:52 +02:00
movilla
1417cd5b0f Last translation admin-panel (weekly user) 2012-06-24 02:34:49 +02:00
Jonne Haß
7955600533 updated 13 locale files [ci skip] 2012-06-21 16:18:12 +02:00
Maxwell Salzberg
51661091d5 Merge pull request #3385 from Raven24/federation-colors 
Federation logger stuff[ci skip]
 2012-06-15 11:55:25 -07:00
Florian Staudacher
0fb0bf00af be more specific in config, point to more info [ci skip] 2012-06-15 20:14:51 +02:00
Florian Staudacher
0ce411c11c fix startup error for integration envs 2012-06-15 15:30:49 +02:00
Jonne Haß
aa3a6f9439 updated 37 locale files [ci skip] 2012-06-14 15:53:18 +02:00
Florian Staudacher
acc62e7380 forgot to put new css file in precompile list [ci skip] 2012-06-12 13:19:05 +02:00
Steven Hancock
a8de3a5a3f Rails.root and File.join cleanup 
- `Rails.root` is a `Pathname`, so let's use `Rails.root.join`
- Clean up most of the remaining `File.join`s
 2012-06-11 03:13:20 -07:00
Florian Staudacher
e021fd821d Merge pull request #3362 from diaspora/non-public-error-page 
show a "post is not public" message when visitor is not logged in
 2012-06-11 02:35:48 -07:00
Adrián Chaves Fernández (Gallaecio)
994ece57f5 Updated Galician (gl) translation. 2012-06-10 12:57:09 +02:00
Florian Staudacher
8ca39f5936 show a "post is not public" message when visitor is not logged in 
and tries to access a show page of a non-public post
 2012-06-07 22:16:37 +02:00
Florian Staudacher
09cf60f794 use File.join when it's already there 2012-06-07 21:19:41 +02:00
Jonne Haß
46a01664bb fix minor typo: eliminate double spaces [ci skip] 2012-06-05 19:07:44 +02:00
Maxwell Salzberg
9071540400 use pod name helper in emails 2012-06-04 14:04:39 -07:00
Maxwell Salzberg
64bf4a1f48 adding the ability to customize your open graph namespace 2012-06-01 17:31:34 -07:00
Jonne Haß
2773694ba3 minor spelling fix [ci skip] 2012-06-01 23:02:56 +02:00
Jonne Haß
0592eb025e updated 14 locale files [ci skip] 2012-05-31 17:22:58 +02:00
danielgrippi
72d2f619fc added GA back into rack; added mixpanel configuration options 2012-05-30 13:30:28 -07:00
Maxwell Salzberg
82c4e0d577 add a podname app config var, and use it throughout the app 2012-05-30 12:11:59 -07:00
Maxwell Salzberg
234bb4cb56 Merge pull request #3302 from movilla/new_login 
Translation new make something /stream [ci skip]
 2012-05-29 11:45:24 -07:00
Steven Hancock
c2bc7272fb Escape hashtags in emails 
Custom Redcarpet renderer to escape hashtags (but not legitimate headers)
in emails before Markdown processing. Prevents hashtags from being rendered
as H1 headers. This also leaves open the possibility of parsing hashtags
into clickable links in the future.

fixes #3325
 2012-05-28 21:31:27 -07:00
fechterjm
4011ac4ba4 ## their stream and get news about Diaspora, but if you don't want 
## your server to contact joindiaspora.com, set this to false:

should be

## their stream and get news about Diaspora, but if you want
## your server to contact joindiaspora.com, set this to false:
 2012-05-27 13:01:15 -03:00
Jonne Haß
2d39788ba3 updated 34 locale files [ci skip] 2012-05-25 23:34:31 +02:00
Hans Fase
5f38486ab8 Reverted "NewHere" camel-case. Looks like someone awesome fixed the problem. ;) 2012-05-24 23:54:04 -03:00
Maxwell Salzberg
75277b4d0e gzip outgoing stuffs for great success 2012-05-24 13:02:20 -07:00
Maxwell Salzberg
980ec78b7b fix piwki loading [ci skip] 2012-05-23 11:03:02 -07:00
movilla
a7f967c2c5 Translation new make something /stream 2012-05-23 00:43:45 +02:00
Jonne Haß
0030788a2c make pt-PT available [ci skip] 2012-05-22 17:57:25 +02:00
Jonne Haß
5c534521cc top level email is a noun, not a verb [ci skip] 2012-05-22 10:26:21 +02:00
Florian Staudacher
d815cf5d82 take acts-as-taggable-on gem from git, solve tag case-sensitivity 2012-05-21 17:20:04 +02:00
Hans Fase
04c3187f4f Changed NewHere to lowercase. Otherwise posts will not show up in stream! > https://github.com/diaspora/diaspora/issues/3237 2012-05-21 03:13:46 -03:00
Jonne Haß
ccf3bc36f2 updated 20 locale files [ci skip] 2012-05-20 00:36:31 +02:00
Maxwell Salzberg
d069865c42 upgrade carrierwave to 0.6.2 2012-05-17 18:51:12 -07:00
Maxwell Salzberg
20a63e3497 make the jquery can default to false in development and test so test can run offline [ci skip] 2012-05-17 18:50:51 -07:00
Maxwell Salzberg
a6758c0832 Merge pull request #3264 from movilla/share_amparito 
Translation invitation Share this link /stream [ci skip]
 2012-05-16 17:48:14 -07:00
Maxwell Salzberg
455dc34eae remove hotlink controller, just rewrite those landing assets 2012-05-16 15:02:59 -07:00
Maxwell Salzberg
143df27e5a redirect old atom.xml :( [ci skip] 2012-05-16 14:48:01 -07:00
danielgrippi
08fddf7422 raise on hotlinking [ci skip] 2012-05-16 14:41:09 -07:00
movilla
d394272e5d Translation invitation Share this link /stream 2012-05-16 00:56:34 +02:00
Maxwell Salzberg
4d9df0ec25 Merge pull request #3263 from movilla/stats_amparito2 
[Rebase] Add translation app/views/admins/stats.html.haml for Admin Panel [ci skip]
 2012-05-15 15:52:39 -07:00
danielgrippi
d7a099dadb add publish_actions to facebook connection [ci skip] 2012-05-15 14:07:34 -07:00
Maxwell Salzberg
900067ba1e disable the mass assignment thing until we deal with it [ci skip] 2012-05-15 13:35:22 -07:00
Movilla
a3daa00a41 Rebase Add translation app/views/admins/stats.html.haml for Admin Panel 2012-05-15 22:27:08 +02:00
Jonne Haß
9950342599 updated locales [ci skip] 2012-05-15 17:09:13 +02:00
Maxwell Salzberg
ab2e740ca2 upgrade to Rails 3.2.3 2012-05-14 21:53:16 -07:00
Dennis Collinson
927b78b79d kill references to ServiceUser 2012-05-14 18:47:14 -07:00
Maxwell Salzberg
379df76118 Update to faraday-middleware, as faraday stack has been deprecated. 
Hopefully this will make REE happy in Travis
 2012-05-14 15:59:07 -07:00
Maxwell Salzberg
ad6151c808 Revert "@joshsusser hates our ci setup, /cc @suss" 
This reverts commit cbca19b3f5.
 2012-05-14 15:59:06 -07:00
Maxwell Salzberg
7a6633e82a Merge pull request #3256 from SuperTux88/invitation-mail 
Invitation mail cleanup
 2012-05-14 15:38:43 -07:00
Maxwell Salzberg
9d20f66d2f Merge pull request #3252 from movilla/regis_tra 
Translation registrations/new [ci skip]
 2012-05-14 15:18:52 -07:00
Benjamin Neff
5db6604d79 remove old invite_code_url from locales 2012-05-13 03:21:56 +02:00
Benjamin Neff
9abfb6a266 make invite url clickable 2012-05-13 03:17:16 +02:00
Dennis Collinson
f6e3c1b88b seperate interactions from posts 
Lazily load post interactions on show page
hella refactorz
 2012-05-12 17:41:58 -07:00
movilla
7538f89a95 Translation registrations/new 2012-05-12 22:18:10 +02:00
Steven Hancock
b16f309aca Upgrade Rails Admin to latest gem 
This gives us a clean fix for the Kaminari vs. Will Paginate
issues and fixes a few other little bugs in Rails Admin.

fixes #3210
 2012-05-11 03:32:05 -07:00
danielgrippi
608a15faf4 the landing page. 2012-05-11 01:06:51 -07:00
Maxwell Salzberg
eaedfc9827 create a new publisher using the new composer. only for beta users 2012-05-09 16:55:33 -07:00
Steven Hancock
4c644c336b Actually only load rails admin in production mode 
This is what I think 28f8db51e7 was supposed to do.

With the initializer in an "unless Rails.env.production?" block
the entire initializer was being ignored in production mode and
loaded in all other environments, but Rails Admin was still
loading regardless of that. 😁

This only loads rails admin in production and excludes it from
all other environments. Also keeps non-admins out of /admin_panel
(without the initializer it was free-for-all) and temp fixes #3210
until a new gem is released.
 2012-05-09 11:46:18 -07:00
danielgrippi
0ec364e44c DG MS; popup on services, inlined in the composer 2012-05-08 18:09:33 -07:00
Maxwell Salzberg
3a6f32e2d7 Merge pull request #3240 from pubis/update-federation-logger 
Update federation logger
 2012-05-08 10:01:00 -07:00
Jonas Lundqvist
324663e4b4 match integration pod ports 2012-05-08 12:42:12 +02:00
Jonne Haß
d444a1dc56 updated 47 locale files [ci skip] 2012-05-08 12:21:45 +02:00
Jonas Lundqvist
819bb95dbd reorder so integration2 connects to correct redis port 2012-05-08 11:20:56 +02:00
Jonas Lundqvist
436ec039c8 remove debug_rjs reference 2012-05-08 11:20:42 +02:00
danielgrippi
56913ffb80 upload wallpaper for great success. 2012-05-06 12:35:11 -07:00
Maxwell Salzberg
2f618f6dde Merge pull request #3230 from movilla/close-amparito 
Translation "[X] Close" photo-post [ci skip]
 2012-05-06 10:09:04 -07:00
movilla
bca5d3ffa7 Translation "[X] Close" photo-post 2012-05-05 14:39:58 +02:00
Adrián Chaves Fernández (Gallaecio)
52964ec7c9 Updated the Galician translation. 2012-05-05 13:21:48 +02:00
Dennis Collinson
0fc399243b fix next post and previous post, more efficient 
make controller actions
make the presenter reflect that it is instance data ;-p

needs tests lol.
 2012-05-04 18:25:09 -07:00
danielgrippi
5821a84024 validations and all that jazz [ci skip] 2012-05-04 17:38:08 -07:00
danielgrippi
31af414a04 actually use labels, html5 validations, etc [ci skip] 2012-05-04 17:38:08 -07:00
danielgrippi
7be7acdfd6 add chartbeat option for great success (and metrics) 2012-05-03 14:04:19 -07:00
Liam Nicholson
01c51d26f5 Fix 'go' Admin Translation 2012-05-03 20:24:25 +01:00
Jonne Haß
5b7342bb8e updated 34 locale files [ci skip] 2012-05-03 12:12:12 +02:00
danielgrippi
fe49579ff5 remove google-analytics middleware due to the fact that it doesn't support injection of custom variables before _trackPageView is called (this results in custom vars not getting tracked) 
i've submitted an issue to the gem.  hopefully we can put it back in later… for now i've copy and pasted its output into a helper method.
 2012-05-01 18:02:25 -07:00
movilla
4d3ba4f274 Little traslation "HOME" /post 2012-05-01 17:43:51 +02:00
danielgrippi
bbd4ee5738 correctly redirect for beta and admin users (profile vs stream homepages) 2012-04-28 15:09:02 -07:00
movilla
57e6c3861e Translation popup "Reshare author's post?" /stream 2012-04-28 23:42:37 +02:00
Florian Staudacher
462959fbcd Merge pull request #3190 from diaspora/reshare-flash 
use flash message instead of just appending reshares to the current stream
 2012-04-28 10:04:40 -07:00
Sean Tilley
f2bbbec49e Merge pull request #3192 from ktkaushik/patch-1 
Updated readme. [ci skip]
 2012-04-27 11:07:16 -07:00
Jonne Haß
560da5ce98 Merge pull request #3193 from ktkaushik/better_pirate_translation 
Modified Pirate Translation making it better.
 2012-04-27 09:48:54 -07:00
Kaushik Thirthappa
1dae3d9f47 Modified Pirate Translation making it better. 2012-04-27 21:51:13 +05:30
Kaushik
9ab6bf1af5 Updated readme. 2012-04-27 16:28:24 +05:30
Florian Staudacher
0dee8aae36 [reshares] display flash message instead of just appending it to the stream (fixes #2094) 2012-04-27 00:57:20 +02:00
Jonne Haß
8cea8715eb updated 6 locale files [ci skip] 2012-04-26 15:43:09 +02:00
Jonne Haß
eb2eaa8ea1 updated 50 locale files [ci skip] 2012-04-25 22:49:40 +02:00
Maxwell Salzberg
d22a98cd96 monkey patch to_xs for ruby 1.8, and fix a test as a result 2012-04-25 11:38:42 -07:00
Maxwell Salzberg
70fb426487 Merge pull request #3184 from movilla/amparito_users 
Add translation app/views/admins/user_search.html.haml - Admin Panel
 2012-04-25 10:28:39 -07:00
Steven Hancock
87ceabc0ba Precompile Rails Admin assets 
Rails Admin adds its CSS and Javascript assets to the asset pipeline
in an initializer, which doesn't run if config.assets.initialize_on_precompile
is disabled. This manually adds those assets in config/application.rb to make
sure they get precompiled on each deploy.

See 579785c120
 2012-04-25 04:50:46 -07:00
Dennis Collinson
e55073fdd4 temp reverting to prove max wrong. 
Revert "killing rails admin to investigate if its what's causing boot and deploy to be so slow"

This reverts commit 78bcb1c321.
 2012-04-24 16:45:25 -07:00
Dennis Collinson
78bcb1c321 killing rails admin to investigate if its what's causing boot and deploy to be so slow 2012-04-24 16:30:31 -07:00
Maxwell Salzberg
28f8db51e7 only load rails admin in production mode 2012-04-24 13:48:14 -07:00
Maxwell Salzberg
66e9423dc9 more cool seed fixings 2012-04-24 13:48:14 -07:00
Maxwell Salzberg
7fb3e8e901 for now; Revert "updated 50 locale files [ci skip]" 
This reverts commit a9dd997f23.
 2012-04-24 12:20:58 -07:00
Jonne Haß
a9dd997f23 updated 50 locale files [ci skip] 2012-04-24 18:14:01 +02:00
Maxwell Salzberg
6c5dafa6e9 cool seed wip [ci skip] 2012-04-24 01:13:57 -07:00
movilla
cc329594c5 Add translation app/views/admins/user_search.html.haml - Admin Panel 2012-04-24 02:05:13 +02:00
danielgrippi
75d25e9475 users can now favorite posts 2012-04-22 12:06:15 -07:00
Dennis Collinson
062de4c269 MDC DC New Profile shows users info 
Profile show json
Profile backbone model
 2012-04-21 13:12:56 -07:00
Jonne Haß
579785c120 do not load the whole env to precompile assets [ci skip] 2012-04-20 23:56:52 +02:00
Maxwell Salzberg
63616c5ced trying this on for size again; Revert "I can't test this at this momement. I will put it back in once i have a" 
This reverts commit 53304df740.

Conflicts:

	config/initializers/airbrake.rb
 2012-04-19 21:02:29 -07:00
Dennis Collinson
8cc5f86298 reverting some test env munging 
max isn't a princess
learn2git
learn2bash
lulz
 2012-04-19 14:59:33 -07:00
Dennis Collinson
cbca19b3f5 @joshsusser hates our ci setup, /cc @suss 
Revert "silence asset noise in development.  Thanks to @joshsusser. @denniscollective said I should put something pithy here, but that sounds like a bad idea."

This reverts commit 1307907330.
 2012-04-19 14:43:19 -07:00
Dennis Collinson
8386179f16 max, you're a princess, WIP 2012-04-19 11:15:59 -07:00
Dennis Collinson
7831f9cad3 Max Salzberg was wrong. 
/cc @joshsusser @groupon @dhh
 2012-04-18 18:04:38 -07:00
Maxwell Salzberg
1307907330 silence asset noise in development. Thanks to @joshsusser. @denniscollective said I should put something pithy here, but that sounds like a bad idea. 2012-04-18 17:26:27 -07:00
Maxwell Salzberg
c9e3852de8 oembed mostly works 2012-04-18 16:12:56 -07:00
Maxwell Salzberg
b10aedb615 update the iframe route, fix a small styleing thing in newspaper style for iframe view 2012-04-17 22:43:47 -07:00
Maxwell Salzberg
90a2f05515 include an iframe route, for posts, and a magic body padding removal for screens with small widths (for some reason, smaller than 770 2012-04-17 22:28:01 -07:00
Sean Tilley
4d95c52960 Image Redirect URL should be blank [ci skip] 2012-04-18 00:18:22 -05:00
Sean Tilley
d46734e90c Set single_process_mode to true by default [ci skip] 2012-04-17 23:27:34 -05:00
Jonne Haß
25f6df230d Merge pull request #3150 from Gallaecio/l10n-gl 
Updated the Galician translation.
 2012-04-17 13:59:43 -07:00
Maxwell Salzberg
d456fed99c Merge pull request #3148 from DeadSuperHero/appconfiglove 
Refactor application.yml.example [ci skip]
 2012-04-17 10:48:24 -07:00
Jonne Haß
b99e77d8ce Merge branch 'master' of git://gitorious.org/diaspora-l10n-ca/diaspora-l10n-ca 2012-04-16 23:59:03 +02:00
Jonne Haß
959523aae8 updated 22 locale files [ci skip] 2012-04-16 23:58:57 +02:00
Maxwell Salzberg
24b69236a0 exclude share vis in rails admin, dont exclude users [ci skip] 2012-04-15 17:58:49 -07:00
Jordi Mallach
00e42b11f2 Fix typo in Catalan translation (thanks to David Bas@JD). 2012-04-15 21:54:08 +02:00
Jordi Mallach
c9fff4a435 Update Catalan translation to 4d92653. 2012-04-15 19:09:01 +02:00
Jordi Mallach
4d92653874 Fix typo in key name: seperated → separated. 2012-04-15 19:07:59 +02:00
Jordi Mallach
2bb9fbf58d Fix typo in key name: autorize → authorize. 2012-04-15 19:05:03 +02:00
Jordi Mallach
7b73c62a0b Update Catalan translation to cac2b1e. 2012-04-15 18:56:55 +02:00
Adrián Chaves Fernández (Gallaecio)
0956fbbdb6 Improved the Galician translation and fixed a quoting error. 2012-04-14 22:44:13 +02:00
Adrián Chaves Fernández (Gallaecio)
c659b8f393 Updated the Galician translation. 2012-04-14 22:29:52 +02:00
Steven Hancock
7e517c2636 Initialize on asset precompile 
This re-enables 'config.assets.initialize_on_precompile' to allow the
Rails Admin assets to precompile. On Heroku deploys, this may require
the Heroku Labs 'user_env_compile' feature to be enabled, which you
should be using anyway for Asset Sync to work properly. :)
 2012-04-13 20:42:05 -07:00
Maxwell Salzberg
ecc1a84b42 rails_admin; i do what i want 2012-04-13 18:08:52 -07:00
Sean Tilley
af389a97f8 refactor appconfig 2012-04-13 19:56:46 -05:00
Sean Tilley
aaa8930264 Refactor AppConfig 2012-04-13 19:46:23 -05:00
Maxwell Salzberg
c4b36a179e Merge pull request #3138 from stevenh512/bootstrap-sass 
bootstrap-sass (w00t)
 2012-04-13 17:44:08 -07:00
Maxwell Salzberg
9791d8bfa9 remove production pod url override [ci skip] 2012-04-13 10:37:40 -07:00
Maxwell Salzberg
e861357463 change some defaults for the test enviroment, make a basic install script in bash 2012-04-13 09:49:03 -07:00
Jonne Haß
d20af894a4 whoops, dashes and symbols, ya know, I'm sorry [ci skip] 2012-04-12 20:23:16 +02:00
Jonne Haß
16f201fea5 art_nvi -> art-nvi [ci skip] 2012-04-12 18:27:16 +02:00
Jonne Haß
400bfd19d8 updated 55 locale files [ci skip] 2012-04-11 22:14:27 +02:00
Jonne Haß
cac2b1e10b lets just avoid no and yes as keys in YAML, too many issues. Thanks! [ci skip] 2012-04-11 22:06:33 +02:00
Jonne Haß
de3e157698 Revert "updated 14 locale files [ci skip]" 
This reverts commit a0a804e88b.
 2012-04-11 22:01:28 +02:00
Jonne Haß
a0a804e88b updated 14 locale files [ci skip] 2012-04-11 21:56:42 +02:00
Steven Hancock
021cc99492 bootstrap-sass 
Upgrade our current Bootstrap 1 and 2 dependencies to use Bootstrap 2.0.2
from the bootstrap-sass gem.

I had to modify layouts/application to get the stream page to render properly,
looks like a slight conflict between Bootstrap and Blueprint grid systems, with
.span-24 instead of .row I was seeing the whole right bar dropped to the bottom
of the page below the left bar.

I also modified two other templates since Bootstrap 2.0.2 includes a "badge"
class that was making our navbar badges look funny. :)
 2012-04-11 06:16:01 -07:00
Jonne Haß
1ea2473986 YAML gotchas part 2: you can't use those references or whatever they're called before they are defined 2012-04-10 22:08:21 +02:00
Jonne Haß
8739d618ba reenable pg on travis but let it use a basic database.yml 2012-04-10 21:53:33 +02:00
Maxwell Salzberg
0eb946497f Merge pull request #3101 from despora/fallback_for_donation 
added fallback for donation
 2012-04-09 10:24:20 -07:00
Jonne Haß
b59c54c131 apparently a plain no in YAML evaluates as false, even as key 2012-04-09 15:47:32 +02:00
Jonne Haß
f6cb204699 updated 14 locale files, added estonian [ci skip] 2012-04-09 15:13:00 +02:00
Jonne Haß
bc983ee7d2 remove copy-pasta fail by me 
Uh I'm sorry about that, why did nobody every complain about this? oO
 2012-04-09 14:28:53 +02:00
Jonne Haß
2f7bed1f44 Merge pull request #3128 from m4tze/master 
email-invitation translation error in subject and body
 2012-04-09 05:26:34 -07:00
Jonne Haß
2205353171 Merge pull request #3127 from movilla/amp_arito3 
Add translation /authorizations fix image
 2012-04-09 05:19:48 -07:00
matze
76073d45ed ~FIX: changed the translate pattern inside notifier.rb: correct mail subject will be translated 
~Translate: changed the mail contents of the invitation mail: no weird html string below the invitecode url.

- M
 2012-04-09 00:25:08 +02:00
movilla
6ded31a940 Add translation /authorizations fix image 2012-04-08 15:33:46 +02:00
Besnik
62c4469a9c using other quotes throughout the file 2012-04-06 23:21:40 +03:00
Besnik
44f48f7ae1 using other quotes throughout the file 2012-04-06 23:21:00 +03:00
Besnik
866524aff2 update-for-sq-locale - adding javascript.sq.yml 2012-04-06 20:13:30 +03:00
Besnik
65c698b448 update-for-sq-locale - adding devise.sq.yml 2012-04-06 20:13:30 +03:00
Jonne Haß
0850d5147f fix syntax errors in sq locale 2012-04-06 00:40:23 +02:00
Besnik
f0ef59256f Updating the translation for sq 2012-04-06 00:50:08 +03:00
Jonne Haß
9c85b0b42b hotfix spanish locale [ci skip] 
If anybody has a cool idea on how to generally sanitize the input for the tag_path (own helper method?) that would be great
Thanks to jankusanagi for pointing me to this
 2012-04-05 15:55:00 +02:00
Jonne Haß
9c337ac03e updated locales [ci skip] 2012-04-05 03:43:48 +02:00
Steven Hancock
39b0c2de11 Only load Asset Sync when S3 is configured 
I consider this a hack, it needs review so I won't push it straight
to the main repo. I tried putting the same code in an initializer but
that appears to be too late to properly initialize the asset_sync
engine.

See diaspora/diaspora#3102
 2012-04-04 04:19:37 -07:00
Lennart Prelle
01ed9fc9d9 fallback to diaspora donation if no paypal-id is present 2012-04-04 11:44:06 +02:00
Maxwell Salzberg
16354ae712 jammit rip 2012-04-03 22:53:53 -07:00
Maxwell Salzberg
bb5aa2821d use the built in asset_sync initializer. add a rake task to bootstrap 
heroku and asset sync, which puts the S3 config vars in from your app
config.
 2012-04-03 14:47:33 -07:00
Maxwell Salzberg
4ba3ec0b42 update initializer 2012-04-02 18:43:18 -07:00
Maxwell Salzberg
b33ee8c688 add asset sync gem 2012-04-02 18:32:35 -07:00
Maxwell Salzberg
2da0c0f585 never use s3 in the test env ::sigh:: 2012-03-29 16:11:32 -07:00
Maxwell Salzberg
79a09dbea6 Merge pull request #3069 from movilla/trad_mobile 
Small translations of mobile "My Activity" and add translation "via mobile" for mobile posts
 2012-03-29 12:14:35 -07:00
movilla
2d1393b0c5 Add translation: via mobile 2012-03-29 17:33:51 +03:00
Steven Hancock
6abe718227 Mobile UI fixes 
This fixes issues with mobile UI rendering

Issues fixed:
* vendor/bootstrap.css and vendor/bootstrap-responsive.css need to
  be precompiled for the mobile UI to render properly
* Rails 3.1 is more strict about layout fallbacks, the single-post
  view in the mobile UI needs to have the "application" layout
  specified to render properly
 2012-03-29 05:52:45 -07:00
Steven Hancock
731446e078 Stylesheet naming issue (new-templates.css) 
Replace all references to new_templates.css with the correct filename,
new-templates.css
 2012-03-29 01:29:07 -07:00
Dennis Collinson
755ff52452 turn asset pipeline debugging off 
there was a collision with the aspects-dropdown view in the new
publisher, also
it takes too much time with it on
 2012-03-28 19:01:44 -07:00
Steven Hancock
76bbe7be3f Precompile more Javascript assets 
This should be the last of them, I've gone through every view and made sure
that every javascript file included by a javascript_include_tag is now on the
list of assets to precompile.
 2012-03-27 18:08:29 -07:00
Steven Hancock
f96fc5834f Make the Mention button work with the asset pipeline 
* Fix the javascript_include_tag in the status_messages/new view
* Precompile pubhlsiher.js and jquery.textchange.min.js

This fixes a 500 error that was being thrown when the Mention button
was clicked, due to the above two javascripts not being precompiled
and a javascript include that needed to be updated to load
jquery.textchange.js from the correct path.
 2012-03-27 18:08:28 -07:00
Steven Hancock
95b1603a36 Precompile contact-list.js 
Add contact-list.js to the list of precompiled assets.

contact-list.js is required to display user serarch results, but was not
precompiled by default (in jammit or in the asset pipeline), which causes
a 500 error on Heroku.
 2012-03-27 18:08:28 -07:00
Steven Hancock
b24a4a7213 Correctly enable the asset pipeline 
* Add the Rails 3.1+ Bundler.require statement to config/application.rb
  (properly enabling the :assets group)
* Move handlebars_assets gem into the :assets group where it belongs. :)
* Downgrade sass-rails to 3.1.4 since enabling the :assets group exposed
  a known bug in sass-rails ~> 3.1.5 [rails/sass-rails#78].
 2012-03-27 18:08:27 -07:00
Steven Hancock
95d5c9ca68 Fix Jasmine tests - first pass 
193 specs | 5 failing

The 5 failing specs appear (according to Firebug) to be due to missing
fixtures and/or missing routes in the Jasmine environment. Fixing these
last 5 failures is a task probably best left to a more experienced
Javascript/Jasmine developer.

This commit also moves validation.js and clear-form.js into
app/assets/javascripts and precompiles validation.js
 2012-03-27 18:08:27 -07:00
Steven Hancock
e1607baff4 jquery_include_tag helper 
Implement the jquery_include_tag helper, which is used in several
views but was not implemented in the code. This helper attempts to
load jQuery from the Google CDN (matching the version of the vendored
jquery.js in jquery-rails), falling back to the vendored copy if the
google CDN fails. The helper also loads jquery_ujs.js from jquery-rails.

A jquery_cdn setting is added to application.yml to enable or disable
serving jQuery from the Google CDN (for those podmins who would rather
not use Google's services).

Update app/views/application.html.haml to use the jquery_include_tag
helper since it was the only view that was including the vendored
copy of jquery directly with jquery_include_tag.
 2012-03-27 18:07:44 -07:00
Steven Hancock
1aa0b15c8c Move Javascript to the asset pipeline 
* Move all Diaspora-specific javascripts to app/assets/javascripts
* Move all vendored javascripts to vendor/assets/javascripts
* Add the appropriate Sprockets require directives to make sure
  everything gets included in the right order
* Remove Jammit dependencies
* Fix all templates that were using Jammit's include_javascripts helper
* Add handlebars_assets gem for compiling Handlebars templates
* Move all Handlebars templates to app/assets/templates and rename
  from .handlebars to .jst.hbs (this is to keep them in the same
  global JST namespace that they were in under Jammit)
* Add public/assets to .gitignore since these files can and should
  be re-generated by Heroku or Capistrano during each deploy
* Fix a few Handlebars templates that were looking for images in the
  wrong location (I'm sure there are others, but it's late)
* Configure application.rb to precompile all javascript and css assets
  that were compiled by Jammit in the Rails 3.0 code
 2012-03-27 18:07:44 -07:00
danielgrippi
9dffb426d4 remove jquery from assets; wip 2012-03-27 18:07:23 -07:00
danielgrippi
f72f1d4059 more progress 2012-03-27 18:07:22 -07:00
danielgrippi
06936bcdce stylesheets are basically now being served from sprockets 2012-03-27 18:07:20 -07:00
Dennis Collinson
11eb1eb7d8 MS DC fix tests 2012-03-27 14:52:53 -07:00
Dennis Collinson
37bf5c5aee REMOTIPART WIP 2012-03-27 14:52:51 -07:00
danielgrippi
4c46cc4246 MS DG; mentions work in new publisher 2012-03-27 14:52:50 -07:00
Dennis Collinson
3a47590d06 DG DC OMG FORMZ 2012-03-27 14:52:50 -07:00
Dennis Collinson
9fbc4b745a MS DC posting from post/new werks 2012-03-27 14:51:40 -07:00
Dennis Collinson
ab35f2bf3d MS DC posts/new page init 2012-03-27 14:51:40 -07:00
Jonne Haß
67a2f29e84 updated 12 locale files [ci skip] 2012-03-27 13:07:04 +02:00
Florian Staudacher
b7b8a11551 fix #2665 - allow umlauts and other non-ascii characters in url 2012-03-24 00:10:36 +01:00
Jonne Haß
37d4f97764 updated 22 locale files [ci skip] 2012-03-23 13:26:16 +01:00
Dennis Collective
f55e6fa5a1 Merge pull request #3039 from movilla/master 
Add translation app/views/admins/correlations.haml[ci skip]
 2012-03-22 14:37:10 -07:00
movilla
3b2725f133 Comprobación para el castellano para app/views/admins/correlations.haml 2012-03-22 21:57:29 +01:00
movilla
1c14f4bdf3 Update en.yml for translation app/views/admins/correlations.haml 2012-03-22 21:51:21 +01:00
Dennis Collective
a369ee6145 Merge pull request #3037 from movilla/master 
Add translation app/views/admins/_admin_bar.haml for Admin Panel
 2012-03-22 11:44:26 -07:00
movilla
c8c708930f Añadida comprobación en castellano 2012-03-22 17:02:51 +01:00
movilla
708c61bc2f Upload en.yml for translation /app/views/admins/_admin_bar.haml 2012-03-22 17:01:12 +01:00
danielgrippi
e19c84b5a3 remove the monkey patch that didn't work. 2012-03-21 13:58:20 -07:00
danielgrippi
03409495f9 better patch for ActiveSupport 2012-03-21 13:50:24 -07:00
danielgrippi
9c0ed946a7 no more rspec failures; and suppress a warning with a backported 
monkeypatch
 2012-03-21 13:50:24 -07:00
danielgrippi
5c431d933f MS DG down to four failures 2012-03-21 13:50:24 -07:00
Maxwell Salzberg
835f808e5a more progress 2012-03-21 13:50:24 -07:00
Maxwell Salzberg
35a6f4f265 basic 3.1 upgrade... a few things are still broken. help me out and run the tests and fix them <3 2012-03-21 13:50:24 -07:00
Jonne Haß
3c23364fbc refactor locale initialization and selection a bit 2012-03-21 19:25:47 +01:00
movilla
2d32595db6 Añadida traducción en castellano para comprobar 2012-03-21 15:41:53 +01:00
movilla
965c30f406 Update config/locales/diaspora/en.yml 2012-03-21 15:37:54 +01:00
Maxwell Salzberg
416b577eca I am a jerk and I told someone to take this out last night fixes #3027 2012-03-20 15:17:41 -07:00
Jonne Haß
dceb3253a0 updated 8 locale files [ci skip] 2012-03-20 14:00:05 +01:00
Benjamin Neff
042a125f4d fix legacy routes for old invite links 2012-03-20 03:47:48 +01:00
Maxwell Salzberg
af008ab713 remove unused expander plugin 2012-03-19 19:13:15 -07:00
Jonne Haß
491d484a2e updated 28 locale files [ci skip] 2012-03-18 22:22:07 +01:00
Maxwell Salzberg
aee17798c1 rearrange some of the invite link stuff. This still needs some serious love but we now place emphisis on the link, rather than the email form 2012-03-17 17:10:08 -07:00
Jonne Haß
7e7de439f8 fix untranslatable stuff from the invite refactor 2012-03-17 13:52:46 +01:00
Maxwell Salzberg
11505a386c adding a test for decremented invites, as, and check the invite is valid in the controller 2012-03-16 17:56:35 -07:00
Maxwell Salzberg
319b3c4d3b fixed rspec tests, more fit and finish around how the invite code works, 
and improving admin functionality
 2012-03-16 17:56:35 -07:00
Maxwell Salzberg
7bac633987 invite_link functionailty mostly works 2012-03-16 17:56:35 -07:00
Diaspora Europe
d626148a83 fix will paginate renderer 2012-03-16 18:58:01 +01:00
Daniel Grippi
39ee27acf0 Merge pull request #3003 from diasp/will-paginate-bootstrap 
mobile: added will paginate for bootstrap
 2012-03-15 12:09:29 -07:00
Florian Staudacher
7b4c377df1 make tests happy 2012-03-15 19:44:18 +01:00
Florian Staudacher
e6b403434f some restructuring around oembed providers 2012-03-15 18:34:47 +01:00
Diaspora Europe
fe65058624 use will paginate, added renderer for bootstrap 2012-03-15 16:44:25 +01:00
Diaspora Europe
3f26c0e3d7 mobile: added will paginate for bootstrap 2012-03-15 16:44:25 +01:00
Jonne Haß
0419ca0bb6 made change password explanations translatable [ci skip] 2012-03-15 15:22:20 +01:00
Maxwell Salzberg
2d3df3e374 two cukes failed because the local files were changed? 2012-03-14 18:44:10 -07:00
Jonne Haß
b3868fc6dd updated 9 locale files [ci skip] 2012-03-14 10:29:16 +01:00
Maxwell Salzberg
2a30e60fe0 Merge branch 'search-repeatedly' of https://github.com/stwf/diaspora into stwf-search-repeatedly 2012-03-13 16:41:16 -07:00
Steven Hancock
f2922c943c Cross-Origin Resource Sharing 
Remove partial support for CORS on webfinger routes and replace
it with the Rack::Cors middleware. This provides more complete
CORS support and works around a caching issue with nginx on
Heroku and potentially other reverse proxies.

CORS headers are only added if the incoming request includes
an "Origin" header, which seems to be correct according to
the CORS spec.

closes #2216
 2012-03-10 23:49:56 -08:00
Jonne Haß
854735dc52 fix plurals 2012-03-10 17:18:42 +01:00
Jonne Haß
40be5ab805 updated 37 locale files, added es-MX 2012-03-10 17:08:52 +01:00
Steven Fuchs
7048fa6d50 fixing conflicts in merge 2012-03-07 23:19:50 -05:00
Steven Fuchs
23aff2af5e run second search ajaxily when no results are found from remote pod. 2012-03-07 23:19:50 -05:00
Dennis Collinson
9b08f3f69a package assets always isn't refreshing, back to on 2012-03-07 18:42:41 -08:00
Maxwell Salzberg
b7fc774d06 semi-colons; use them 2012-03-07 16:24:02 -08:00
Maxwell Salzberg
ee2fafa31d totally gross js load order problem.. make the widget system fire after the backbone app to get the notification and search autocomplete back 2012-03-07 15:20:21 -08:00
danielgrippi
bdcbf5b985 responsive show pages [ci skip] 2012-03-06 15:19:05 -08:00
danielgrippi
cb9420bfd6 don't use symlinks; fix assets ordering issues. 2012-02-28 11:04:15 -08:00
Maxwell Salzberg
22cda15aa8 presenter now has a title 2012-02-27 18:11:41 -08:00
danielgrippi
5bebd97bca added translations to post viewer 2012-02-27 15:14:19 -08:00
danielgrippi
0112285985 Merge branch 'master' into profiles 
Conflicts:
	lib/diaspora/shareable.rb
 2012-02-27 14:27:05 -08:00
Jonne Haß
38e4394e55 updated 22 locale files [ci skip] 2012-02-27 22:33:19 +01:00
Jonne Haß
0604a36a15 updated 161 locale files [ci skip] 2012-02-26 01:07:13 +01:00
Dennis Collinson
b28508ecbc MS DC show last post and show page works unauthenticated 
phasing out app.user() for app.currentUser
 2012-02-24 19:09:00 -08:00
Dennis Collinson
5154500239 small refactoring around router.js 2012-02-24 14:33:57 -08:00
danielgrippi
2c0cfa53dc don't show left-right nav when idle 2012-02-24 13:31:17 -08:00
danielgrippi
806487a5ff namespace view folder with folders 2012-02-23 11:12:20 -08:00
danielgrippi
91e77e9dce small css tweaks 2012-02-22 20:50:56 -08:00
danielgrippi
846b14fac6 DG MS; you can comment from show pages. killer tofu. 2012-02-22 17:42:51 -08:00
danielgrippi
5a1f3675b5 namespacing. set up initial feedback hooks. 2012-02-21 15:23:29 -08:00
danielgrippi
c0eeb7680b pages wip 2012-02-21 15:23:28 -08:00
danielgrippi
691bdb96cd DG MS; post vitals on top left; user action placeholder on top right 2012-02-21 15:23:28 -08:00
danielgrippi
e3ebf05ac2 DG MS; new templates for post show pages. 2012-02-21 15:23:27 -08:00
Jonne Haß
14d7348a0d updates locales and fixed needed empty timeago translations 2012-02-20 14:24:30 +01:00
Jonne Haß
fd085c6653 updated 129 locale files [ci skip] 2012-02-20 01:26:16 +01:00
Jonne Haß
097a8b409d updated 20 locale files [ci skip] 2012-02-18 02:34:50 +01:00
Maxwell Salzberg
1f4e255f57 fix logging to work great with non-persisted objects 2012-02-17 14:59:42 -08:00
Maxwell Salzberg
ab727fc846 federation logger now in place. 2012-02-16 17:58:15 -08:00
Jonne Haß
4e93d087bd Merge branch 'master' of git://gitorious.org/diaspora-l10n-ca/diaspora-l10n-ca 2012-02-17 01:33:08 +01:00
Jonne Haß
a4a79db86b updated 108 locale files [ci skip] 2012-02-17 01:33:02 +01:00
Jordi Mallach
4a9d2ff9e9 Update Catalan translation to e16a20e. 2012-02-17 00:27:24 +01:00
Jonne Haß
7a1f491008 updated 19 locale files [ci skip] 2012-02-16 23:10:18 +01:00
danielgrippi
5acc7dc458 correctly reference intergration servers in application.yml.example [ci skip] 2012-02-16 13:01:17 -08:00
danielgrippi
62c0ad13b7 DG MS; move logic out of layout into LayoutsHelper. 2012-02-15 18:38:36 -08:00
Jonne Haß
21b420ca1e updated 100 locale files [ci skip] 2012-02-15 14:13:47 +01:00
Jonne Haß
d9fd978f9d Merge pull request #2892 from Gallaecio/master 
Updated Galician (gl) translation
 2012-02-14 16:04:32 -08:00
Adrián Chaves Fernández (Gallaecio)
4088af9159 Galician translation is now completely up-to-date. 2012-02-14 23:38:48 +01:00
Dennis Collinson
e16a20e18c toggle all nsfw posts 2012-02-14 14:15:24 -08:00
Adrián Chaves Fernández (Gallaecio)
098a9e3484 Merge remote-tracking branch 'upstream/master' 2012-02-14 22:55:19 +01:00
Adrián Chaves Fernández (Gallaecio)
39f39b12fd Minor changes to Galician translation for ‘diaspora’ file, and review of the ‘JavaScript’. 2012-02-14 22:47:29 +01:00
Adrián Chaves Fernández (Gallaecio)
0c8b0189d1 Updated Galician translation of the ‘diaspora’ file. 2012-02-14 22:28:09 +01:00
danielgrippi
f3f2b8ca44 change routes to properly reflect page names (activity/stream). 2012-02-14 11:16:41 -08:00
Maxwell Salzberg
54e8040bfd basic federation profile testing stuff 2012-02-14 10:58:57 -08:00
danielgrippi
32f93a0391 you can now follow / unfollow a post from the stream; fixed cukes. 2012-02-13 19:13:43 -08:00
danielgrippi
b27961b38a change language around explore/participate. 2012-02-13 19:13:43 -08:00
danielgrippi
ab76b0cd8e Bring the likes back. Ditch the pins. 
Revert "swap pin for heart [ci skip]"

This reverts commit 488e064e11.

Conflicts:

	app/views/templates/likes_info.jst

Revert "reference pin icon in mobile view [ci skip]"

This reverts commit 9377dd30f4.

Revert "first pass at strickly user level rename from like => pin. still need to update assets"

This reverts commit d06ccb9ba9.

Conflicts:

	config/locales/diaspora/en.yml

add heart icon back
 2012-02-13 19:13:43 -08:00
danielgrippi
f1c119452a made nsfw shield nicer and more condensed [ci skip] 2012-02-13 14:12:14 -08:00
Jonne Haß
ab29a58f93 updated 97 locale files [ci skip] 2012-02-13 13:04:23 +01:00
Maxwell Salzberg
3d569cc4bc fix for some crazy lack-of-stubbing on some http requests... 2012-02-09 16:20:22 -08:00
danielgrippi
398ca3d97b Participate / Explore have been upgraded to top-level status. 2012-02-09 14:29:01 -08:00
danielgrippi
84eb313e20 updated routes to reflect page titles (explore/participate) 2012-02-08 14:40:28 -08:00
Dennis Collinson
558ceec92a a user can mark themselves as nsfw 2012-02-07 19:03:20 -08:00
Dennis Collinson
efd99344eb git status 2012-02-07 18:29:51 -08:00
Maxwell Salzberg
cb23b2d5b7 make jasmine happy, by just refrencing the template package we already create 2012-02-07 15:35:42 -08:00
Ricardo
b4c0c0e679 Fix #1308: publisher submits w/o pasted text 
Text can be input not only with the keyboard but also with a right-click
paste or a middle mouse button paste in X. The publisher now listens to
the 'textchange' event instead of ignoring anything but a 'keyup'.
 2012-02-07 22:40:56 +08:00
Jonne Haß
7638619c7f Merge pull request #2821 from gandaro/missing-translation-invitations 
add previously missing translation in the invitation-lightbox
 2012-02-06 04:38:42 -08:00
Adrián Chaves Fernández (Gallaecio)
db10d8ec58 Some progress on Galician translation review. 2012-02-06 08:33:30 +01:00
danielgrippi
7d60d96132 set handlebars compiler in jammit config.yml (handlebars worries about maintaining a compilation cache, we don't have to do this manually.) [ci skip] 2012-02-05 21:18:34 -08:00
Daniel Grippi
fc8a9a7b58 Merge pull request #2826 from nolith/capistrano 
fixed and improved capistrano recipe [ci skip]
 2012-02-05 20:29:42 -08:00
danielgrippi
39ff47150b allow jammit to serve up our handlebars templates, making them cacheable! added bonus: changing a handlebars template now doesn't involve re-running rspec to regenerate them. zing. 2012-02-04 15:50:36 -08:00
Alessio Caiazza
67e2ca44fc capistrano deploy: fixed multiple thin detection 2012-02-04 18:11:34 +01:00
Alessio Caiazza
8632c8c40b capistrano deploy: let the user choose if running svc and svstat with sudo 
Set svc_sudo to true in deploy_config.yml to use sudo.
The default value will be false, so that if the parameter is missing capistrano will behave exactly as before.
 2012-02-04 17:59:30 +01:00
Jakob Kramer
d8183d3973 add missing translation in the invitation-lightbox [ci skip] 2012-02-04 14:17:19 +01:00
Alessio Caiazza
23212e4146 capistrano deploy: sass should be executed under bundle exec 2012-02-04 12:12:10 +01:00
Alessio Caiazza
3b0bf89335 capistrano deploy: avoid installing heroku gemset group 2012-02-04 12:07:26 +01:00
danielgrippi
4f7dda6012 bang! kill redis cache. 2012-02-02 12:45:43 -08:00
Hrishi
f65fa90591 My first contribution to Diaspora , thank you Rekado 2012-02-02 12:59:45 +05:30
danielgrippi
310a0679f1 particpate stream, yo! 2012-02-01 16:05:16 -08:00
Maxwell Salzberg
9abbf151a0 changed some keys by accident 2012-02-01 13:39:02 -08:00
Maxwell Salzberg
d06ccb9ba9 first pass at strickly user level rename from like => pin. still need to update assets 2012-02-01 12:57:07 -08:00
Jonne Haß
e5fe6a2280 fix typo, sorry [ci skip] 2012-02-01 20:06:44 +01:00
Jonne Haß
de4c9a1289 add warning about common setup error manifesting in uninitialized constant Oink 2012-01-31 21:56:01 +01:00
Jonne Haß
f1de7f9be1 Merge branch 'master' of git://gitorious.org/diaspora-l10n-ca/diaspora-l10n-ca 2012-01-31 18:43:15 +01:00