labofsahil/github-event-dataset-2012 huggingface dataset:
By Brian Paulsen <brian@thepaulsens.com>
This fixes some incomplete codes like: XB3: but1_1 manual
You can receive a unit code and a house code with no command followed by a house
code with no unit code and then the status.
Combine the two messages to successfully infer the status.
added snack-sizzle, startet implementing voting
Fixed instructions for tap
updated top level nav bar with correct links and added a new color
complete new menu with all proper styling and functionality
fix platform test
Handle errors during image loading with WP_Error
Don't proceed to resize an image which does not exist, or cannot be loaded
Sequenzdiagramm von Timebox 1 erweitert

Signed-off-by: Nepetalactone <tobias.meusburger@students.fhv.at>
Hibernate Ebene auf neues DB Modell angepasst
Merge branch 'master' of https://github.com/markusmo/HotelSoftware

Conflicts:
	Code/HotelSoftware/src/hotelsoftware/checkin/ChangeDataState.java
	Code/HotelSoftware/src/hotelsoftware/model/database/service/DBHabitation.java
	Code/HotelSoftware/src/hotelsoftware/model/database/users/DBUser.java
Little fixes, added message that build_game is still not ready in ADK script
Remove use of English expletives
Remove words such as fuck, crap, shit etc.
Remove other potentiall offensive words from comments.
Tidy up other geopolicital terms in comments.
Send badges by email
Added product and cart django-cms plugins.
.aliases: Add `mergepdf` alias that concatenates PDF files

Credit goes to Fritz Stelluto: http://blog.gotofritz.net/howto/joining-pdf-files-in-os-x-from-the-command-line/.
2012-04-13_04:37:43+0900
2012-03-16_20:38:13+0900
patches/RELENG_8_3: FreeBSD-VirtIO-0001.obj removal

This file hasn't been enabled for 8.3-based builds for
longer time, I think we can also drop it.
patches/RELENG_8_3: Unify the from-8-STABLE backports

As the from-8-STABLE backports have grown to a not-so-insignificant
size, put them into a single directory before adding bge and bce
backports.
patches/RELENG_8_3: Import bge and bce backport from 8-STABLE

This is a huge commit, I admit, but it adds quite some bugfixes
taken from 8-STABLE related to the widely used NetExtreme and
NetExtreme II server NICs that might be handy.

In the hope that it helps to keep pfSense 2.1 up-to-date via 8-STABLE
for more recent hardware since 8.3's release.

Agreed: I import quite a number of patches after wiping others them...
Class label for successful save
libreria nueva
upped the memory for the build

Signed-off-by: Matthew Hare <matthewhare@me.com>
Adding the new Android Project
Deleted conf/
changed to just the server, added functions
implementando edicao de condos, visualizacao de user, e criando helpers
Fixed painting of waypoints to better perform in overlapping cases
compat-wireless: add patch to fix message tracing in mac80211

Just like in iwlwifi, the tracing in mac80211 needs to
copy va_args as some old kernels don't do it for %pV.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Luis R. Rodriguez <mcgrof@frijolero.org>
Revert "Get rid of the enqueued tab"

This reverts commit 48cef24bde67adab0bbce8d6970136be1fc188be.
Rename the 'enqueued' tab to just 'all jobs'
Bump to 1.1.3.rc3
Regenerate gemspec for version 1.1.3.rc3
The back buttons for Login and RegisterViewControllers use the proper animation now. Wrote code for sha256 hashing and worked on the login server request.
Merge remote-tracking branch 'origin/master'
Update reports to filter by course if id provided
Update all reports to filter by coursework id if passed.  Closes #33
Update changelog
Don't display empty tables  if no objects found. Closes #47
Add error.html file for toopay
Add initial profile controller and views
Wrote first part of experiment section
Revert "added vr-ioshed"

This reverts commit 35ffd9170992a27e23e949a607b19c5ac7ebe373.
Added .gitignore for backend
Move directory structure
Added initial super-simple feature and a cake task to run it from dev dependencies
added gitkeep to tmp dir
added binstub for coffeelint from project deps
added zombie to dev dependencies for project
added binstub to coffee-script main exec
Added world constructor that includes a repl function for debugging and a zombie browser
corrected feature defintion and wrote preliminary step definitions
v2.4.5

Signed-off-by: Vyacheslav Parygin <slashp@gmail.com>
hapus commit dari kuyin

-.-"
Saya mengganti admin menjadi dosen by : Avinda.

ini lo hel "<div id="templatemo_dosen_content_top">&nbsp;</div>" :)
Merge pull request #16 from avinda/patch-1

Saya mengganti admin menjadi dosen by : Avinda.
1.0.0-beta3
Back to snapshot
config megam immediately
initial translate_corpus
translate_corpus working on movie_reviews
initial classify_to_corpus
smart joining of words and punctuation
initial classify_corpus.py working

--HG--
rename : classify_to_corpus.py => classify_corpus.py
tag_phrases basically working with ChunkedCorpusWriter
correct chunk imports
merge
ENH: encode array vals as string from seed, when sending to twserver.
Merge branch 'python_twisted_rewrite_mgrauer'

* python_twisted_rewrite_mgrauer:
  ENH: encode array vals as string from seed, when sending to twserver.
divide each Movement into the Class

I changed the design around movement.
fixed bugs

I fixed bugs.
Merge pull request #12 from ganow/divideMovementsToClass_01

Divide movements to class 01
fixed bugs

current joint angle in set() function, movementbase.cpp was 0.0, so I
fixed it.
Appropriate angle is set now.
Merge pull request #13 from ganow/divideMovementsToClass_01

fixed bugs
changed getter method returning way: from double* to double

getters returned pointer, but changed double number instead.
(and check the index is valid or not)
Merge pull request #14 from kotaitoda/bottega006

changed getter method returning way: from double* to double
change set function

w.getAngle() function was used in set() function.
This function accesseed to the angle of joint with std::string,
but set function used jointID(enum) to detect the joint name before.
I added the part of switching with jointID, so now we can use set
function with jointID and it can get current joint angle with
std::string
fixed bugs

