labofsahil/github-event-dataset-2012 huggingface dataset:
More fixes for ADK and V8GL Android build, basic API is now able to compile through on Android
Very shrinked variant of Android SDK
Removed my own README file that was a dummy
harpies!
Inheritance 2
Week 2
Tiles
Week 4
train is slowly moving all files make it to IO
distinguish between the two sues of "."; record field operator vs. terminator
Mount engine as default
.gitignore
Changed list with query, fixed error reporting.
write a letter hinzugefügt
fixed the specs by skipping a small string quoting difference between Ruby 1.9 and 2.0
Update Marlin/language.h
Update Marlin/language.h

Some dialogs are corrected
Update Marlin/language.h

Some dialogs corrected and Default language set to 1
Fix Gen7 1.4 pinout

Gen7 1.4 uses very different pin assignments, might as well make a new
section and remove some of the conditionals from each. It's easier to change
your pin assingment this way if like me you don't wire it exactly to plan.
Missing #else in temperature.cpp prevented reading bed temp when TEMP_BED_PIN <7.  Thanks to Leland Wallace for helping me track this down via "Sesame Street" coding (what is not like the other)
Merge pull request #240 from ZetaPhoenix/Marlin_v1_bugfix

Missing #else in temperature.cpp prevented reading bed temp when TEMP_BE...
bed pid

Conflicts:

	Marlin/Configuration.h
readme
Fix M81 not working reliably on Gen7

Some discussion of the issue is here http://forums.reprap.org/read.php?181,118329,page=1 
Update Marlin/ultralcd.pde

The joris' char drawins are expressed in binary so to show their content's in a more visual fashion.

This is not a code modification as much as a readibility modification.
Update Marlin/Marlin.pde

Added function 'setTargetedHotend' that turns into a function an operation repeated 3 times through the M-codes processing.

This modification saves a few bytes that can be used to add support for new commands.
Merge pull request #245 from andrey-vasilyev/patch-1

Fix M81 not working reliably on Gen7
Merge pull request #248 from gwelchc/patch-1

Binary representation for characters in ultraldc.pde
Merge pull request #249 from gwelchc/patch-2

Slight modification for byte savings
fixes #246
Added statements to set the limit switch positions to the maximum travel if homing in the positive direction as well as bed center at (0,0) if defined.
Limit Switch locations based on MIN/MAX limits and homing direction
fixes #246
Added statements to set the limit switch positions to the maximum travel if homing in the positive direction as well as bed center at (0,0) if defined.
Relocated code based on feedback.
Merge pull request #251 from ZetaPhoenix/Marlin_v1_bugfix

Limit Switch locations based on MIN/MAX limits and homing direction
Changes to M119 response for easier visual comparison
Changed to report on individual lines with "TRIGGERED" or "open" instead of "H" or "L" on one line as H&L could be confused with logic levels High and Low which may be wrong if using inverted logic.  Added strings to language.h.

Fixed typo "deu" in English language that was fixed in #134 but got added back in via 9f7f7354f5b953dd3545a3b2cb96687ebd3d3ba0
move comment to correct place
cleanup for pull
Updated comparison document
Added editable link forwarding
auto load changed and minor changes
Precompute projected coordinates.
fixing rootfs
cleaning up Runge-Kutta logic
flippin functionality working
A bunch more work towards achieving torus
Refreshing Algorithms 4th Ed. work, updating ignores.
Updating autoenv crap
Go Euclid!
Breaking things out, adding test, all that good crap
added smartass2
fixed compiling error in smartass2
Deviated from auth branch, added unit tests
Project pending improve().
Add a StaticPages controller
Add StaticPages spec
Merge branch 'master' into static-pages
Finish static pages
responive design on user index
Forgot the plugin  #68
menambahkan link edit

menambahkan link edit by Billa
Merge pull request #60 from nabilla/patch-11

menambahkan link edit
emacs24 with homebrew and convert the file loading to use dirname rather than grep
Fix writing to syslog, log message may start with hyphen now.
started working on the xml based rules engine
dfdsjflkdsjfklsdjklfsd
trying to change a previous commit message, rebasing
removed build.xml and added some defects to the XML
Commit after rebasing
Commit after rebasing
Merge branch 'master' of github.com:mikechabot/OutOfMemory
renamed some short variables
Modify date formatting some more
add erc modified channels to powerline
don't start with autosave on
add autosave.py
update README
Version 0.0.2.2, see changelog
Merge pull request #8 from mirage/master

add ocaml-uint-1.0.2
The (official?) release of lwt 2.4.0 on the OSCIgen site has a later date and different interfaces to the (snapshot?) on dimino.org

$ curl -f http://www.dimino.org/lwt-2.4.0.tar.gz | md5sum -
6650d51cdc572c8f66d5a49b1304e29c  -

$ curl -f http://ocsigen.org/download/lwt-2.4.0.tar.gz | md5sum -
fefff147103123180c50f6ee862979d9  -

The CHANGES file in the OCSIgen version has date: 2012-07-16
The CHANGES file in the dimino.org version has date: 2012-06-02

The OCSIgen version has significant interface changes in the Lwt_unix
C interface. It also matches the version of the documentation on the
OSCIgen website.
Merge pull request #9 from djs55/lwt-2.4.0-url

The (official?) release of lwt 2.4.0 on the OSCIgen site has a later dat...
add uri-1.2
primeros fixes
nuevas confs
Added destroy and destroyAll methods.
Added methods to ObservableArray
first check-in
Art to jpg, doctype added to .plist, ignore .pyc files
Updated icon art
Added LGTV client platform
code refresh - conversion to v2 - updated broken links - add HD Live stream
removed DevMode from Info.plist
VERSION file removed
LG key added
Fixed errors picked up by the tester
Fixed some navigation items, fixed some broken links
Remove unnecessary client platform requirements
Use * for PlexClientPlatforms instead of omitting it
Excluded Roku client platform
Automated changes:

 - Removed useless plist key 'CFBundleVersion'
 - Removed useless plist key 'CFBundleDevelopmentRegion'
 - Removed useless plist key 'CFBundleExecutable'
 - Removed useless plist key 'CFBundleInfoDictionaryVersion'
 - Removed useless plist key 'CFBundlePackageType'
 - Removed useless plist key 'CFBundleSignature'
 - Removed useless plist key 'PlexPluginMode'
