Commits · 7f550d2d92db6cec9167712bd3ae4d3ac9527f2a · Milan / diaspora

Feb 14, 2012
- aliasing in routes.js [ci skip] · 7f550d2d
  danielgrippi authored 13 years ago
  
  7f550d2d
- Merge pull request #2891 from Raven24/bookmarklet-oops · 10c57571
  Daniel Grippi authored 13 years ago
  
  bookmarklet - publisher needs a little more js...
  10c57571
- publisher needs a little more js... · a03a57ef
  Florian Staudacher authored 13 years ago
  
  a03a57ef
- change routes to properly reflect page names (activity/stream). · f3f2b8ca
  danielgrippi authored 13 years ago
  
  f3f2b8ca
- remove old multi-server-spec-procfile [ci skip] · e2487335
  Maxwell Salzberg authored 13 years ago
  
  e2487335
- Merge branch 'federation_procfile' · b4c52655
  Maxwell Salzberg authored 13 years ago
  
  b4c52655
- basic federation profile testing stuff · 54e8040b
  Maxwell Salzberg authored 13 years ago
  
  54e8040b
- remove console.log [ci skip] · 83075144
  Maxwell Salzberg authored 13 years ago
  
  83075144
- fix for federating profile pictures [ci skip] · b2e9e47b
  Maxwell Salzberg authored 13 years ago
  
  b2e9e47b
- Merge pull request #2889 from Raven24/bookmarklet-stuff · fc65d0fe
  Daniel Grippi authored 13 years ago
  
  bookmarklet fixes
  fc65d0fe
- bookmarklet now is a complete html document (+test) · 42637970
  Florian Staudacher authored 13 years ago
  
  it auto-expands to the size of the text that was selected it self-closes after posting again
  42637970
- Merge pull request #2841 from Raven24/bookmarklet-specs · 1638f320
  Daniel Grippi authored 13 years ago
  
  intentionally failing specs - dirty input breaks bookmarklet (+fix)
  1638f320
- you can now follow / unfollow a post from the stream; fixed cukes. · 32f93a03
  danielgrippi authored 13 years ago
  
  32f93a03
- change language around explore/participate. · b27961b3
  danielgrippi authored 13 years ago
  
  b27961b3
- Bring the likes back. Ditch the pins. · ab76b0cd
  danielgrippi authored 13 years ago
  
  Revert "swap pin for heart [ci skip]" This reverts commit 488e064e. Conflicts: app/views/templates/likes_info.jst Revert "reference pin icon in mobile view [ci skip]" This reverts commit 9377dd30. Revert "first pass at strickly user level rename from like => pin. still need to update assets" This reverts commit d06ccb9b. Conflicts: config/locales/diaspora/en.yml add heart icon back
  ab76b0cd
- small typo [ci skip] · 5f4ebc94
  Maxwell Salzberg authored 13 years ago
  
  5f4ebc94
- fix authorizations page css to use media box · ef40350b
  Maxwell Salzberg authored 13 years ago
  
  ef40350b
- added some methods to make it easier to figure out how many active users a pod has · 7a565b05
  Maxwell Salzberg authored 13 years ago
  
  7a565b05
Feb 13, 2012
- made nsfw shield nicer and more condensed [ci skip] · f1c11945
  danielgrippi authored 13 years ago
  
  f1c11945
- updated 97 locale files [ci skip] · ab29a58f
  Jonne Haß authored 13 years ago
  
  ab29a58f
Feb 11, 2012
- Merge pull request #2863 from Pistos/diasporainc-discard-unrecognized-relays · 3b873453
  Daniel Grippi authored 13 years ago
  
  Gracefully handle unrecognized federated objects so failed Resque jobs don't pile up.
  3b873453
- Gracefully handle unrecognized federated objects so failed Resque jobs don't pile up. · 44e6084a
  Pistos authored 13 years ago
  
  Conflicts: lib/postzord/receiver/public.rb
  44e6084a
- fix css of new comment box [ci skip] · f3d790a4
  Maxwell Salzberg authored 13 years ago
  
  f3d790a4
- DC DG; a participation is created in StatusMessageController · 44e072c3
  danielgrippi authored 13 years ago
  
  44e072c3
- typo in my js SRY [ci skip] · 427a1694
  Maxwell Salzberg authored 13 years ago
  
  427a1694
- remove joindiaspora specific home page from repo [ci skip] · ecdbd1bb
  danielgrippi authored 13 years ago
  
  ecdbd1bb
- remove a task that doesnt seem to work · 5ecb3e8a
  danielgrippi authored 13 years ago
  
  5ecb3e8a
- forgot to save a template [ci skip] · 3c7ebe32
  danielgrippi authored 13 years ago
  
  3c7ebe32
- change rake assets:compile_s3 to rake assets:deploy [ci skip] · 33fb1222
  danielgrippi authored 13 years ago
  
  33fb1222
- adding custom landing page for heroku · 3e4d2fe7
  danielgrippi authored 13 years ago
  
  3e4d2fe7
- Merge branch 'master' of github.com:diaspora/diaspora · b866d935
  danielgrippi authored 13 years ago
  
  b866d935
- fix a bunch of small css related media box issues [ci skip] · ed3d5c42
  danielgrippi authored 13 years ago
  
  ed3d5c42
Feb 10, 2012
- make posts have empty photos so reshared stop messing up · 232e6206
  Maxwell Salzberg authored 13 years ago
  
  232e6206
- add more images to use handlebars imageUrl helper · 6bc44f6f
  Maxwell Salzberg authored 13 years ago
  
  6bc44f6f
- Merge branch 'participation_refactor' · f8ec80b6
  Dennis Collinson authored 13 years ago
  
  f8ec80b6
- federated generators take a user · 04bd5070
  Dennis Collinson authored 13 years ago
  
  04bd5070
- Participate stream query uses participations · 5e26a7e6
  Dennis Collinson authored 13 years ago
  
  5e26a7e6
- move user modules into user namespace. · 14b9f5dc
  Dennis Collinson authored 13 years ago
  
  14b9f5dc
- Refactor Relayable Creation · f3c1eff3
  Dennis Collinson authored 13 years ago
  
  f3c1eff3
- Participations are a federated, relayable model :) · 9e1816dc
  Dennis Collinson authored 13 years ago
  
  9e1816dc