fixed bugs
Merge pull request #15 from ganow/120912_changeSetFunction

120912 change set function
add ticktack movement

this is the half way of adding.
add count

add count
Merge pull request #16 from ganow/120912_addCount

120912 add count
changed ts to act.count

I used both ts and act.count in this program,
so we couldn't calculate the current frame of action.
I fixed it, and now only use act.count.

We can access to it by including action.h, and say:
Action act;
act.getCount;
Merge pull request #17 from ganow/120916_changeTsToCount

changed ts to act.count
add Movements based on Ticktackbase

I added some Movements based on that base class,
but I haven't add a few movements class:
LAround
Stop
FLeft
Fright

It's because there are some problem to fix the source code from
hillstone_U_v2 to this project.
I'll do it ASAP.

add some Movements

I added 5 Movements:
Forward
SlowForward
Dribble
LDribble
RDribble

These Movements are based on Ticktackbase, and succeed it.

Additionally I fixed some bugs.

add 2 movements

LDribbleSharp
RDribbleSharp

add 4 Movements

Back
SlowBack
TLeft
TRight

add 4 Movements

SLeft
SRight
TLeftIn
TRightIn
Merge pull request #18 from ganow/120912_addMovements

add Movements based on Ticktackbase
add gabase.h/.cpp

this class is the base class of the GA mmovements.
fix mm

I fixed mm
Merge pull request #19 from ganow/120918_addGAMovements

120918 add ga movements
Added random enemy spawning, fixed last boss re-appearing
Merge branch 'master' of github.com:mikecrawford9/cs134rpg

Conflicts:
	RPG/AStarGame/AStarGame/bin/x86/Debug/RPG.exe
	RPG/AStarGame/AStarGame/bin/x86/Debug/RPG.pdb
	RPG/AStarGame/AStarGame/obj/x86/Debug/GenerateResource.read.1.tlog
	RPG/AStarGame/AStarGame/obj/x86/Debug/GenerateResource.write.1.tlog
	RPG/AStarGame/AStarGame/obj/x86/Debug/RPG.exe
	RPG/AStarGame/AStarGame/obj/x86/Debug/RPG.pdb
	RPG/AStarGame/AStarGame/obj/x86/Debug/ResolveAssemblyReference.cache
	RPG/AStarGame/AStarGame/obj/x86/Debug/cachefile-{95434145-9C53-4EE8-AAF5-01E683E01D1B}-targetpath.txt
	RPG/AStarGame/AStarGameContent/obj/x86/Debug/ContentPipeline.xml
Merge branch 'master' of github.com:mikecrawford9/cs134rpg

Conflicts:
	RPG/AStarGame/AStarGame/obj/x86/Debug/ResolveAssemblyReference.cache
Merge pull request #11 from TheNietsnie/master

Fix for IC2 Reactor Output Stats
Merge pull request #12 from mikeemoo/master

tanks and fixed sensorviewbug
Merge pull request #13 from mikeemoo/master

World sensor, lua fix and also orwells new model!
Made icons render in placing direction.
Added new sensor texture, will be modified lateron
Merge pull request #14 from LeoVerto/textures

Added new sensor texture, will be modified lateron
Merge pull request #15 from Orwell1984/master

Made icons on sensors render in placing direction.
Shift clicking on a sensor doesn't open the GUI anymore.
Merge pull request #16 from mikeemoo/master

fixed somefink
updated detailed save filename to include target
Merge pull request #17 from lyqyd/master

Sensorview file output change.
Sensor peripheral now networks inventory change and directional status.
Added ISensorAccess to allow stuff to be done in a sensor card call.
Merge branch 'master' of https://github.com/Cloudhunter/OpenCCSensors
Added textures for Liquid and World sensors.
Included the dimension in returned data from World Sensor.
Merge pull request #18 from Orwell1984/master

Added textures for World and Liquid Sensor Card.
Enabled getting heading from SensorEnvironment (for TileEntities).
Merge pull request #19 from Orwell1984/master