attemping commit of just modified .gitignore
Fixed GPR package to work with newer Jane Street Core library.
pom problems
Rename JAR files (without SNAPSHOT).
Rename JAR files.
Forgot underscore for private method
(Bug 4711) Removed redunant CSS styling from Databases
Adding Eclipse project data.  Adding 1/2 level, ability mod, etc. fields to form.
Fixed some errors that resulted from poor merging.
xcode
rename functions
Merge branch 'master' of github.com:moses-smt/mosesdecoder
PSD stuff:

- pass strings by reference in PsdPhraseUtil
- do not filter phrases in select_psd_vocab.pl
- correct lookup of target phrase ID in psd_extract_features
Merge branch 'damt_phrase' of github.com:moses-smt/mosesdecoder into damt_phrase
Minor update to variable declarations.
Convert error to warning
GTNPORTAL-2617 [XSRF] Form submission of sensitive actions in PLF still does not have validation mechanism to prevent XSRF
GTNPORTAL-2707 Call getAllPortalNames() from UIUserToolbarSitePortlet only once
GTNPORTAL-2664 fixed the form to use the correct field and added check for empty string
Upgrade component versions:
 - gatein-parent 1.2.0.Final
 - gatein-dep 1.2.0.Final
 - gatein-common 2.1.0.Final
 - gatein-pc 2.4.0.CR01
 - gatein-wci 2.3.0.CR02
Upgrade versions:
- gatein-sso to 1.3.0.CR02
- gatein-management to 1.1.0.CR04
- gatein-naming to 1.1.0.CR01
- shindig to 2.0.2.Final-gatein-3
- simplecaptcha 1.1.1.Final-gatein-3
GTNPORTAL-2560 new validation for first and last name allowing some special characters
GTNPORTAL-2674 Fix clustering isolation on AS7. Fix support for TCP cluster
GTNPORTAL-2673 Gatein master Unit tests fails in GateIn Portal Component Portal Data on openjdk7
GTNPORTAL-2693 Users can't login with the sample-portal extension deployed on Tomcat
fix broken tomcat auth
Upgrade WSRP to 2.2.0.CR01
Upgrade SSO and WCI dependencies
Create a Cube builder for VBO and updated Vertex

Removed texture array from Vertex, in our application is not useful
student view controller. fix bugs
try to use uncomoressed files in repo
Another try on Travis.
Attempting to get npm to behave.
Another attempt at installing the latest npm.
Attempting to be more explicit...
Another NPM installation attempt.
Adding Py32 back to TravisCI.
Attempt to install Node as Python 2.7 (build scripts fail in 3.2).
Revert "Attempt to install Node as Python 2.7 (build scripts fail in 3.2)."

This reverts commit 22a8f427ae2627945e006336378dda5d6487e147.
Attempt to install zombie as Python 2.7 (build scripts fail in 3.2).
Disabling Py32 until I can figure it out.
More NPM trouble.
More NPM tinkering.
Trying another approach w/ npm.
Debugging Travis.
Adding badge.
Add "pypy" to tox.ini and .travis.yml
Color change to ussr
Read me
makeuserids 12-11-12
Adding release 0.2.3.
Test using fake docx file rather than document XML string
Add feed-related config parameters

PULL_FROM_ALAVETELI controls whether we pull new requests and followups
from Alaveteli.

ALAVETELI_INITIAL_LAST_EVENT_ID is the initial last_event_id, representing
the point at which we have switched over to using this system for managing
requests.
Added v1 of bootstrap
Movie finder - backbone project
Moved textures around, made RenderTubes understand tube materials
Added proper rendering for the tube items
Add textobj-word-column.vim plugin.
Add plugin to allow selection of Ruby blocks.

`var` selects an entire Ruby block.
`vir` selects everything inside a Ruby block.

These can be invoked multiple times to expand/contract the selection.
Rearrange Vundle plugins.
Add fanfingtastic plugin.
add prefixer.py
add look and feel for desktop site
Created unstable branch for trying out stuff
new direction for streams and structure cleanup (more of this TBD)
ignores and deletions
js cleanup
Add useful info and minor UI tweak
Formatting.
Add comments.
files updates and new images
[NGRINDER-187] Introduce CoreLogger which will be used to record majoy
steps of ngrinder life cycle.
[NGRINDER-173]remove i18n about test day status.
Merge branch 'master' of https://github.com/nhnopensource/ngrinder.git
[NGRINDER-175]toggle the icon when click the switch button of vuser per
agent option in test detail.
clean up the width of test list column.
Merge branch 'master' of https://github.com/nhnopensource/ngrinder.git

Conflicts:
	ngrinder-controller/src/main/webapp/WEB-INF/ftl/perftest/detail.ftl
	ngrinder-controller/src/main/webapp/WEB-INF/ftl/perftest/list.ftl
1.0.4 - Funciona en Rails 3.2.6
* Added OpenCL implementation of the Defocus node
 * Always disable two phase compositing during rendering

 - At Mind -


git-svn-id: https://svn.blender.org/svnroot/bf-blender/trunk/blender@48678 954f8c5b-7b00-dc11-b283-0030488c597c
Fix for error from grumpy gcc in "over-warning" mode. Must explicitely cast uintptr_t to unsigned int (othe solution would be to use PRIuPTR macro from inttypes.h, but that would probably causes some problems with windows...).

git-svn-id: https://svn.blender.org/svnroot/bf-blender/trunk/blender@48730 954f8c5b-7b00-dc11-b283-0030488c597c
code cleanup: remove more invalid/paranoid NULL checks 


