Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Commits on Feb 24, 2012
  1. @MattRogish

    Adding Travis CI tag :)

    MattRogish authored
  2. @MattRogish

    Squashed commit of the following:

    MattRogish authored
    commit 3d694e4
    Author: Matt Rogish <matt.rogish@gmail.com>
    Date:   Fri Feb 24 12:23:09 2012 -0500
    
        Adding comment
    
    commit 096ad1a
    Author: Matt Rogish <matt.rogish@gmail.com>
    Date:   Fri Feb 24 11:37:08 2012 -0500
    
        Adding appropriate TODO comment
    
    commit d7ba3c5
    Author: Matt Rogish <matt.rogish@gmail.com>
    Date:   Fri Feb 24 11:33:39 2012 -0500
    
        Removing debugging statements; removing redundant environment variable
    
    commit 5023535
    Author: Matt Rogish <matt.rogish@gmail.com>
    Date:   Fri Feb 24 10:44:22 2012 -0500
    
        Adding local.props file for CI
    
    commit c6a2eb7
    Author: Matt Rogish <matt.rogish@gmail.com>
    Date:   Thu Feb 23 18:14:12 2012 -0500
    
        Ubuntu doesn't have an easy way to install android
    
    commit b470c27
    Author: Matt Rogish <matt.rogish@gmail.com>
    Date:   Thu Feb 23 17:08:46 2012 -0500
    
        Catch all return values and fail if necessary
    
    commit 6f8b20e
    Author: Matt Rogish <matt.rogish@gmail.com>
    Date:   Thu Feb 23 15:37:32 2012 -0500
    
        Generate the local.properties file for android builds
    
    commit bbd64c5
    Author: Matt Rogish <matt.rogish@gmail.com>
    Date:   Thu Feb 23 15:08:04 2012 -0500
    
        These tests will fail, too
    
    commit 9fdc476
    Author: Matt Rogish <matt.rogish@gmail.com>
    Date:   Thu Feb 23 15:06:34 2012 -0500
    
        Hey look, these don't work either
    
    commit 09168a1
    Author: Matt Rogish <matt.rogish@gmail.com>
    Date:   Thu Feb 23 14:57:55 2012 -0500
    
        My bologna has a first name, it's travis.ci
    
    commit 43c0e72
    Author: Matt Rogish <matt.rogish@gmail.com>
    Date:   Thu Feb 23 14:54:24 2012 -0500
    
        Travis please
    
    commit ff856f4
    Author: Matt Rogish <matt.rogish@gmail.com>
    Date:   Thu Feb 23 14:53:14 2012 -0500
    
        TRAVIS PLEASE OH WHY
    
    commit afac3dc
    Author: Matt Rogish <matt.rogish@gmail.com>
    Date:   Thu Feb 23 14:51:42 2012 -0500
    
        Re-enabling ruby specs
    
    commit b4c355f
    Author: Matt Rogish <matt.rogish@gmail.com>
    Date:   Thu Feb 23 14:45:52 2012 -0500
    
        Travis you had better see this
    
    commit 53fe91e
    Author: Matt Rogish <matt.rogish@gmail.com>
    Date:   Thu Feb 23 14:44:31 2012 -0500
    
        These tests fail due to the use of xvfb; xit em out for now
    
    commit c3ae8e6
    Author: Matt Rogish <matt.rogish@gmail.com>
    Date:   Thu Feb 23 14:28:40 2012 -0500
    
        Adding the display back; hard coding path
    
    commit cdc69ba
    Author: Matt Rogish <matt.rogish@gmail.com>
    Date:   Thu Feb 23 14:19:51 2012 -0500
    
        Some whitespace to trigger travis
    
    commit df39fe6
    Author: Matt Rogish <matt.rogish@gmail.com>
    Date:   Thu Feb 23 14:17:35 2012 -0500
    
        Rolling back display change; making evergreen:serve consistent with run;
        fixing tabs in .evergreen
    
    commit 8986901
    Author: Matt Rogish <matt.rogish@gmail.com>
    Date:   Thu Feb 23 14:08:24 2012 -0500
    
        Call a different command, set the root
    
    commit 153d389
    Merge: 1740cd3 8e677b6
    Author: Matt Rogish <matt.rogish@gmail.com>
    Date:   Thu Feb 23 13:59:46 2012 -0500
    
        Merge branch 'master' into b_fixup_ci
    
    commit 1740cd3
    Author: Matt Rogish <matt.rogish@gmail.com>
    Date:   Thu Feb 23 12:40:58 2012 -0500
    
        Make the fixtures dir
    
    commit 6568b3c
    Author: Matt Rogish <matt.rogish@gmail.com>
    Date:   Thu Feb 23 12:16:52 2012 -0500
    
        Duh, Task#execute doesn't exec prereqs, invoke does
    
    commit c8c5ef2
    Merge: 8f6637b d9c6800
    Author: Matt Rogish <matt.rogish@gmail.com>
    Date:   Thu Feb 23 12:09:20 2012 -0500
    
        Merge branch 'master' into b_fixup_ci
    
    commit 8f6637b
    Merge: 3139393 606a79c
    Author: Matt Rogish <matt.rogish@gmail.com>
    Date:   Thu Feb 23 10:16:29 2012 -0500
    
        Merge branch 'master' into b_fixup_ci
    
    commit 3139393
    Author: Matt Rogish <matt.rogish@gmail.com>
    Date:   Tue Feb 21 16:15:59 2012 -0500
    
        Putting evergreen back, cleaning up rake
    
    commit 12ad16d
    Author: Matt Rogish <matt.rogish@gmail.com>
    Date:   Tue Feb 21 14:41:42 2012 -0500
    
        Kicking travis again
    
    commit 6f9b5e3
    Author: Matt Rogish <matt.rogish@gmail.com>
    Date:   Tue Feb 21 13:54:43 2012 -0500
    
        Kicking travis
    
    commit d4066e8
    Author: Matt Rogish <matt.rogish@gmail.com>
    Date:   Tue Feb 21 13:42:54 2012 -0500
    
        Debugging
    
    commit ba3cba0
    Author: Matt Rogish <matt.rogish@gmail.com>
    Date:   Tue Feb 21 13:11:09 2012 -0500
    
        Adding mulberry directory as the root for Evergreen
    
    commit 05113f6
    Author: Matt Rogish <matt.rogish@gmail.com>
    Date:   Tue Feb 21 12:52:33 2012 -0500
    
        Running evergreen:generate_stuff since ci tends to not execute it
    
    commit d21768f
    Author: Matt Rogish <matt.rogish@gmail.com>
    Date:   Tue Feb 21 12:43:35 2012 -0500
    
        Putsing debuging
    
    commit 13ff995
    Author: Matt Rogish <matt.rogish@gmail.com>
    Date:   Tue Feb 21 12:20:48 2012 -0500
    
        Try running specs individually after executing builder:app_dev
    
    commit fc047cb
    Author: Matt Rogish <matt.rogish@gmail.com>
    Date:   Tue Feb 21 11:35:41 2012 -0500
    
        Whitespace commit to trigger travis
    
    commit 307590e
    Author: Matt Rogish <matt.rogish@gmail.com>
    Date:   Tue Feb 21 11:29:57 2012 -0500
    
        Need a js build
    
    commit 993a1a0
    Author: Matt Rogish <matt.rogish@gmail.com>
    Date:   Tue Feb 21 11:21:57 2012 -0500
    
        Adding display to env, fixing a bug in app.rb, temporarily only running
        js specs
    
    commit 065aaa7
    Author: Matt Rogish <matt.rogish@gmail.com>
    Date:   Tue Feb 21 10:43:36 2012 -0500
    
        Add cli helper, make the scaffold use the full path
    
    commit 352332b
    Author: Matt Rogish <matt.rogish@gmail.com>
    Date:   Tue Feb 21 10:35:01 2012 -0500
    
        Split out integration tests
  3. @rmurphey

    Merge remote-tracking branch 'origin/master' into page_class_names

    rmurphey authored
    * origin/master:
      fix test for mulberry.app.Router.home method
      remove logging
      remove logging
      clean up and remove assumption
      replace history state at startup & when no matching route is found
      only subscribe to hashchange if no support for history API
      remove boston ad tag
      prevent click delay on grid view clicks
  4. @rmurphey

    remove unused class names

    rmurphey authored
  5. @rmurphey

    Merge pull request #350 from rmurphey/browser_back_button

    rmurphey authored
    Browser back button working for mobile web
  6. @rmurphey
  7. @rmurphey

    remove logging

    rmurphey authored
  8. @rmurphey

    Merge pull request #349 from rmurphey/hash_is_a_dupe_error

    rmurphey authored
    Only subscribe to /dojo/hashchange topic if no support for history API