Added getting sensor heading from SensorEnvironment.
Merge branch 'master' of git://github.com/Orwell1984/OpenCCSensors
Merge branch 'master' of git://github.com/Cloudhunter/OpenCCSensors
Updated and working on a total redo.
New board drawings for reference.
flow in test fixtures
array of active players
use jq ajax responsetext
updating description, etc.
gtk-engines-unico-1.0.2
'follow' value cannot be a tuple.
Fix zsh function definition not found errors
サーバ完成
migrated handlebind to commonJS style modules.  Using 'uncommon' (https://github.com/mjeffery/uncommon) for building
Modified the bottom silkscreen text to show pin connections
tweaks, reducing rates, etc
Add get-shit-done.rb
introduced separate configuration class
Add missing contact view (d'oh!)
Implemented binding of import aliases to unquoted symbols
Finally figured out and fixed array accesses (fingers crossed).
Changed GArray to GPtrArray (contains objects of arbitrary type) for records, functions, and procedures.
Site updated at 2012-10-08 01:48:30 UTC
added loading of variable in case of only var file don't exist
Fixed typo, exported sql
Validation for CalendarDatePicker

It's a bit tedious, since the javascript uses a different
format string syntax which we have to parse to python to
use it for validating.

Also, a default value can be specified now
TimePicker and an initial try for DateTimePicker

These are both experimental...
I'm not sure if it's really a good idea to do it this way!
correct VW options, fixed handling of isOOV in corner cases
Merge branch 'damt_phrase' of github.com:moses-smt/mosesdecoder into damt_phrase
Put core Moses into one library libmoses.
comments
Merge https://github.com/moses-smt/mosesdecoder
Balaji/Dhivyha : Changed communication type to asynchronous- http client properties
Balaji/Dhivyha : Added  Http Client Listener to  web applicationcontext.xml
Merge remote-tracking branch 'origin/master'
Gee/Dhiv : 1. Modified caregiver csv to have complete info(fname, mname, lname and gender)
2. Added StepsOVCImporter with main method - is invoked from ant for migration
Merge remote-tracking branch 'origin/master'
update logic to accomodate product 'thunderbird-test'. Bug 747025 - Build Thunderbird in parallel on new systems. r=nthomas
Merge pull request #74 from rossbruniges/dev

Lighthouse tickets
Merge pull request #75 from rossbruniges/dev

Changing 'proposals' to 'apps' and fixing a number of related bugs
Merge pull request #76 from rossbruniges/dev

Using a better flag to highlight the lull between ideation closing and development opening
Merge pull request #77 from rossbruniges/dev

[Lighthouse-152] Ammending the about page copy
Hacking up the forms so we can handle both ideation and development submissions with the fields that they both want
Adding in a new template and layout for the application submission
Fixing up form display by adding a charfield widget to each of the required fileds related specifically to the development stage
Adding in an additional field to obtain how much effort the users thing their submissions will take
[Lighthouse-149] Updating the terms and conditions for the opening of the development stage
Merge pull request #84 from rossbruniges/dev

Creating the required models, forms and views for the development stage submissions
Merge pull request #85 from mozilla/dev

Merge up from dev to staging
Search updated to check for negative number to signifiy fresh bst
Fixed bug when removing leading node
Added support for dynamic linked list creation by allowing lead node to be passed from application to lib
Started all use cases with LL and BST
GTNPORTAL-2576: added httpclient 3.1 module for WSRP.
GTNPORTAL-2568: Update profiles for changes in AS7 packaging.
GTNPORTAL-2574 - Upgrade to eXo JCR 1.15 Beta 01
GTNPORTAL-2501 - AS7 support with Hibernate 4
Workaround for AS7-5329
JTA support improvements with more test cases
GTNPORTAL-2583: Full servlet 3.0 support
GTNPORTAL-2567: Credentials saved in temporary authRegistry duing authentication. Adding ConversationStateUpdateFilter for update credentials in ConversationState
Update README.txt

remove reference to subversion and change to mention git
GTNPORTAL-2575: Add gatein rhq support for as7
  - Register portal resources
  - Register application and site resources w/ statistic metrics
GTNPORTAL-2580 Starting AS7 package with no parameters
GTNPORTAL-2587: TestNavigationServiceUpdate mistake (only fails if order of tests is not guaranteed)
Added octree and OSG sections
в статистике по продуктам теперь месяца рассчитываются правильно, парсер
файлов с почты теперь понимает и простые файлы и vnote, сделал небольшой
рефакторинг
xbmc-addon-settings: another keymap fix
vdr-iptv: re-add -skip_header_processing.patch
Merge pull request #699 from stefansaraev/vdr-iptv

vdr-iptv: re-add -skip_header_processing.patch
Merge pull request #692 from stefansaraev/xkb

xbmc-addon-settings: another keymap fix
new package: add package 'prelink-cross'

Signed-off-by: Stephan Raue <stephan@openelec.tv>
Merge branch 'master' of github.com:OpenELEC/OpenELEC.tv
scripts/image: prelink bins and libs

Signed-off-by: Stephan Raue <stephan@openelec.tv>
transmission: update to transmission-2.52
Merge pull request #707 from queeup/updates

transmission: update to transmission-2.52
prelink: correct install location
vdr-plugin-streamdev: update to vdr-plugin-streamdev-6a47e20
vdr-sc: update to vdr-sc-613
vdr-addon: bump version
Merge pull request #708 from stefansaraev/prelink

prelink: correct install location
Merge pull request #710 from stefansaraev/vdr

vdr update
xbmc-rpi: add patch to hide unneeded sysinfo output, this fixes #711

Signed-off-by: Stephan Raue <stephan@openelec.tv>
projects/*/options: make prelink support optional

Signed-off-by: Stephan Raue <stephan@openelec.tv>
Merge branch 'master' of github.com:OpenELEC/OpenELEC.tv
Merge branch 'master' of git://github.com/OpenELEC/OpenELEC.tv
hoşlaş
Generate player modal element

Modal is now appended to DOM by plugin, but doesn't display
content yet.
First working prototype

Auto-plays text it's attached to.

TODO: Add controls, progress bar, manual play, and variable font
sizing.
creating new branch for sub-threaded version, in which each musical note played goes in its own thread.
We can now play a sound (press 'a') without interupting video display/analysis! Hurray!

pluckGeneratorThreaded class implimented to replace pluckGenerator.*
Using ofVec3f openFrameworks vector library for 3D point manipulation.
2 strings now playable. They both play the same marsystem, so only 1 note will be heard.
Updates to revert dynamicity and go back to having default TTL just be a dumb old default.
change the models of vote
Added SequentialNext which generate unique sequential code based on existing sequence.
argkeys
add M.ToggleSwitchView
Merge branch 'detox' of github.com:mwaylabs/The-M-Project into detox
Updated changelog.txt
Merge pull request #63 from hano/detox

Detox
Editor file handling done. All operations now moved to TestModel
Fixed flag clobbering

Took out the flag parsing so that redis doesn't clobber user defined
flags.  This is under the philosophy that the redis debug flag will only
exist if the user calls flag.Parse(), otherwise the user won't expect
their program to accept flags.
Add Xapian
MVC4 Skeleton
Update version~
AUI-742 - Build files
Add acks to Nanode version
Corrected hostname to live
added nav
Merge branch 'master' of https://github.com/nbrendler/googlereader
connect on instantiation
make function template change static private
new reporting dashboard
* Adjusted the spacing for the cells. It's more grid-like now.
[NOBTS] Fix NPE which occurs when creating new user.
Merge branch 'master' of https://github.com/nhnopensource/ngrinder.git
add nonce to page message box
Sequencer: replace clamp+round of multiplied color value with FTOCHAR macro,

Should solve issues with building blender in release environment, should be
no functional changes.

git-svn-id: https://svn.blender.org/svnroot/bf-blender/trunk/blender@47110 954f8c5b-7b00-dc11-b283-0030488c597c
style cleanup: if's on the same line.


git-svn-id: https://svn.blender.org/svnroot/bf-blender/trunk/blender@52318 954f8c5b-7b00-dc11-b283-0030488c597c
Fix #32139: Making vertex parent hides faces

Call normals update and re-tesselate the BMesh before generating
derived mesh for vertex parent. this is needed for proper display
of mesh in edit mode.

Tried to use EDBM_update_generic, but it gave artifacts due to it
doesn't update normals. usually it's not a problem, because it's used
at the end of operator and all needed data is handles by depsgraph.
It doesn't work for vertex parent because derived mesh is being
created here outside of generic object update, so one extra manual
step seems to be needed here.

git-svn-id: https://svn.blender.org/svnroot/bf-blender/trunk/blender@49233 954f8c5b-7b00-dc11-b283-0030488c597c
quiet unused function warnings in RNA for functions created by macros.


git-svn-id: https://svn.blender.org/svnroot/bf-blender/trunk/blender@50035 954f8c5b-7b00-dc11-b283-0030488c597c
missing from previous commit


git-svn-id: https://svn.blender.org/svnroot/bf-blender/trunk/blender@47097 954f8c5b-7b00-dc11-b283-0030488c597c
Changes in clip editor's public api to make it's more clear
whether getting of some property happens or this property is
being changed.

Also made it more clear whether affecting property belongs
to clip or mask datablock.

git-svn-id: https://svn.blender.org/svnroot/bf-blender/trunk/blender@48082 954f8c5b-7b00-dc11-b283-0030488c597c
copying a mask now copies its animation data too


git-svn-id: https://svn.blender.org/svnroot/bf-blender/trunk/blender@49276 954f8c5b-7b00-dc11-b283-0030488c597c
Scons: better fix for OSL compiler path, so it also works on OS X.



git-svn-id: https://svn.blender.org/svnroot/bf-blender/trunk/blender@52363 954f8c5b-7b00-dc11-b283-0030488c597c
osl style cleanup and update man-page.


git-svn-id: https://svn.blender.org/svnroot/bf-blender/trunk/blender@52759 954f8c5b-7b00-dc11-b283-0030488c597c
default to Python3.3 on Linux for SCons and CMake, warn when building with python 3.2x or older.

also remove casts to keep Python3.2 warning quiet.


git-svn-id: https://svn.blender.org/svnroot/bf-blender/trunk/blender@51906 954f8c5b-7b00-dc11-b283-0030488c597c
Fixed crash caused by recent feather collapse commit

git-svn-id: https://svn.blender.org/svnroot/bf-blender/trunk/blender@48982 954f8c5b-7b00-dc11-b283-0030488c597c
remove makeDerivedMesh from ED_mesh_pick_face(), this was added 44256 (bmesh merge), but is pretty bad (rebuilding entire derived mesh to pick a face), tested with subsurf modifier, sintel mesh - it works ok without it.
Also - other select modes like border-select dont do this, so looks safe to disable.


git-svn-id: https://svn.blender.org/svnroot/bf-blender/trunk/blender@50462 954f8c5b-7b00-dc11-b283-0030488c597c
Separate uv selection operator: Y key, behaves much the same way as the mesh separate tool works.


git-svn-id: https://svn.blender.org/svnroot/bf-blender/trunk/blender@49745 954f8c5b-7b00-dc11-b283-0030488c597c
despeckle composite node


git-svn-id: https://svn.blender.org/svnroot/bf-blender/trunk/blender@50141 954f8c5b-7b00-dc11-b283-0030488c597c
Changed to make master/slave a checkbox in packageinstance form RE: #6
Merge branch 'master' of github.com:nicholasdavidson/pybit
Do not gen beaninfo on Tea as it creates circular dependency on toolbox and beandoc context
Added the content manually to the top
Local change
Merge branch 'master' of https://github.com/niluka/databaseUtility.git
Data improved to include null
healthcheck fixes
reorder operations so that we hang waiting for a network connection at first
Minor change

Fixed holdover from testing where the filepath was replaced with the
total size.
Added some site information
shoot them!

but be careful because you can die now
start of point light
Changing app background
marker fix
fix to routing
url fix
Merge branch 'section_9_4' into section_9_5
Merge branch 'section_9_5' into section_9_6
Merge branch 'section_9_6' into section_9_7
gMerge branch 'section_9_7' into section_9_8
Merge branch 'section_9_8' into section_10_1

Conflicts:
	app/assets/javascripts/backbone/templates/tripViewTemplate.mustache
routes change
Merge branch 'section_10_1' into section_10_2
Merge branch 'section_10_2' into section_10_3
Merge branch 'section_10_3' into section_10_4
Merge branch 'section_10_4' into section_10_5
Improved cmdline
Changed the version to 0.1.
Modified some of the method names to make better sense.
Fixed tag conflict with edit profile
GTNPORTAL-2647: Support loadAllPages for new page service
Add form for editing mobile number.
Add Repository.Version static property

This property returns a string containing the LibGit2Sharp version number, the commit hash it's been built against (if available), the libgit2 commit hash and the processor architecture.
removed hole iterations
add static pages controller
added a static pages controller
about page and tests
finish static pages
Site updated at 2012-09-21 08:20:07 UTC
Try to get stunnel to cleanup better
- Added all initial files.
Merge branch 'master' of https://github.com/offox/audio-controller.git
add a script which will send a simple request to the website
neu post
More UI Tweaks
something
Merge remote-tracking branch 'origin'
Disable Back button on results screen.
Correct mingw-w64 4.6.3 to use latest stable release
Add representation for Text Symbol
Add Label representation
Add LabelInfo representation
Move Label and Font classes to their own different package
Add renderer representations
SUITE-1111: fix duplicate name in folders list
broadband-modem-qmi: treat as fatal internal protocol errors when checking PIN status
fixup! broadband-modem-qmi: treat as fatal internal protocol errors when checking PIN status
gsm: ensure PDU mode is set before falling back to PDU mode SMS
Update notes for submitted changes

* convert from connection_type to compute_driver
Available suborganizations kinds
Поля для услуг
searcher for sports
style for nested sport_services
вывели спорт в публичке
fix sport decorator & add styles for it
smart fix style
move hyphenate to helpers, styles for organization schedule
теперь поиск по тегам исползует AND вместо OR
making ghostie bigger in tree level
formatting schedule admin form
Update
Compiled
Añadidos valles de hecho y anso, y enlaces
Added beginning of scraper script, lifted shamelessly from Reddit.
Tercer Commit
adasadsadsads
Toggling A Boolean Property
Began significant work on the layout and style
remote old pastry theme
added brute force module
Removing CSV constraint on data import (thanks M$)
Fix more en and em dashes and spacing
Merge branch 'master' of github-pattern:pattern/verdant-refuge

Conflicts:
	content/writing/2012/toastman-tomato-firmware/index.html
Remove SQLite dependency and use Postgres in dev
Switch database config to postgres
corrected typo in prod
Changed procfile
hopefully resolved hosting problem
Corrected hosting problem?
Merge branch 'master' of github.com:paulollivier/cassandre into devel
moar surrounding buildings
fixed bugs created from adding filepicker
URL 2
assets compiled for mesotherapy
adicionado teste 1
Creating Source Code
Move notifications about login failures below the login button
Merge branch 'devel' of github.com:pemistahl/bugex-online into devel
Got rid of recording stuff, fullscreen canvas
Added overlays, simulated behaviour.
Check for empty keywords moved to implementation of get_products_conditions_for

Fixes #1846
Updating a prototype should allow to empty its properties.

Fixes #1859
Cut whitespaces

Conflicts:
	README.md
Refactor Spree::Product#master_images

By delegating #images to master variant, we could avoid the expensive
JOIN of :has_many association
Minor tweak for README
Set content_type during an API request

Fixes #1866
Relax dependency on the jquery-rails gem to allow for latest versions

Conflicts:

	core/spree_core.gemspec
Cut trailing spaces
Refactor Admin::ImageController
Introduce Spree::Product#delete that set deleted_at value instead of
deleting the object
Refactor Spree::Product
Refactoring state_text method
  eliminate nested ternary
  makes it nice and easy to read

[Fixes #1875]
Adding missing GA trackTrans call

[Fixes #1809]

Conflicts:
	core/app/views/spree/shared/_google_analytics.html.erb
Fix for inaccurate shipment confirmation email.

Use Shipment#manifest instead of Shipment#line_items in shipment confirmation email for better representation of what was shipped

[Fixes #1867]

Conflicts:
	core/app/views/spree/shipment_mailer/shipped_email.text.erb
Change details query so events without participants are selected as well
Update infoWindow contents: details + participants
Added more readable selection color.
more docstrings added
Edits
post update text
Site updated at 2012-10-09 04:55:28 UTC
Fix 404 for stylesheet. Update font
purple.
[maven-release-plugin] prepare release portal-3.2.1
[maven-release-plugin] prepare for next development iteration
updated notification date for papers
fixed typo for Prof. Leonard Bolc
Equality matcher for UIEdgeInsets
Removing unnecessary files/Cleanup
Renamed HongKongVilla project filename due to typo.
temporary addition of JASA-EL submission
Updated to 3.5.91
Add plonetheme.classic to checkouts.cfg
Don't assume SearchableText is in the url
updating login folder
-Implemented one full session.
-Added more tests to the suite.
ele is not a function fixed
Added some boring code
Kommentare zu fieldGenerator, field und fieldContent hinzugefuegt sowie Dummy-Klassen als solche markiert
slower bomb animation, adaptation of the explosion velocity, some old gfx removed
Spiel beendet beim Ausgang; Feld-Klasse angepasst und somit Begehbarkeit der Felder korrigiert.
direct influence of the bomb radius
all directions...
Ordner gelöscht
Ornder gelöscht
Hoffe, euch gefällt das Menu so, machs morgen fertig =)
Merge branch 'master' of github.com:/propra12-orga/gruppe45
Bombe aufgeraeumt und in eigene Klasse verfrachtet. Mauerfeld angelegt.
Kompilujaca sie i bez bledow ortograficznych dokumentacja ;)
Site updated at 2012-11-03 23:32:05 +0800
Site updated at 2012-10-15 11:04:48 +0800
cleanup & implemented resizing!
taking away header from portal
Merge remote-tracking branch 'upstream/master'
1st FT case for Commander has passed now.
Add test of CircularQueue
Add test of CircularQueue
Make backlog button a little prettier.
added post, lets see if it works
2
zadergka + начало AuthentificationFrm.dfm + UsersFrm.dfm

Signed-off-by: qwert11 <qwert11_@mail.ru>
добавлены иконки и проверка DrawCellColumn для Insert
добавить еще для Edit

Signed-off-by: qwert11 <qwert11_@mail.ru>
last dom

Signed-off-by: qwert11 <qwert11_@mail.ru>
добавил ....

Signed-off-by: qwert11 <qwert11_@mail.ru>
последнее на работе

Signed-off-by: qwert11 <qwert11_@mail.ru>
Updates to Nessus analyser to account for v5
Update 2012_11_04_Bacon_Tutorial_I.md
added site.....
Imported Jekyll Bootstrap
Creating player constructor, spawing in center of screen.
modificacoes layout :d
Added setFeature method to SimpleClassifier
Untested StrongClassifier and Trainer classes

It will be a miracle if they work. Trainier in particular is hacked
together with bone, sinew, and blood.
Added jboss-rmi-1.0-api dep, changed jboss-metadata fiel locations, patches AS7 to work with latest jboss-remoting-jmx
fix-broken-build
Range fix + some other fix
add new image 3 in 1 for catalog products
adding python-swiftclient dep for account-server
Fixing issue with swift-proxy not starting when integrated with keystone
Having to add release specific platform attributes for ubuntu
Forgot to modify all occurences of platform options
Merge pull request #63 from galstrom21/master

[BUG] Fixing keystone integration issues for Folsom
Improving Registration texts

Made "verification" field more clear. Fixes #19.
Fixing Typo

Corrected the typo in the homepage. Fixes #18.
Addressing #14: Errors in forms

Added and tweaked validation to avoid 500 error pages. Fixes #14.
Adding pagination to Profile page.
Merge pull request #25 from rdohms/november-fixes

November fixes
Added default transition. Fixed Appcache

Added default page transition (slide) and fixed numerous typos in the app cache.
Disable install checks for development
Update trunk to version 2.5.6 to prepare for next release
Test for SQL error security issue
Update phpunit.php for debugging system tests
Add update xml files to build folder
Update files for 2.5.5
Update changelog files
[#28554] Mark JXMLElement as deprecated and don't use it in type hinting
[#28650] Use legacy aliases for the MVC in the site
# [#28025] Joomla Bugfix: Exchange of wrong picture by hide.js fixed.
Thanks Udo
 ^ [#28645] Clean up the session package based on what was done in the
platform. Thanks Rouven
Correct strangely inserted UNICODE characters

Apparently a Mac vs. Dos problem
adde description
changed tests folders structure
changed tests folders structure
removed unused property
Adds ability to create events on Google calendar
AlarmActivation: Cleaned code for real and changed so stopalarm is called from layout instead of initGUI
HPCC-8049 Add Rename Physical to transactions

Signed-off-by: Renato Golin <rengolin@hpccsystems.com>
HPCC-3154 Improve XmlSchema availability options through WsWorkunits

Makes XML Schema optionally available from WUInfo and suppressisble
from WUResult.

Signed-off-by: Anthony Fishbeck <Anthony.Fishbeck@lexisnexis.com>
Merge pull request #3512 from afishbeck/wu_xmlschema3154

HPCC-3154 Improve XmlSchema availability options through WsWorkunits

Reviewed-By: Gordon Smith <gordon.smith@lexisnexis.com>
Reviewed-By: Richard Chapman <rchapman@hpccsystems.com>
HPCC-8051 Fix warnings caused by implicit cast in jdebug.hpp

jdebug.hpp is causing warnings throughout the windows build.
Doing the cast explicitly fixes the warning.

Signed-off-by: Anthony Fishbeck <Anthony.Fishbeck@lexisnexis.com>
Merge pull request #3514 from afishbeck/jdebugcast8051

HPCC-8051 Fix warnings caused by implicit cast in jdebug.hpp

Reviewed-By: Richard Chapman <rchapman@hpccsystems.com>
HPCC-7930 Rename ecl-package to ecl-packagemap

Signed-off-by: Stuart Ort <stuart.ort@lexisnexis.com>

Conflicts:

	ecl/ecl-package/ecl-package.cpp
HPCC-7930 Rename ecl-package to ecl-packagemap

Fix usage for copyFiles as suggested in code review

Signed-off-by: Stuart Ort <stuart.ort@lexisnexis.com>
Merge branch 'eclpackage-rename' into candidate-3.10.x

Signed-off-by: Richard Chapman <rchapman@hpccsystems.com>
Site updated at 2012-11-21 00:57:44 UTC
added rider sessions
change index to compiled code
Updated to allow using maven war plugin.
mark an important todo
introduce type shortcut
This is Rev2 of the board.

Just sent to the fab house.
Updating our Twitter clients to use the REST API 1.1
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
BZ883948
Merge remote-tracking branch 'upstream/master'
ews2 and bugs
remove ews2 tests
Merge remote-tracking branch 'upstream/master'
BZ876937 - Return "FAILED" if trying to stop openshift-console which is already stopped
BZ876939 - Return "FAILED" if trying to stop openshift-port-proxy which is already stopped
Merge remote-tracking branch 'upstream/master'
Merge pull request #1041 from brenton/init-scripts2

Merged by openshift-bot
fix for bug 883607
Merge pull request #1016 from rmillner/BZ878575

Merged by openshift-bot
remove tito rel-eng entry for ews2 until we fix the repo issue
Merge pull request #1043 from abhgupta/abhgupta-dev

Merged by openshift-bot
US3025: Retrieve cartridge info with app
bug fix
Adding oo-accept-systems script for verifying all node hosts from the broker.
- also verifies cartridge consistency and checks for stale cartridge cache.
oo-accept-node sanity checks public_ip and public_hostname.
Minor edits to make node.conf easier to understand.
Fix for Bug 885177

Update app_helper to track Jenkins server information
=downloads folder
Cloud 9 Test 2
added aliases for sublime text
changed the alias to use to cli provided by sublime text
Merge pull request #1079 from dylnhdsn/feature/sublime_text_plugin

added aliases for sublime text
Going with Foundation Framework to allow easy mobile layout
Fixing some errors in README.
Added a tiny bit of help system
First commit of activity manager
Fixed spacing in Engine.h
versão inicial do respositorio de aulas já com pdfs das duas primeiras aulas
supports /fade/ff0000 as well as /fade/red
animation play bugfix
Fixed olark rendering bug
added maven dependency (logback)
working on event aggregator design
changed event aggregator, renamed event stuff
Merge branch 'master' of github.com:rusty-gr/Reality-Shard
can you say rewrite?
wasnt pulling in vendored stuff
Added social service, mostly stubbed but first method is figured out
 WIP for comment/newsfeed/user/socialservice
Polished up unit tests, and the cross cutting features for visibility of newsfeeds due to privacy settings
Added social service, mostly stubbed but first method is figured out
Fixed the isVisibleTo logic to properly return False instead of null
Built some methods of the social service layer with privacy features
PSD

This is PSD ya man
take this and go ahead
added TODO
Merge branch 'master' of github.com:samcday/samcday.com.au
Fixed idea model create
Merge branch 'master' of github.com:sameenjalal/GitCooking
new install.sh
Site updated at 2012-12-29 01:09:05 UTC
[maven-release-plugin] prepare release bamboo-sauceondemand-plugin-1.6.13
#346324 documentation
ayaya
初步UI,周三完工，涉及一些button+界面
Project set up and three basic views added.

Signed-off-by: TrineStudio <godblessedmay@gmail.com>
Merge branch 'C#' of github.com:sbhhbs/DBDesign-Tongji into C#
All UI Completed!

Signed-off-by: TrineStudio <godblessedmay@gmail.com>
Bug fixed

Signed-off-by: TrineStudio <godblessedmay@gmail.com>
you can drag
add return button,doubleBuffered
doublebuffered ,still have bug

Signed-off-by: wangyuhan <291283060@qq.com>
Program rewritten and bugs fixed

Signed-off-by: TrineStudio <godblessedmay@gmail.com>
All Points Calculated!

Signed-off-by: TrineStudio <godblessedmay@gmail.com>
Cursor changes when move to station. Bugs needs to be fixed!

Signed-off-by: TrineStudio <godblessedmay@gmail.com>
Merge pull request #5 from sbhhbs/C#

C#
Add release checklist.
Adds rvmrc to automate guard and solr
Removes bullets from facet list
fixes #8, better looking error page
Making an index.
Created basic user mode (with secure passwords)
Updated the permissions on ssh-completion.sh.
Styling a bit
merge commits from heroku
Convert Sytles to CSS
 moving all styling to include/main.css to allow for theaming
fixed link to jquwery
Added USB module install support.

	* modules install to /www/pineapple/modules/ which is symlinked to /usb/modules
	* the *only* thing module writers have to edit in current modules is to not use absolute paths in links seeing as the module could be in one of two locations
Converted even more stuff to CSS
added a ton of white space to ease editing of php
more CSS conversions
and added ability to change CSS presistanly by adding ?css=<style> to any page
ignore dreamweaver files and my css(for now)
upgrade to verion 2.0.0
Merge pull request #19 from GzFighter/master

Convert styles to CSS & add USB module support
make a few dinky text and style changes
"Properly" set default values

This should work in most Rubies from what I have found
Merge pull request #2 from mrardon/bugfix-testing-reserved-instances

"Properly" set default values
Cleaned Things up

Renamed trinagle.fx to BasicShape.fx because it will be used for other
shapes than just triangle (one fx can be multi-purpose)

created a partial class Form1_part2 to help clean up the main form

created BasicShape.cs to be the host for creating different basic shapes
such as cubes, cylinders, circles, and etc.

Created triangle class which is based off basic shape class. this class,
as its name implies, creates a 2 dimensional triangle on the screen (to
be changed to 3d soon enough)

In the form1.designer.cs i added another menu label with three options.
only the triangle option works at the moment.
changed a few defaults
maven-compiler-pluginのバージョン指定
scalaでテスト出来るようにpomを書き換え
テストクラスを追加
Updated .gitignore to ignore all xcode user data changes.
Update to handle sharing from Wiktionary to Wiktionary
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Format README.md to make it pretty (no content changes)
Merge pull request #203 from piotrowski/master

Format README.md to make it pretty
Translation updates from translatewiki.net
fixed Forwards button being permanently disabled
Syntax error in attribution-osm message
Merge pull request #204 from 1ec5/patch-1

Syntax error in attribution-osm message
Merge pull request #29 from hy-cheng/master

fixed "Forwards" button being permanently disabled
Removing trailing whitespace in audiolinks-close
Changing logo and icon

This is the version voted upon by the team and spruced-up by heatherw.
Merge pull request #30 from sheac/chglogo

Changing logo and icon
Removing unused strings, fixing typo
Localisation updates from http://translatewiki.net.
Merge branch 'master' of github.com:wikimedia/WiktionaryMobile
Localisation updates from http://translatewiki.net.
Removing unused translation string
Merge branch 'master' of github.com:wikimedia/WiktionaryMobile
Merge branch 'master' of git://github.com/wikimedia/WikipediaMobile

Conflicts:
	README.md
	assets/www/messages/messages-de.properties
	assets/www/messages/messages-en.properties
	assets/www/messages/messages-es.properties
	assets/www/messages/messages-fi.properties
	assets/www/messages/messages-gu.properties
	assets/www/messages/messages-hsb.properties
	assets/www/messages/messages-mk.properties
	assets/www/messages/messages-nl.properties
	assets/www/messages/messages-qqq.properties
	assets/www/messages/messages-ru.properties
	assets/www/messages/messages-ta.properties
addedsprites
Update Final-Eclispe-Project/AddressBook/src/gui/AddContactWindow.java
Commit changes aan admin
Merge branch 'master' of https://github.com/silas-h/themaopdracht5
Fine-Uploader modified for sending a request to multiple endpoints and receive the responses, calling the onComplete callback for each one.
Remove green reflection
Remove yellow reflection
Add category and tags to yesterdays post.
Quick post on getting Vim with Ruby on Lion.
Removing Rails adherence by making root_path configurable
Bumping version to 0.2.0
Updating scope from this (not sure what i was thinking) to variables (the better way of doing it)
Updates to index
Resolved conflict in index template
PMEyeSim no longer needs to inherit
Initial commit of server
make setup require nose for nosetests
SIO-1126 Major executing refactoring: introducing Executors

Change-Id: Ib755431fa6185fccaa614c73073d866500dfe2fa
(no-ticket) Limiting compiler output.

Change-Id: I2208c550eaabb3af0ca7209527c85c414d67345f
(no-ticket) Extend compiler tests coverage over nasty files.

Change-Id: I72cdc0e0089ea892b51134909b2e6c6d888c143e
(no-ticket) Repair .gitignore-s

Change-Id: Id3891081df581dae80737aa83a4f736574bedfaa
SIO-1141 Fix bug in checking if sandbox is up to date.

Int was compared with string.

Change-Id: I73796d02de28919d23579f694c354be7a7799811
Force sandboxed binaries to use included ld.so if present

It's combined commit:
Szymon Acedanski: base commit
https://github.com/accek/sioworkers/commit/bba44723e978340ab33d7cacc23ab616b38bd919

Maciej Matraszek's change to this commit:
Add blacklist to elf_loader and make sandbox exception safe.

Change-Id: Ib88e3cd0548a35753e43ab1f37567a0fcbe87dd3
Bugfix
Settings.properties
Úloha spracovaná :)

Nevedel som či treba spracovať len prevedenie tej
spokojnost/nespokojnost alebo celkovo spracovať panel "Návštevy" podla
návrhu tak som to tak pripravil. Všetko responsive funkčné v panely,
opravené aj iné chyby v tomto panely.
Quick commit to provide for admin adhoc queries.
[maven-release-plugin] prepare release smartfox-tools-0.9
change default watchdog timeout to 8s
แก้ไข
Merge branch 'master' of https://github.com/smtacampus/Campus_Smta.git
แก้ไข
แก้ไข
สร้าง ฟอร์ม
deleted
add
Merge branch 'master' of https://github.com/smtacampus/Campus_Smta.git
Remove silent-postgres - we don't need this anymore.
Fix locale bug when using activeadmin with devise.
Add dashboard to show colaborations and recent ideas.
Fix hash['user_info'] (not it's only 'info') in tests and Add new Factory Girl world methods.
Fix deprecation warning when using the old f.buttons (now it's f.actions)
Fix FactoryGirl syntax in tests and the little service auth that was failing before.
updated partners
added html5 ie script
added some widgets to sidebar and made some alterations asked by the client
Added logout test
Added user scenarios for exporting datas
Added page scenarios for exporting datas
Added export tests for categories
Added export tests for comments admin
Added scenarios for editing and deleting comment in the backend
Added export tests for posts in the backend
Added export tests for tags in the backend
fixed a typo error in the logout test
Fixed a typo error in post admin tests
Added export tests for galleries admin
Restored test for adding medias with errors
Added export tests for medias in admin
Added tests for editing and deleting medias
Merge pull request #33 from Taluu/pr-add-features

Several test scenarios corrected and added
初步完成更新功能
refactor Pipeline process:
- move towards initializing stages during the Pipeline#initialize
- rewrite Pipeline#for:
  - break into more composable steps:
    - `monitor_message_state`
    - `propagate_or_halt`
    - enumerate a well-defined set of expected states for a message at this point
      - inform at different severities for each
    - only propagate the message to the next phase if it is in a non-halting state:
      - created
      - any other undefined state
    - RAISE ALL EXCEPTIONS
      - exceptions are no longer used for control flow between stages
    - a pipeline itself will now never mutate a message. this is entirely up to stages
NR-243 : Media Archive - query functionality
Merge branch 'devel' of dev.sourcefabric.org:rest_api into devel
NR-226: Create login functionality in Ally framework

Changed from AuthModel to Model
Merge branch 'gizmo' of dev.sourcefabric.org:rest_api into gizmo

Conflicts:
	superdesk/plugins/livedesk/gui-resources/scripts/js/edit-live-blogs.js
	superdesk/plugins/livedesk/gui-resources/scripts/js/models/post.js
	superdesk/plugins/livedesk/gui-resources/scripts/js/providers/colabs.js
removed invalid egg info files
Merge branch 'devel' of dev.sourcefabric.org:rest_api into devel
Hashfunktion überarbeitet. Input über konsole.
My full name
Git apps & WPF tutorial
Fix commandArgs reversion in service test.
自动根据jdbc medadata得出Hibernate Dialect，不再需要手工配置Dialect
#90 改进date-time演示
Added Tag.unique_hash.
Added display_name to the models and some formatting.
Stubbed in a new all so that it's grouped by hash. This will likely break other usages.
Remove display_name.
Lowercase all tags on output.
Tune gitignore
Requirements
summary includes property info using templates
Added right click menus.
Move generator_input to unused/.

Now that I got rid of the generator_type2 from power (as it is unused
by our map) I can also get rid of this, as generator_type2 and Antiqua
are the only consumers.
Move heat_exchanger to unused/.

It's just plain not used.
Move heat_source to heat_reservoir and out.

I'm not really convinced that we should even have this; the only
consumer is a WIP object (which, alas, is actually in the map), so
this is something worth investigating to remove.  For now, move it
to its proper location.
Move outlet_injector out.
Move oxygen_generator out to unused/.

The only place it is referenced is in FEA debug code; that call is
now commented out, in case we want to refer to it before we totally
scrap atmos.  (Probably not, but you never know.)
Added address field requirement option.
adding spriting
Merge branch 'master' of github.com:stephenrouse/stylelist
Adding sprites
responsive stylesheet partial
Merge branch 'master' of github.com:stephenrouse/stylelist
Merge branch 'master' of github.com:stephenrouse/stylelist
Merge branch 'master' of github.com:stephenrouse/stylelist
Merge branch 'master' of github.com:stephenrouse/stylelist
Merge branch 'master' of github.com:stephenrouse/stylelist
Merge branch 'master' of github.com:stephenrouse/stylelist
changing structure
changing structure
Fixed encoding issue in powershell
Adjusted db.yml to my setup
temp
added user privileges feature | started validations
Validations Done, Need to add twitter bootstrap
Validations Done; Twitter BootStrap Integration Done except for attendances and Home; Date picker is working! Need to alter controller to adapt;
Removed Rdoc
Possibly finished CertificationsWindow.js
initial push dt-checkbox-select
temp
Merge branch 'master' of github.com:studentkittens/flascat
Updated quite a lot
put into table, removed erroneous links
Merge branch 'yamas-niyamas-show'
add classifiers for Python 2.6-3.2
SYS-fix-35a8.5: Fixed error with adding extra resources to planets and unability to turn vacancy mode on
更新提示方式，增加y轴多数据处理
CSS: fix increased total width of main-menu caused it to drop to next line, and float containment.
Split db_config into 2 files. Added scripts for reloading database only & first time setup.
Templating and CSS (bugid:45362)

git-svn-id: https://svn.wikia-code.com/wikia/trunk@59415 e846bd91-c042-42a7-a218-4b65e2c1904d
Changed so notification workers dont user discovery. They only use res registry to find users. Good since they dont do searches and only do immediate notifications
Fixed upload tab authentication issue on prod.
Merge branch 'master' of http://github.com/sxux/recruit-satellite.git
Fix convert contact
[HttpFoundation] disabled Request _method feature by default (should now be explicitely enabled via a call to enableHttpMethodOverride())
rewrite of Identical.js to support nested objects
add some test
use "item.constructor.name" by default to get constructorId
more tests
default subConstructor if none is provided
correct bug that was modifying the values to compare
new tests and corrections
use "sk/utils/create" instead of "dojo/_base/declare"