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

11184 commits

This branch
This branch
All branches
Author SHA1 Message Date
Dennis Collinson
ff1cbb48cc remove excess call to appconfi#setup 2012-02-06 17:42:01 -08:00
Dennis Collinson
9b5f5b8129 Merge branch 'fix_stream_order' 2012-02-06 16:52:35 -08:00
Dennis Collinson
a399572995 MS DC; fix participate stream ordering problem that was putting new posts on the bottom of things 2012-02-06 16:51:32 -08:00
Dennis Collinson
578e8ef269 broken 2012-02-06 14:55:14 -08:00
Maxwell Salzberg
4382d45e82 almost failing cuke 2012-02-06 12:25:02 -08:00
danielgrippi
de757db48b fix ruby reshare model; extract sortOrder in app.models.Stream. 2012-02-06 08:26:11 -08:00
danielgrippi
fa5424653a fix markup display on reshares. DERP. [ci skip] 2012-02-06 08:02:27 -08:00
Jonne Haß
f83076850b use :absolute => true instead of concatenating the pod url manually in ostatus_builder [ci skip] 2012-02-06 10:18:51 +01: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
b2be1b2c53 a little less broken. formatting is broken on reshares, but the cukes should now pass. 2012-02-05 22:58:08 -08:00
danielgrippi
bb95bf55f6 fix images in reshares. unfortunately, the reshare presenter is broken right now and i'm passing out in front of my laptop (re: cuke failure) :( [ci skip] 2012-02-05 21:54:06 -08:00
danielgrippi
fafa74a222 fix spec, mustache scoping issue in partial. 2012-02-05 21:23:45 -08: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
a142911a8f Merge pull request #2811 from gandaro/2809-atom-userlink-incorrect 
use guid in atom feed to fix the link
 2012-02-05 20:31:03 -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
5d051fcc52 we're now rolling 100% handlebars for our templates, with jammit handling them as static assets. 2012-02-05 16:42:34 -08:00
danielgrippi
36e5ca431f replace two more underscore templates with handlebar counterparts [ci skip] 2012-02-05 13:40:34 -08:00
danielgrippi
5a72f868d3 replace two underscore templates with their handlebars counterparts 2012-02-05 12:50:28 -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
Sarah Mei
d1fbf7b55c Fix migration for MySQL 2012-02-03 21:12:44 -08:00
Maxwell Salzberg
3bd9b0d62e Merge pull request #2818 from rekado/fix_migration_for_psql 
fix syntax for psql backend
 2012-02-03 20:53:16 -08:00
Ricardo
6fa548e427 fix syntax for psql backend 
- PostgreSQL doesn't allow double quotes for values. Double quotes are
  used for surrounding table names that contain spaces. Single quotes
  should be used for values.

- DELETE in a JOIN is not permitted in SQL-99 (see
  http://drupal.org/node/555562) so we use USING with WHERE instead
 2012-02-04 12:45:13 +08:00
Dennis Collinson
354ed7ef05 paginating participate stream 2012-02-03 17:55:06 -08:00
Dennis Collinson
3991903b56 MS DG DC Participate stream that has things bubble to the top 2012-02-03 17:23:57 -08:00
danielgrippi
c301f80ca9 update unicorn [ci skip] 2012-02-03 15:12:44 -08:00
danielgrippi
a3e13e3c0e User#like! method. 2012-02-03 14:42:03 -08:00
danielgrippi
4be7daaabf downgrade backbonejs for now back to 0.5.x; leave underscore 2012-02-03 14:29:50 -08:00
danielgrippi
67a79d5937 upgrade backbone and underscore js 2012-02-03 11:38:05 -08:00
Steven Fuchs
ef7dc1c017 update aspect name in page listing after editing. 2012-02-03 08:37:35 -05:00
Jakob Kramer
f7b11ac248 use local_or_remote_person_path in atom feed to fix the author's link [ci skip] 2012-02-03 12:24:13 +01:00
Dennis Collective
6dbd644b01 Merge pull request #2719 from stwf/return-contact-popup-to-notify 
aspects popup menu missing from 'started sharing' notifications
 2012-02-03 00:42:10 -08:00
Maxwell Salzberg
2ea0ca0e9b never use AR classes in migrations if you can help it 2012-02-02 14:25:33 -08:00
Maxwell Salzberg
b55cadb4a4 today is not my day. fix comment in migration 2012-02-02 14:06:40 -08:00
Maxwell Salzberg
fe4b886649 this should work, and added a bit of logging 2012-02-02 14:05:29 -08:00
Maxwell Salzberg
da1345502f possible fix for migration, hang tight before running it 2012-02-02 13:54:39 -08:00
Dennis Collinson
8a61718efd migration iterates through shareables 2012-02-02 13:37:43 -08:00
danielgrippi
4f7dda6012 bang! kill redis cache. 2012-02-02 12:45:43 -08:00
Dennis Collinson
d1a82d288d moar verbose comment [ci skip] 2012-02-02 11:50:00 -08:00
danielgrippi
7bd6a450a0 remove public share visibilities. NOTE: you should run optimize table as detailed in the migration's comments after executing this. [ci skip] 2012-02-02 11:43:37 -08:00
danielgrippi
4151f9c1a4 Revert "remove some unused images [ci skip]" 
This reverts commit 1e508218d2. [ci skip]
 2012-02-02 11:17:30 -08:00
Steven Fuchs
882853415b commit test for new code that keeps count from going negative. 2012-02-02 11:26:58 -05:00
Steven Fuchs
532a49a56d no need to generate notification fixtures at this point. 2012-02-02 10:45:42 -05:00
Jonne Haß
a304cb1d33 Merge pull request #2804 from Carabas/patch-1 
Update config/application.yml.example
 2012-02-02 03:41:20 -08:00
Dennis Collective
f25e25a7e7 Merge pull request #2803 from Stultus2/master 
Fixing 2 bugs
 2012-02-02 00:20:28 -08:00