1. 15 Jun, 2015 1 commit
  2. 01 Apr, 2015 1 commit
  3. 28 Mar, 2015 1 commit
  4. 13 Mar, 2015 1 commit
  5. 11 Mar, 2015 1 commit
  6. 02 Mar, 2015 1 commit
  7. 27 Feb, 2015 2 commits
  8. 17 Jan, 2015 1 commit
  9. 13 Nov, 2014 1 commit
  10. 07 Oct, 2014 1 commit
  11. 23 Aug, 2014 1 commit
  12. 16 Aug, 2014 1 commit
  13. 06 Jul, 2014 1 commit
  14. 01 Jul, 2014 1 commit
    • Florian Staudacher's avatar
      allow admins to close user accounts from the backend · 13b716a4
      Florian Staudacher authored
      * thanks to @maxwell for the initial work on this
      
      port admin pages to bootstrap
      * improve user view on admin search page
      * add 'close account' link to each user in the search results
      * keep the same blue color for the admin menu
      
      some refactoring of the routes and the admin code
      * try to be more RESTful (possibly)
      * use a 'UserSearch' model for search parameters and querying
      
      add changelog entry
      13b716a4
  15. 24 Feb, 2014 1 commit
    • flaburgan's avatar
      Fix drawer in some mobile browsers. · 67d71e22
      flaburgan authored
      Remove the black background on menu badges.
      Fix body content on screen width > 768px.
      Start split of mobile css in different files in /mobile/
      67d71e22
  16. 11 Aug, 2013 1 commit
  17. 06 Aug, 2013 1 commit
  18. 02 Aug, 2013 1 commit
  19. 13 Jun, 2013 2 commits
  20. 19 May, 2013 1 commit
    • Jonne Haß's avatar
      Refactor config/ directory · ac147cc9
      Jonne Haß authored
      * Get rid of early pathname requirement
      * Use require_relative where approciate
      * Drop unused files
      * Imported new application.rb, environment.rb and environments/* from fresh Rails app
      * Cleaned up boot.rb
      * Load config in boot.rb
      * Deduplicate environments/integration*.rb
      * Move username blacklist into defaults.yml
      * Ruby 1.9 Hash syntax everywhere
      * Reorganize lib/diaspora/markdownify to match conventions
      * Get rid of full path requires where possible
      * Add dummy content to production section diaspora.yml.example to prevent warning
      * Drop sqlite? method
      * Move postgres? method into ConfigurationMethods
      * Drop token authentication from User
      ac147cc9
  21. 02 May, 2013 1 commit
  22. 04 Apr, 2013 1 commit
  23. 21 Mar, 2013 1 commit
    • Jonne Haß's avatar
      End the require mess · 3fc3b249
      Jonne Haß authored
      * Rename and reorganize post fetcher to fix autoloading, also let it use
        Faradays default connection so we get nice redirects
      * Add initializer to load libs at a central place
      * added lib dir to autoload_once paths to increase thread safety
      * Moved lib/exceptions.rb to lib/diaspora/ to conform namespacing
      3fc3b249
  24. 30 Dec, 2012 1 commit
  25. 30 Nov, 2012 1 commit
  26. 26 Sep, 2012 2 commits
  27. 10 Jul, 2012 1 commit
  28. 12 Jun, 2012 1 commit
  29. 25 Apr, 2012 1 commit
    • Steven Hancock's avatar
      Precompile Rails Admin assets · 87ceabc0
      Steven Hancock authored
      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 579785c1
      87ceabc0
  30. 20 Apr, 2012 1 commit
  31. 14 Apr, 2012 1 commit
    • Steven Hancock's avatar
      Initialize on asset precompile · 7e517c26
      Steven Hancock authored
      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. :)
      7e517c26
  32. 11 Apr, 2012 1 commit
    • Steven Hancock's avatar
      bootstrap-sass · 021cc994
      Steven Hancock authored
      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. :)
      021cc994
  33. 04 Apr, 2012 1 commit
    • Steven Hancock's avatar
      Only load Asset Sync when S3 is configured · 39b0c2de
      Steven Hancock authored
      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
      39b0c2de
  34. 29 Mar, 2012 2 commits
    • Steven Hancock's avatar
      Mobile UI fixes · 6abe7182
      Steven Hancock authored
      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
      6abe7182
    • Steven Hancock's avatar
      Stylesheet naming issue (new-templates.css) · 731446e0
      Steven Hancock authored
      Replace all references to new_templates.css with the correct filename,
      new-templates.css
      731446e0
  35. 28 Mar, 2012 2 commits
    • Steven Hancock's avatar
      Precompile more Javascript assets · 76bbe7be
      Steven Hancock authored
      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.
      76bbe7be
    • Steven Hancock's avatar
      Make the Mention button work with the asset pipeline · f96fc583
      Steven Hancock authored
      * 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.
      f96fc583