git-svn-id: https://svn.blender.org/svnroot/bf-blender/trunk/blender@50623 954f8c5b-7b00-dc11-b283-0030488c597c
Holiday coding log :)

Nice formatted version (pictures soon):
http://wiki.blender.org/index.php/Dev:Ref/Release_Notes/2.66/Usability

Short list of main changes:

- Transparent region option (over main region), added code to blend in/out such panels.
- Min size window now 640 x 480
- Fixed DPI for ui - lots of cleanup and changes everywhere. Icon image need correct size still, layer-in-use icon needs remake.
- Macbook retina support, use command line --no-native-pixels to disable it
- Timeline Marker label was drawing wrong
- Trackpad and magic mouse: supports zoom (hold ctrl)
- Fix for splash position: removed ghost function and made window size update after creation immediate
- Fast undo buffer save now adds UI as well. Could be checked for regular file save even...
  Quit.blend and temp file saving use this now.
- Dixed filename in window on reading quit.blend or temp saves, and they now add a warning in window title: "(Recovered)"
- New Userpref option "Keep Session" - this always saves quit.blend, and loads on start.
  This allows keeping UI and data without actual saves, until you actually save.
  When you load startup.blend and quit, it recognises the quit.blend as a startup (no file name in header)
- Added 3D view copy/paste buffers (selected objects). Shortcuts ctrl-c, ctrl-v (OSX, cmd-c, cmd-v). 
  Coded partial file saving for it. Could be used for other purposes. Todo: use OS clipboards. 
- User preferences (themes, keymaps, user settings) now can be saved as a separate file.
  Old option is called "Save Startup File" the new one "Save User Settings".
  To visualise this difference, the 'save startup file' button has been removed from user preferences window. That option is available as CTRL+U and in File menu still.
- OSX: fixed bug that stopped giving mouse events outside window.
  This also fixes "Continuous Grab" for OSX. (error since 2009)




git-svn-id: https://svn.blender.org/svnroot/bf-blender/trunk/blender@52940 954f8c5b-7b00-dc11-b283-0030488c597c
Fix #32796: cycles did not support image auto refresh option.

git-svn-id: https://svn.blender.org/svnroot/bf-blender/trunk/blender@52439 954f8c5b-7b00-dc11-b283-0030488c597c
Fix #33256: cycles Z pass for orthographic camera was not right, now is more
useful for e.g. fog in compositing.

git-svn-id: https://svn.blender.org/svnroot/bf-blender/trunk/blender@52440 954f8c5b-7b00-dc11-b283-0030488c597c
py api: add mapping support to bmesh operator return values.


git-svn-id: https://svn.blender.org/svnroot/bf-blender/trunk/blender@52396 954f8c5b-7b00-dc11-b283-0030488c597c
Add GPU_buffers support for drawing dynamic topology nodes

The GPU interface for PBVH drawing gets a new pair of build/update
buffers functions for drawing BMFaces and BMVerts.

TODO: the diffuse color is hardcoded to 0.8 gray rather than using
material color.

TODO: only VBO drawing is implemented, no immediate mode.
Code cleanup: move PBVH/PBVHNode structs into new header file
Move layer displacements from SculptUndoNode to PBVHNode

* This doesn't make much difference for regular mesh/multires
  sculpting, but for dynamic topology sculpting the undo stack isn't
  split up by PBVH nodes, so it's more convenient to store the layer
  data in PBVH nodes.

* Note that the life cycle of the layer displacement data is
  unchanged -- it's only valid during a stroke with the layer brush,
  gets free'd when the undo step ends.
Add DNA/RNA/BKE/UI infrastructure for dyntopo

* Further notes TODO
Add dynamic topology support to the PBVH
Add dynamic topology support to sculpt mode

Description TODO
Modify info stats for dynamic-topology sculpt mode

Format is like this: "Verts:8 | Tris:12 | Cube"
WIP: Update DerivedMesh for dyntopo

* Build bmesh PBVH in CDDM when dyntopo is enabled

* Disable all modifiers when dyntopo is enabled
Hiding support for dynamic topology
Use GPU_Buffers to draw wireframe when in dynamic-topology sculpt mode

This adds an override to the CDDM edge drawing function that switches
to GPU_Buffers drawing for PBVHes of type PBVH_BMESH.

Within the GPU_Buffers code, glPolygonMode() is used to draw lines
instead of faces.
WIP: simplify brush
WIP: symmetrize integration
Add unit tests

* Covers the BMesh convex hull operator and BMLog.
Add sculpt documentation
UI Tweak:
* Use alignment for thread buttons in BI, same as in Cycles. 

git-svn-id: https://svn.blender.org/svnroot/bf-blender/trunk/blender@51852 954f8c5b-7b00-dc11-b283-0030488c597c
Finally fix the "double operators labels" in current po's: Operator sub-classes do not have custom "Operator" translation_context (while OperatorProperties subclasses do), so skip parsing the first! 

Also refactored the "skip dummy messages like "1024" or ": %d", now using a regex!

All this removes about 160 doubles/unneeded messages!

git-svn-id: https://svn.blender.org/svnroot/bf-blender/trunk/blender@51672 954f8c5b-7b00-dc11-b283-0030488c597c
use BUILD_ARCH for build client architecture determination.
Fixes: #5 - reformat the new wiki content as part of the client manpage.
Merge branch 'master' of github.com:nicholasdavidson/pybit
adding lookup path support
fixing nested dependency bug where nested components couldn't be found
refactor lookup
docs
Merge branch 'integrate/lookup'
Release 0.2.0
bye bye PHP, hello node.js  (soon :D)
added 4 heroes (co) to the database
no php anymore
ParentBox 1ere esquisse - En cours : mise en arrière plan des sous-scenario pdt l'édition de courbe - Attention Bug sur le zoom
Added tomcat dependancy to 52north-SOS
Updated REQUIRED_USE flag
ctrl+alt+6 quickpet
переезд на новый сборщик so_compiler
и куча других попутных улучшений
projection matrix is wrong@
trying some more things
Elimino comentarios y @author no deseables
Isolating FTPClient saving of file to memory before ByteBuffer conversion
Font changes
Merge branch 'master' of https://github.com/nnotario/arquideasprod
update bundler and rake task
added images
Merge branch 'master' into section_6_3