Commits on Feb 23, 2012
  1. @rmurphey

    remove logging

    rmurphey authored
  2. @rmurphey
  3. @rmurphey
  4. @rmurphey

    only subscribe to hashchange if no support for history API

    rmurphey authored
    this eliminates the "hash is a dupe" message in the console
  5. @rmurphey

    remove boston ad tag

    rmurphey authored
  6. @MattRogish

    Merge pull request #348 from rmurphey/grid_view_clicks

    MattRogish authored
    prevent click delay on grid view clicks
  7. @rmurphey
  8. @rmurphey
  9. @MattRogish

    Merge pull request #346 from futuraprime/f_ad_tag_styles_24736413

    MattRogish authored
    Ad tag styling to remove scroll bars.
Commits on Feb 22, 2012
  1. @rmurphey

    Merge pull request #344 from rmurphey/fb_tw_mobile_web

    rmurphey authored
    Disable sharing for mobile web builds
  2. @futuraprime
  3. @MattRogish
  4. @MattRogish

    Fixing comment

    MattRogish authored
  5. @MattRogish
  6. Merge pull request #343 from greenideas/ad_tag_network_status

    authored
    ensure proper styling re ads when there's no network
  7. @mrdanimal

    Merge pull request #336 from mrdanimal/move-component-style

    mrdanimal authored
    move component base style from toura to mulberry
Commits on Feb 21, 2012
  1. @futuraprime
  2. @rmurphey

    Merge branch 'master' of github.com:Toura/mulberry

    rmurphey authored
    * 'master' of github.com:Toura/mulberry:
      eliminate call to nonexistent method
      brute force re-placing of ad component
      refresh ad tag on page load
      wip on refreshable ad tag component
  3. @rmurphey

    fix fails

    rmurphey authored
  4. @rmurphey

    Merge pull request #333 from rmurphey/reload_ad

    rmurphey authored
    Reload ad on every page load
  5. @rmurphey
  6. @rmurphey
  7. @rmurphey

    Merge branch 'master' into reload_ad

    rmurphey authored
    * master: (27 commits)
      typo fix. s/height/width/
      remove vars.scss template
      remove serve task
      delete old toura app server
      delete empty file
      update theme
      add ad to demo
      iOS-specific native code update for ad tags
      component shouldn't be positioned anymore now that it lives in the persistent container
      replace device_type param on AppConfig
      fix feature selector
      remove IFRS dependency from dojo.js
      fix default screen name
      cleaning up scaffold method
      comments for scaffold method
      simpler option name
      go back to assuming db will always be present
      always init DeviceStorage
      remove instructions for command line route creation in empty app
      no need to overwrite starter component template
      ...
  8. @rmurphey
Something went wrong with that request. Please try again.