Conflicts:
	Gemfile.lock
Add a SmartyFormulaLoader::load() implementation based on regex'ing Smarty compiled templates
Added header to vcf_print_svlen.pl
enable to handle hybi-00 and rfc-6455 in same time.
fix bug.

- surpress several warning.
- configure script invalid
- invalid base64 api usage
Merge branch 'feature/dual-protos-support' into develop
added Google Cloud Messaging jar
fix hpylda hyper auxiliary
Clean up code and make rpotion command work when no player is supplied
Fix stability issues
Merge branch 'master' of https://github.com/np98765/PotionCommands.git
modify test. テストケース修正
Qidが3つのケースを追加
modify autosel. Qidごとの選択可能数初期化
GTNPORTAL-2404: Add support for WSRP application binding.
Added voices to Ruby. Counter behavior is now same as in bash.
car_bms.X: main.c: moved trip codes from can_bms.h to main.c
error_reporting.h: removed REPORT_ERR_EXPR macro

The same functionality is in the other macros.
Add README for cordova build applications
tex dosyasi hazirlanan bolumlerin txt dosyalari kaldirildi
Adding population, severity as value and unit and vulnerability as value (all machine readable).
Changing rails version from '~> 3.2.2' to '~> 3.2'.
Pushing version to 0.6.0
Remove navbar_inverse option from sanitization callback. Only uptodate
versions get new options.
Fix undefined variable notice in image.php
Make order of words in image navigation localized
Add RSS icon to the package.
Make it explicitly clear that this version is a major release.
functions.php cleanup
debounce url validation calls
Custom error pages.
Custom short names support
some format refine
mostly finished encoding fixes
merging again
Removed md5 hash of push stream module
Dodan thisExpression, time je dovršeno sve šta je bilo jasno... problem
kod patterna predstavlja assignmentExpression, točnije, right kod njega
u ovom primjeru šta se koristi za testiranje, na njemu puca i piše
undefined
Add ACL restrictions.
Change proxy action name.
index.html に scaffold の記事 post へのリンクを追加
Product Review Changes.
We need to somehow call WSAStartup before trying to perform any lookups on Win32.
basic prototype to start :)
broadband-modem: fix GError disposal
plugin-manager: never suggest the Generic plugin to others

Some modems, e.g. Huawei E367, will probe first the QMI port and for some reason
it doesn't report a proper VID/PID so the Generic plugin is the one finally
accepting that port. When we probe the AT ports afterwards we already got the
Generic plugin as suggestion, and we end up not grabbing the proper primary and
secondary ports as we skipped the AT^GETPORTMODE reply.

So, from now on the Generic plugin is never suggested to other probes; except
for the case where we need the suggestion to finish a probing task which was
'deferred until suggested'.

Also, the device-level plugin can now be overwritten, if and only if, the
previously set plugin was the Generic one.
device: if failed to get VID/PID in first port, try the next one

Don't rely only in the first grabbed port to get VID/PID. Some modems, e.g.
Huawei E367, won't report a proper VID in the cdc-wdm port, which is the first
one probed.
huawei: if port replies to AT^GETPORTMODE, port is AT

Just skips the additional check for AT support in the port.
core: add generic value hash code

Consolidate code that adds various GValues to a GHashTable of
string:GValue.
core: make GMatchInfo uint item helper generic
huawei,anydata: use common response stripping function
cdma: return composite signal quality, not just CDMA 1x

If EVDO is registered return EVDO quality, otherwise CDMA quality.
novatel: report EVDO signal quality

Report EVDO quality to higher layers if we have it.
Update notes for submitted changes

* Setup rootwrapper for quantum-debug command
Update notes for submitted changes

* Fix openstack-infra/config jenkins jobs.
Add deploy: -> settings.yml
вывод фотографий suborganization
add basic authorization helpers
The first commit
Set up models and migrations
Merge branch 'master' of github.com:orthogonal/Chat-Client
v 2.0.0.0 Nuevo Battle Core 2
better file checking
Include MutableExtensionRegistry.h.
Serialize to a NSMutableData without worrying about space.

Don't pollute the global namespace with constant names.
Don't pollute the global namespace.
Include Bootstrap.h instead of individual files.
Update README.md

Actualizado el archivo de presentación del proyecto.
Merge branch 'release/0.2.3' into develop
Fix project.clj to use :plugins for the pallet plugin
Updated project.clj, release notes and readme for 0.2.4
Add url and license to project.clj
Merge branch 'release/0.2.4'
added presentation (hokkaido.pm #8).
Added robodoc and comments
HTML and text emails
add new example content
.
before
m3scalac
.
.
.
29
.
.
dark sky link opens in a new tab
Add my own defconfig
add the following governors and schedulers:

	governors: Lagfree, Lazy, Lulzactive and Minmax

	schedulers: sio, vr and bfq v5
[cpufreq] add smartassV2 governor
Set as-instr to use printf intsead of echo

as-instr was hardcoded to use /bin/echo with the -e option.
Non-GNU systems like MacOSX would fail and cause compiler errors.

Since BSD echo does not have the -e option (escape backslashes)
prinf was used instead would should be more friendly cross-platform

Specifically with the new OSX toolchain it caused the following
error:
  Error: selected processor does not support ARM mode `smc #0'

This was caused by $(call as-instr,.arch_extension sec,+sec) failing
since it was using echo -e.

See: http://pubs.opengroup.org/onlinepubs/9699919799/utilities/echo.html

  "It is not possible to use echo portably across all POSIX systems
   unless both -n (as the first argument) and escape sequences are
   omitted.

  The printf utility can be used portably to emulate any of the
  traditional behaviors of the echo utility as follows (assuming
  that IFS has its standard value or is unset)

  New applications are encouraged to use printf instead of echo."

Change-Id: I558ec343e9bb8d449e1af710d329b4dc76743a05
mm: Set settings into kernel rather than script
Version bump Divemaster Edition
Merge branch 'release/1.8.2' into develop
Correction to SubmitVideoViewTestCase.test_form_valid.

Include 'contact' in the data dict so that the form will validate no matter what the value of LOCALTV_VIDEO_SUBMIT_REQUIRES_EMAIL is.
Merge branch 'develop' into daguerre_image
modified:   classvisitor.cpp
Crosshair closer to finger
A little more styling
Upgrading stuff
Auth stuff is up to date.. mostly
Woop.
Some changes to fit in 2 pages
Define state machine before callbacks spec to prevent invalid state message
Revert "Add "encoding: utf-8" magic comment to *.js.erb"

This reverts commit 00c04c4232904fe5341e92142ba55906c655815b.

As per my comment here: https://github.com/spree/spree/pull/1883#issuecomment-8125190
Prevent multiple checkout flow transitions

The issue was that the previous state_machine definition was not correctly being removed, causing the callbacks for states to remain inplace, when really they should be reset every time checkout_flow is defined. There is now a test within spec/models/order/checkout_spec.rb which re-defines the checkout_flow within the Order class and then validates that the next event "branches" don't know anything about the states that shouldn't be there. This should be sufficient for testing that old states are removed.

This commit also fixes a number of other, related problems:

1) Subclasses of the Order class should not effect the parent class's state_machine definition. This was fixed by using class_attribute instead of using cattr_accessor. Really, I (Ryan) should've known better.

2) checkout_steps was being incorrectly defined as an array, when it should be an ActiveSupport::OrderedHash instead

3) Prevented method conflict errors by using StateMachine::Machine.ignore_method_conflicts. This was only needed due to changes from this commit.
Remove comment that incorrectly says we add the complete state in checkout.rb

[ci skip]
Explain why we need to use fully-qualified name for Checkout module
Stop using number_to_currency everywhere, switch to Money gem

Merges PR #1829

Conflicts:

	core/app/views/spree/admin/general_settings/edit.html.erb
Convert display_total to string so that rendering the template doesn't bomb out
Currency is no longer determined by I18n values

Fixes order_details_spec
Translate order cancel + confirmation emails, as well as shipped item email

Merges #1884
Prevent commerce_tracking flash message appearing on checkout

Fixes #1428 (again)

Also stops a double iteration through all (max two) of the flash messages
Unfulfilled order admin filter

Merges #1872
Adding date completed display to orders#show

Merges #1876
Reset locale in shipment_mailer_spec
Reset the I18n.locale after order_mailer_spec
Add "encoding: utf-8" magic comment to *.js.erb
fixed display roles bug.

Merges #1901
Include analytics helper into layout specified with Spree::Config[:layout]

Fixes #1887

Also set unauthorized to use defined layout
Remove debug from spree_cmd
Set Spree::User to Spree.user_class when installing
No need for first slash in layout
Updating jetfuel branch
One of the test methods was not marked as test and private.
Add a testcase to verify the number of ZK connections and the proper closing of ZK connections when stopping LilyClient.
initial commit
finishing touch
Move ZkConnectionTest to appropriate package.
Rename the reset-lily-state integration test to misc since it now contains tests for different components (didn't think it made sense to set up different projects at this point).
Fix failing testRecordTypeFilter test.
Besides deleted records, there is another case where rows can exist in HBase which are not valid records: the case where a lock was taken on a not-yet-existing record (in repository.create), and the creation failed.
forkmode for integration tests.
Keep track if a lilyclient is open or closed. It can be handy to check if a lilyclient is still open when trying to do calls
Added Information-Card and BrowserID icon and changed FOAF and QR-Code icon
improved browserid icon
Added hamlc and fixed anaf snippet
dont output newlines to the end of the files in the zip archive
Added some doc to see the status of content conversion
Fix issue with exclamation points in contrib_name_clean. Bug #62950.
Merge remote-tracking branch 'prototech/ticket/62950'
Merge branch 'master' into ascraeus
regenerated phpdoc
updating slides
Started work on basic Calendar serialization
updated polish form
Merge pull request #133 from piotras/master

Switching from git to composer. Major updates.
Merge pull request #134 from piotras/master

Do not compare objects
Merge pull request #136 from piotras/master

Set default, non strict MySQL mode.
Merge pull request #137 from piotras/master

Install phpcr-utils dev version, disable orderable tests
Fixed PHPCR interface requirements

New PHPCR interface requirements introduced here:

https://github.com/phpcr/phpcr/commit/140d3f503de18df25568d13e7a854c5a11c298b9

Caused new build failures here:

http://travis-ci.org/#!/doctrine/phpcr-odm/jobs/2429378
Merge pull request #138 from simensen/phpcr-interface-changes

Fixed PHPCR interface requirements
Merge branch 'master' of github.com:midgardproject/phpcr-midgard2
TeamCity projects actually post json, not urlencoded strings
sort the project names in alphabetical order on the dashboard
Added the last line.
plone.app.discussion needs changes
Working on Pie CHarts
adding label for Aurora
unit chart
Adding Steam and Kindle profiles
Add galleries to league dashboard view
Translations
add standard modules and prepare JournalData
add http helper
ch21 step?, Got the widget to show up in the widget list, accomplished
by dark magic. I do not know how else to explain it.
Address bar in place now, and fully named and id ed
注册用户，点搜索，变成想玩
First experiments with the UI.
a bit of has_many refactoring
Anpassung vom letzten Push.
Umstellung auf LWJGL.
Quellcode wurde angepasst und die neuen Bibliotheken wurden hinzugefügt.
home page v2
added closing slide (stroop)
Update templating docs -- replace link to external cheat sheat with inline syntax guide
ENC changes: Edit environment.markdown and rest_auth_conf.markdown

- Add new default node ACL to auth.conf example
- Change environment docs to state that ENC environments now win
テスト名変更
XMLをajaxで取得できるようになった
change load manifest

Signed-off-by: Pin Xie <pxie@vmware.com>
Improved mapOver to sort keys, renamed mapTo to mapObject and added more info to README.md
Site updated at 2012-03-25 00:00:48 UTC
Implemented cipher, yaml_decryption classes.
Renamed gem.
Issue #42, clarified that you have to clear the cache for project settings to take effect.
renamed unittest.py to unittest.python so that it isn't loaded by st2
commentaire + modifs
Adding our index page
Make tab rendering a little saner (less glitches when zoomed in or out).
Whoops, backlog always loaded Uncategorized posts.
Don't send backlog button when topic has less than PPP posts.
Wrong number of vectors
dålig transparans
Merge branch 'master' of https://github.com/qwexsugare/Spelprojekt
Fixed source and result images paths bug. Behavior operates from 'images' dir at project's root
pulling
Merge branch 'master' of github.com:rafi-khan/Yale-Connect
Changed README to reflect new repo name
Site updated at 2012-08-14 04:16:04 UTC
ads intemediate commit
add missing files
add multiple's client support
X -> x
update readme
basic generic wsdl support
add new wsdl files, fix some namespace issues
remove wsdls
basic tokenizer
basic token substitution
soap to stable
better tokenization
Merge branch 'master' into stable
remove puts
Fix up forum header, namespace some PHPBB class attributes that were overlapping with Twitter Bootstrap attributes
remove the build date assert
pretty+refactor
Changed the Board::getStatus() function to work correctly
Merge branch 'master' of github.com:rc2524/Battleship-game
race category and page-race.php
fixing column width for next column
muro grupo y weas
Changed structure of js and css files
new class ActivationActivity
added stuff about css
cf stacks, ec2 instances
Botao Sair

For the menu
Equalize default margin-left and margin-right
Added mongoURL
Deleted esproj files.
Add ability to have allocations not show up on flex reports.
appConfig
Hard code current_user, add basic partials.
Simple info response
working on cleaning up dynamic-tree. this doesn't compile yet
insert leaf
gotta make it compile now
running into trouble... I've got a better idea
compiles, but broken
where is this bug
got it
clean up
comment
Merge branch 'master' into bddDynamicTree
Merge branch 'master' into bddDynamicTree
Now the rep layer returns the same object if calling new for stats/fleet/conn.
get rid of old saving method
Change Map Localeto TH
Fetch the correct mailchimp list id
bottom-up and top-down implemented as DAGs of tbb::task
Added email link on about page
fixing parsing LiveJournal
Updated sass/stylesheet.css
Deleted templates/pages/archives.rhtml
Remove vendor path.
Fix wrong param name.
finished dice, inheritance, and open classes
minor improvements in LevelGeneration
Fixing up the instance creation issues

* update gitignore with log file from tests
* update the tenant id on the client
* change database to instance module
* added some logging in the api calls
* configuration of nova client values
Merge pull request #18 from cp16net/clean-up-for-create-tests

update gitignore with log file from tests
Changed the proxy_tenant_id to "reddwarf" since this is what KeyStone expects.
Fixes pep8 and circular import issues.

* Moved some model classes from instance/models module into common/models module.
Merge pull request #19 from TimSimpsonR/pep8-and-import-fix

Pep8 and import fix
Adding getattr and setattr back to fix the bug I just added.
Merge pull request #20 from TimSimpsonR/pep8-and-import-fix

Adding getattr and setattr back to fix the bug I just added.
Dns bug fixes related to usernet ip.
Placing camera on either side of any axle is now possible.
add post date to post template, more work on category template.
archive layout, and added tags to post layout.
Added GPL licenceblock. Renamed planet.cpp to objects.h
Add missing Stream destroy method

- Added also a test-case.
set -e; to exit when a test fails
emit the root object if the path is empty/null
0.3.2
test on 0.6 & 0.8
abandon support for 0.6
allow null path
0.3.3
Support multiple JSON objects in a stream

- At the moment only one per stream was supported.
- Added test case.
update tests to cover excepted behaviour better
0.4.0
a1 'n a2
Melhorias no ObjectManager, documentação dos principais pontos, exclusão e busca de clientes
Added vis
moving tokenizing to Document class
test.py -> tests.py because i mean come on what was i thinking
flesh out the README
putting links, imgs, and title in db.
Translation to Spanish. Translation of the document "The Scala actor API"
Merge pull request #89 from migue/translation-to-spanish-scala-actors

Translation to Spanish. Translation of the document "The Scala actor API"
added dark test image.
merge branch 'master' of github.com:schiantaberetti/Rasta2
iyes
grayscale 'working'; potential minenergy problem
added very basic Markdown Widget, can display local files
Use the publically available git repo for the sunspot solr gem
Adding jstat utility
Merge pull request #71 from jtuberville/master

Proposed Jstat plugin
Tweaked README.md grammar
Fix the name of the build script in the README.
Fix spelling of "receive"
Merge pull request #5 from dripton/master

Spelling fix and doc fix
Back to the SNAPSHOT grindstone for the 0.6.0 stable release
Delete empty test file
Use new-driver instead of start, server needs to start before browser tries to reach the URL
Replace println's with log statements
Upgrade Selenium-WebDriver dependency to 2.25, fixes #59
Add notice for 0.6.0-beta2 in README
added dispose method
added methods for moving camera

x movement
z movement
clean up and add

cleaned out unused using statements
added rawinput for mouse control of graphics(it doesn't necessarily
work) regular win forms moues control should work for now
moved a method to region
added two keyboard controls for camera movement
added comment and removed debug line
needs lots of work

removed everything because it just wasnt working
will need this class for when we have the "live" mode for actually
"playing" the creation (only because this class will not have the lag
that regular win form windows do)
Small improvements in docs
add NodeTest support to "parent" axis
Improve ./aa script:
 - add 'dna' action
 - support single interactive shell if 'shell' action has no command
 - better code comments
Improve user visible error message for send failures
fixed null-pointer problem introduced in previous fix.
Consolidate Exceptions into module and derive from common root.

- ClientException merged into CloudFiles::Exceptions namespace
- old Exception declarations (non-namespaced) were removed
- duplicate Exception declarations were nuked (client.rb vs. exceptions.rb)
- CloudFiles::Exceptions made a module / mixin
- deriving all exceptions from common CloudFiles::Exceptions::Error makes it
  possible for library consumers to "catch all CloudFiles exceptions" with one
  rescue

Tests updated and pass.
Require system gems first, and add missing dependency in client.rb.

The idiom of nesting require's inside a namespace is misleading and practically
useless, since it has no effect on the constants defined within the require'd
files.

Given these are system gems, even if the nesting did magically wrap constants
defined within require'd files, it wouldn't be what was intended.
Finished .bashrc and bash.bashrc.
- root prompt -> red with truncation
- normal prompt -> green with truncation
Forgot bash completion command.
Bash Completion now works. :-)
finished migrating over to mini_magick
Added small check
Added Windows howto
Merge pull request #13 from linuxtechie/master

Nothing much, howto on Windoze and small script check.
Card Class added
Real Space Fixer
port forwarding script for linux
font sizes and map line colors
Merge remote-tracking branch 'origin'
facter-1.6.9
Update Stationary template with some mobile optimization tweaks.
Hibernate should work now

=D
Merge branch 'master' of https://github.com/silas-h/themaopdracht5
Deleted some useless folderz
transitioning to CodeBlockGroup.
Enable the wildmenu
Added vanilla events

Signed-off-by: Ian Macalinao <ianmacalinao@gmail.com>
Initial upload

moving data from bulk_extractor development tree to github.
Definition for 2dvalue.
-s
Revert "-s"

This reverts commit d59fa35c39dd26100f96151ad9328495b858edf0.
Increased width of edit text box to 100%
Added logo
Removed unneeded CursorPosition field.
Resized edit text box.
Added support for rendering uploaded images and files.
Uploaded files now replace any existing file on the server.
Added margin for logo.
Implemented updating note content on server.
simultaneus sprites working, and diferents
use grunt as build system, moved some code, fixed some code
Prevent non-number cutoff values.
Changed workplace to city
Настройки на сервере
added cytoscapeweb report module
add get hub
add get radius
add enum/get connection
to consistent key name
add get hub status
make dependencies more clear
main.js retail
updated composer.json to use Symfony 2.1.*
removed sonata.block.service.action from config, fixed error on no available sonata.block.service.action when editing a block.
Merge pull request #57 from rmzamora/master

fixes composer.json and  removed sonata.block.service.action
NR-234 : Media Archive - thumbnail generator
Egg layed
NR-209 - UI Optimization & Fixes

X-Filter and some sync functionallity
NR-209: UI Optimization & Fixes

Added View class to the gizmo
Added Class implementation in utils
Added Extend for extending the basic function implementation of
javascript 1.8.5
Revert "NR-209: UI Optimization & Fixes"

This reverts commit 9c26929153600577bd431693e2f3074007fc81e9.
Revert "Revert "NR-209: UI Optimization & Fixes""

This reverts commit 2e65a4a3fd979fe7b2d9536af5ea77cbcdc579c2.
NR-209 - UI Optimization & Fixes

unique object container for models
NR-209: UI Optimization & Fixes

Added the bat file
All the changes go to newgizmo.js
NR-209: UI Optimization & Fixes

Added newgizmo the extended version
NR-209 - UI Optimization & Fixes

huge changes to collections and models' behavior.
NR-209: UI Optimization & Fixes

Modification of View
NR-209 : UI Optimization & Fixes

Insert function
NR-209 : UI Optimization & Fixes

Unit testing support with QUnit
NR-209 : UI Optimization & Fixes

wip delete from collection
NR-216 : UI MVC - Collection implementation

Handles models delete
Added README file
NR-216 : UI MVC - Collection implementation

Added tests for insert and update actions
NR-216 : UI MVC - Collection implementation

Slightly changed the sync adapter so we can extend for authenticated
models and colelctions
NR-216 : UI MVC - Collection implementation

gizmo isolated from superdesk
NR-216 : UI MVC - Collection implementation

Override unique model behavior
Write auth_token to cookies once it's received from ajax request, added pageCached method to control ajax request
@ModelAttribute减少约定俗成，写得更大白话一点，入门的时候容易懂。
[maven-release-plugin] prepare release mustache.java-0.8.3
Supress warnings when null host names are returned by old BYOND servers
Only probe the BYOND server at most once every two minutes.

This is configurable in the class definition; it should be pretty
self-explanatory what to change in order to adjust this timing.
Move livestock to unused/ and clean up "uses."

Not that there were any livestock in the game, but apparently to handle
them a whole bunch of the 'eating' code was copy-pasted.  And had, of
course, bitrotted due to lack of consistent changes.  Woo.  Getting
rid of it is a pretty obvious win.
Move unused WIP mainspipe code out.
Move gameticker -> game_ticker and fix robolist.

The robolist fix keeps the game from printing AI minions twice, and
is based on the fix to /tg/station issue 411 committed by petethegoat
(although our solution gets rid of the stupid ternary).  This also
necessitated the moving of some things into setup.dm, which is now
included outside of the standard "INCLUDE" block in daedalus.dme.

After this commit, all commits of daedalus.dme should now be hand
edits, NOT blind commits of the file, as otherwise there will be
duplicate entries for what will soon be called define.dm and is
now called setup.dm.
Switch the default mirror from GitHub Downloads to Amazon CloudFront
Rewrote lit review for Section 3.2 - someone please proofread and double-check. Thanks

Also updated bibfile with two additional references but as usual cannot
get bib file to run. References are still showing up as question marks
on page 9.
add ssl in production
adding back factory girl
Mise en forme des courbes d'affichage
Update docs for 'all' call.
Implement Analysis
Add a 'busted' test file, mostly just to play around with busted.
Add Book model belongs to User
Notes and fixed tutorial typo
Changed `rake docs` to `rake doc`
Version bump
deleted extraneous settings file
0.7.4-dev bump
remove prev back slash
Minor doc/typo changes
Lower case print(..)
DEBUG, WARNING and ERROR message macros
Interface to add a new decay channel with B.F.
Using the travis-ci cookbooks
extern/ion-definitions patched. The api for user_notification_service has been fixed so that origin_type is used instead of origin_subtype
Fixed the signature of the methods crate_sms() and create_email() for UserNotificationService so that origin_type is used instead of origin_subtype. Also removed calls to user_event_processor from inside the same methods
Merge pull request #230 from swarbhanu/replace_while_true

Replaced "while true" with the pattern, "while not self.finished.is_set()" in ctd data producer modules
just changed comment in order to make a pull request
upload image files.
Modified .gitignore so that .project and .classpath files will be version controlled.
commit for...
iroiro
ios app now submits to a server, loads response in full screen webview
Try to set default button on add photo-shared map chrome bug fix 17
GUI adding new item with adding clients/teams/features almost finished.
Adding new item : elements are displayed on text field input, "add new element" prompt is shown on adding non-existing element.
skip non-free videos
adding favourites; not showing not available videos; added newest category
add Scenario: find movie with same director
#14: ok pour 1er step

Suppression complète de la classe GateKeeper.
Amélioration perfo
* Mise à jour des Entités
* Réorganisation des pages (index.jsp pour les membres, librarianAccess.jsp pour le gestionnaire)
* Création de nouvelles pages
* Ajout du style sur certaines jsp
* Mise à jour des noms des tables
fixed miss-markup
Mention fixinf file names in readme
Plakat
Plakat
Plakat (hoffentlich Final)
Merge branch 'master' of github.com:te-bachi/SimulationDoc
Create service validations improved
Configured Lucene.Net, Lucene.Net Contrib and NHibernate.Search
restore old version of db/schema.rb
moved inline css to default application.css
Set the DEFAULT_FROM_EMAIL address based on the EMAIL_HOST_USER.
added comment to ticket 1349440801_timing-of-components-is-off_907
added state (resolved) to ticket 1349440801_timing-of-components-is-off_907
step 3-6 作成者名を表示
Rename: Spidertester
Smoother keyboard movement input
Slightly reduced headline margins, at large sizes they were a little excessive
Race condition: only create pound clients from 1 thread
Added a script to easy install all the vendors for development purposes
Added a script to easy install all the vendors for development purposes
Changing HTML structure
Added tests for user firstname lastname and profile correctness
Updates to output sytax.
Minor code changes
Minor code changes
Removed program print on load
vector data from a kernel, OpenCL in action cpt 4 example
Updated makefile to reflect additions
Added a c version of memtest
Doc changes
Added PGXN metadata, version 1.3.0
Changed license to PostgreSQL
Added Changes
Remove -I debuild option from README

Signed-off-by: Michael Wild <themiwi@users.sourceforge.net>
Renamed README{,.md} for github

Signed-off-by: Michael Wild <themiwi@users.sourceforge.net>
Fix README.html generation, update for README.md

Signed-off-by: Michael Wild <themiwi@users.sourceforge.net>
Update Array#median test to make it more picky
Fix Array#median so its test passes
Merge branch 'fixes'
""5c1a012 Fix articles_page check
""
Add unit test harness to site.
Add version test file
Layout mantığı oturtuldu.
Veritabanı sınıfına başlandı.
Upgraded tvshow.py to accept case-insensitive input and match partial names
Regex matching functional, confirmation required to download
Merging branch case-regex with master
exemplos de som
Result screen shows now the right colors on client & server.
Invert powerup works.
Merge branch 'develop' of github.com:timb-stud/color-battle into develop
Adding collided robot information
Merge branch 'master' of github.com:timehome/game-off-2012
Added source, license; better readme.
add assignment 5a
Fix: DBus reply may not contain 'extract' filed
school buses
Merge pull request #2 from tnbredillet/master

test key storage value
Merge pull request #4 from tnbredillet/master

working version, still missing queries , some scan options 
Merge pull request #5 from tnbredillet/master

added query, it still lacks some options
Cleaning up, increasing version number, adding better readme
Merge branch 'master' of github.com:mboudreau/Alternator
Added embedded server, refactored applicationContext location
fixed the conversionService
Small change to pom
Merge branch 'master' of github.com:mboudreau/Alternator
Merge branch 'master' of https://github.com/flozano/Alternator into flozano-master
Small changes to pom for versioning, increment version
Removing Grizzly, adding Jetty instead.  Created non-xml based Spring configuration, added own version of AmazonDynamoDBClient which removes the security process.
Removing 'final' modifier from config, causing compilation error
Cleaning code, adding request type, changing structure
Latest structural changes, need to commit for Thomas to work on tests
Adding proper structure to alternator handler, added proper request in-request out functions
Removing getTables from controller
Comitting latest
added unit tests
Adding all json unmarshaller classes for requests
Projeto zerado.
Completing the spin half system v2 :)
Fixing cabal config warning
Merge pull request #2 from tobyhourst/develop

createTeamAction AJAX handling
Merge branch 'develop' of github.com:Elcyone/pro-manager into develop
Change stats timer and animation speed for stats and header
fixed bug introduced when removing jedi; converting from apache to simple-http headers wasn't copying headers. Added a test and need to add more apache headers to the Matchers collecting class and standardise on the api for them (see CoercionsTest to see different ways to use the matchers. this affects the headers/has matchers)
Autorefresh of tasks's list using Faye
removed view distance until i can think of a better way to do it...
add description

add description and bug fix
Prepare for run_alternatives == "all"
Javascript: Support for jslint (fixes #14)
Run multiple syntax checkers (fixes #15)