labofsahil/github-event-dataset-2012 huggingface dataset:
Added the notes String
added notes to the lunchlist.java
Added the menu
added support for the options menu
Added show notes as a toast part
added scrollview (finished APT 7)
Updated to Stream Form
Adding options for the charset and no. of characters choices.
Win32 is ASCII mode.
Adding a character array for the alnumspl case.
Fixing the bug with bit shifting being done in 32-bit space rather than 64-bit
space.
iasecc: remove unused code

Change-Id: Ife040ac9fa23d893b12aaa0b2c2756089a2b119b
Version 1.6.32

Add option to avoid auto-filling of the first match. Thanks to drougas (at cs dot ucr dot edu).
No need for themr settings
- possibility to change text in the blocking dialog
[UI-Actions] Fixed dispose of drop down menu in SimpleContributionItem

Signed-off-by: Stephan Wahlbrink <sw@wahlbrink.eu>
[UI-Util] Improved AutoCheck
  - Added check for mouse button
  - Added handler for select all

Signed-off-by: Stephan Wahlbrink <sw@wahlbrink.eu>
[UI-MPBV] Improved focus handling for browser pages with additional header

Signed-off-by: Stephan Wahlbrink <sw@wahlbrink.eu>
[UI-Util] Let ImageDescriptorRegistry implement IDisposable

Signed-off-by: Stephan Wahlbrink <sw@wahlbrink.eu>
[*] Updated declarations for ECommons-UI-1.2.2

Signed-off-by: Stephan Wahlbrink <sw@wahlbrink.eu>
get the templates in the right place
Iexplorer Debugging
including Dispatch Parameter
Iexplorer 8 debugging
Iexplorer 8 debugging
Last Changes and hint
Code comments and optimization
Code comments and optimization
Inluding Symbols and Cliparts
Inluding Symbols and Cliparts
Last changes
Last bugfixes
Last bugfixes
Last bugfixes
改utf8
wrong
create
update to 0.9.3 no build
added readme to nuget build
[maven-release-plugin] prepare release webjars-locator-0.1
small step (2)
Tweak to holding text
Added logcats
Update RHBZ4 patch (fix _getbugfields and use of tabs)

This is reported to fix various backtraces involving _getbugfields.

It also removes some tab characters that were introduced previously,
which may have caused TabError backtraces.
Inportante Core Bundle created for site functions
contains changes from ghe3

this version presents duplicate homework and classlist editors as well
as the PGProblem editor
added maketext commands to Stat.pm
Merge commit 'e3e87c56e4c253d4fa6044f243018be7e54be07f'
Merge branch 'many-editors'
adding library browser 3 back in
make sure hidden_user, etc. are available

CGI requires named variables in this case
updating math2 and math3   css and templates (fixes minor bugs including one where tabs didn't appear in hmwrk editor 2
update message in Constants.pm about themese
omit absolute positioning in login info
`
Merge remote-tracking branch 'origin/master'
Added Shibboleth authentication module
added quotes to mysql defaults file field in case of special characters
are used in db username and password
Merge pull request #2 from xcompass/master

Shibboleth Authentication module and a bug fix for archiving
Merge pull request #2 from xcompass/master

Shibboleth Authentication module and a bug fix for archiving
Merge remote-tracking branch 'ow_webwork2/master'
Merge remote-tracking branch 'ow_webwork2/master'
Regularize the warning system.

Channels for warning_messages for debug_messages and for internal_debug_messages were
established.

There are two older  channels  "warnings"  and "errors"   that are still
defined in the $pg object.  "errors" is  related to translator errors.
Regularize the warning system.

Channels for warning_messages for debug_messages and for internal_debug_messages were
established.

There are two older  channels  "warnings"  and "errors"   that are still
defined in the $pg object.  "errors" is  related to translator errors.
moved warning message channels so that they are now toplevel and not under the flags hash
Adding changes to the .css files
Add dragupload as core default plugin
Support yuv422p for FFmpeg lagarith decoder.

git-svn-id: svn://git.mplayerhq.hu/mplayer/trunk@35115 b3059339-0415-0410-9bf9-f77b7e298cf2
Fix compilation with latest FFmpeg.

git-svn-id: svn://git.mplayerhq.hu/mplayer/trunk@35116 b3059339-0415-0410-9bf9-f77b7e298cf2
When switching programs select subtitle stream regardless of
whether the format is text, ASS, bitmap or whatever.

There probably was some good reason for the condition but
it got lost in time and special-casing CODEC_ID_TEXT over other
test-based subtitles doesn't seem to make much sense.


git-svn-id: svn://git.mplayerhq.hu/mplayer/trunk@35117 b3059339-0415-0410-9bf9-f77b7e298cf2
Support subrip format subtitles.

Patch by Philip Langdale [philipl overt org].


git-svn-id: svn://git.mplayerhq.hu/mplayer/trunk@35118 b3059339-0415-0410-9bf9-f77b7e298cf2
Avoid sleeping 0 ms, this can cause sleep to be not called at all.

This will then cause long hangs e.g. when sleeping on single-CPU/core computers.
Should fix bug #2084.
Patch suggested by Visenri [visenri yahoo es]


git-svn-id: svn://git.mplayerhq.hu/mplayer/trunk@35119 b3059339-0415-0410-9bf9-f77b7e298cf2
Add missing newline in error message.

git-svn-id: svn://git.mplayerhq.hu/mplayer/trunk@35120 b3059339-0415-0410-9bf9-f77b7e298cf2
add geoh264 binary codec, works on sample

git-svn-id: svn://git.mplayerhq.hu/mplayer/trunk@35121 b3059339-0415-0410-9bf9-f77b7e298cf2
Support closed-caption format as used in wtv format.

Needs an FFmpeg fix so it marks them as CC instead of
teletext.


git-svn-id: svn://git.mplayerhq.hu/mplayer/trunk@35122 b3059339-0415-0410-9bf9-f77b7e298cf2
Add new -subcc values.

This makes it possible to specify that we should try
to extract a EIA-608 compatibility stream instead of
assuming the whole stream is EIA-608.


git-svn-id: svn://git.mplayerhq.hu/mplayer/trunk@35123 b3059339-0415-0410-9bf9-f77b7e298cf2
Pass extradata to libavcodec subtitle decoder.


git-svn-id: svn://git.mplayerhq.hu/mplayer/trunk@35124 b3059339-0415-0410-9bf9-f77b7e298cf2
Clamp bitmap subtitles into visible areas.

This avoids subtitles disappearing completely if we detect the
original resolution the subtitles were created for incorrectly.


git-svn-id: svn://git.mplayerhq.hu/mplayer/trunk@35125 b3059339-0415-0410-9bf9-f77b7e298cf2
100pts cdp/ex2
all schema tests are table-driven now, started alarm tests
Now with AS3 Sample Petstore and its test suite
Added Query and book support on prototype (has not been tested)
Added DepartureDate on Ticket class
Deployment settings
More deployment changes
added [MinimumPerl] plugin to dist.ini to detect the minimum version of Perl needed
Changed FetchLogTask to ProcessorInfoTask, so it may return more general information about a processor
Slightly better test - split load across 3 keys
Possibly the worst admin interface ever, but a start
Added a basic stats library... not extremely tested, oh well
Slight benchmark refactor; added pika; simplified LoopingTask to be more intuitive to set up
More stats work and basic monitoring work
Added basic processor stats
Stats fixes
Fixed up stats once again
Less busy waiting for processor
Fixed up batch and interval tasks to get new task ID before executing; simplifies code and is more robust
Improving task signature - limit to 1% statistic collision
Work towards stats dashboard
Improved stats - schema bundled in.  Dashboard can click task link.
Fix for legacy stats
If inserting a batch task fails, retry
A few stats improvements; cleanup
added req.ip
adfsadf
asdfsadf
parse cell start
Big clean-up of code, especially #include directives in headers
Added new file Constants.h
parse metadate
Merge pull request #1 from pepijndevos/master

parse stuff
Update README.md

Fixed example.config section
Added an SQLite-Based backup utility
change guidance date
yesod-form 1.2
Merge branch 'postgres' into mysql
Removed some mouse combos; Updated .bashrc
update wordpress to tag 3.5
updated default theme matching wordpress 3.5
Added simple Sinus Graph, Circle and disk with moving colors inside! (8th year)
added more details about the project
la plus nouvelle version
2724 snoop contains few problems with accessing uninitialized data
Reviewed by: Darren Reed <darrenr@fastmail.net>
Reviewed by: Garrett D'Amore <garrett@damore.org>
Approved by: Gordon Ross <gwr@nexenta.com>
1799 ipadm create-addr arg validation crash
Reviewed by: Jason King <jason.brian.king@gmail.com>
Reviewed by: Dan McDonald <danmcd@nexenta.com>
Approved by: Richard Lowe <richlowe@richlowe.net>
2741 format shouldn't allow write SMI label to disk with EFI partition
Reviewed by: Garrett D'Amore <garrett@damore.org>
Reviewed by: Milan Jurik <milan.jurik@xylab.cz>
Reviewed by: Steve Gonczi <gonczi@comcast.net>
Reviewed by: Gary Mills <gary_mills@fastmail.fm>
Approved by: Albert Lee <trisk@nexenta.com>
2882 implement libzfs_core
2883 changing "canmount" property to "on" should not always remount dataset
2900 "zfs snapshot" should be able to create multiple, arbitrary snapshots at once
Reviewed by: George Wilson <george.wilson@delphix.com>
Reviewed by: Chris Siden <christopher.siden@delphix.com>
Reviewed by: Garrett D'Amore <garrett@damore.org>
Reviewed by: Bill Pijewski <wdp@joyent.com>
Reviewed by: Dan Kruchinin <dan.kruchinin@gmail.com>
Approved by: Eric Schrock <Eric.Schrock@delphix.com>
1973 ctfconvert VLA support is broken (again) for DWARF objects
Reviewed by: Richard Lowe <richlowe@richlowe.net>
Reviewed by: Robert Mustacchi <rm@joyent.com>
Approved by: Gordon Ross <gwr@nexenta.com>
2942 CTF tools need to handle files which legitimately lack data
Reviewed by: Jason King <jason.brian.king@gmail.com>
Reviewed by: Keith Wesolowski <keith.wesolowski@joyent.com>
Reviewed by: Robert Mustacchi <rm@joyent.com>
Approved by: Gordon Ross <gwr@nexenta.com>
2941 need to protect __RESTRICT_KYWD from foolish compilers
Reviewed by: Adam Leventhal <ahl@delphix.com>
Reviewed by: Garrett D'Amore <garrett@damore.org>
Reviewed by: Jason King <jason.brian.king@gmail.com>
Reviewed by: Richard Elling <richard.elling@richardelling.com>
Approved by: Garrett D'Amore <garrett@damore.org>
change default tool
Die Entwicklungsarbeiten beginnen.
update lua unittest

Signed-off-by: yayanyang <yayanyang@gmail.com>
add MODE param,add attr to database setting
Worked on inception deck
Finished inception deck and user story rating and nuts.
Merge branch 'Curtis' of https://github.com/zmildon/Alaska_Landings into Curtis
The header looks slightly less retarded
No need to take liberties with the fellow drunkard
Any swipe should cancel the "seeking in progress".
Only handle swipe and tap events on the slide image view.
markdown syntax in vim
Moved readme file
Merge branch 'master' of github.com:zyxware/php-sample-apps

Merged Master Branch.
Higher resolution images for individual size parameters
[Autotools] Add missing log information

Display log-level and log-type parameter values

Signed-off-by: Ludovic Ferrandis <ludovic.ferrandis@intel.com>
[Autotools] Add --enable-never-quit option

Fix issue #23: https://github.com/01org/media-service-upnp/issues/23

Signed-off-by: Ludovic Ferrandis <ludovic.ferrandis@intel.com>
[Settings] Use new -enable-never-quit option

Use the define generated by this option as default value

Signed-off-by: Ludovic Ferrandis <ludovic.ferrandis@intel.com>
[Autotools] Generate settings file

Generate settings file from options defined in configure
command line.

never-quit = --enable-never-quit
log-level = --with-log-level
log-type = --with-log-type

So for the first launch, after a clean install, the settings
in the files are the same as the one defined at compile time.

Fix issue #22: https://github.com/01org/media-service-upnp/issues/22

Signed-off-by: Ludovic Ferrandis <ludovic.ferrandis@intel.com>
[Logging] Fix macro _NL

Don't print '\n', just <space> to avoid double empty line

Signed-off-by: Ludovic Ferrandis <ludovic.ferrandis@intel.com>
[Git] ignore media-service-upnp.conf file

Signed-off-by: Ludovic Ferrandis <ludovic.ferrandis@intel.com>
[Autotools] Use new configure options in bootstrap

Signed-off-by: Ludovic Ferrandis <ludovic.ferrandis@intel.com>
Update notes for submitted changes

* Add Ring Delay feature
bumping version
styling issues for things
form doesn't display like an idiot anymore
fixed spacing on event list page
fixed password change form to be clearer
Merge pull request #12 from haaksmash/hotfix/emergency-layout-fixes

Hotfix/emergency layout fixes
Add get-involved page
My 4th Push

Thisw this my forth pust to hit hub.
keep badge grey untill all services initialize
bamboo - signal updated if no plans selected
update locomotive
HAndle HEAD requests on /
Simplify sending static content
Serve static files head requests
Remove debug
conflicts
footer
personal info fixs
app layout links
Fixed routing bug

When local XIDs happened in addresses as sinks and passthroughs
(non-sinks), the XIP DST entries behaved correctly either for sinks,
or passthroughs depending on which happened first.
Added positive dependency for HIDs

The code was also adjusted for the latest changes to
the routing API.
resque scheduled twitter puller thing
ticket_9 fixing script
Now logging group info changes
Merge branch 'develop'
Lenke-slide
Updated copyright notice (MIT license)
german.lua: Updates by Nidra, matches english.lua
multiple fixes
- russian.lua: fix a few duplicates
- other files: add missing locales
ÄNDRAT ENLIGT NEDAN KOMMENTARER

script länken rad7: saknade http://
ändrat request på produktlänken rad19 (tagit bort div)
lagt till $("#prod").show();  (för alla produktdelar)
snyggat till koden
Cleaning up by ignoring local files
Removing local files from github
Merge remote-tracking branch 'origin/master'
HistoryToDBViewer v2.4
changes to opensaml cbh - end of day commit
post merge openSAML CBH
define munin before metacpan, fixes vhost setup
fix some ordering
add connect number
initial posts
fleshed out post
minor edits
Fixed Issue 2
added awesome_print gem
Merge branch 'develop' into chatbox
Changes feedback function to be global and removes it from the views
Adds some team management stuuf
Adding documentation
Moved language code into separate JSON files

and load them using requirejs
More documentation
Removed unused images
Renamed tests dir and added requirejs config just for tests in test/require.test.coffee
Fixed the location manager so that it quits when the app quits.
Barbaric tracking in place!
Ftp download of log files implemented
Remove weird folder
Cleaned the org.something files from settings
Merge branch 'master' of https://github.com/molgenis/molgenis_apps

Conflicts:
	.settings/org.eclipse.wst.common.component
	.settings/org.eclipse.wst.common.project.facet.core.xml
refactor overflows_line
extract the creation of a new word struct into a function
check if there is no phoneme data and bail before the main if statement, rather than do it in every branch
extract the rhyme checking code into a function
remove .pyc file from git
add some whitespace
Call word.lower() once at the start, rather than everywhere
* also, if we are lowercasing the word, no need to have the re match be case insensitive
use a couple of auxiliary variables for the regex and syllable length
invert the check for word in cmudict (saves us an indent level)
remove empty tokens using filter() rather than remove()
factor out some common code in phonemes()
invert the check for detecting the last syllable of a word, so we can exit early
Merge pull request #4 from martindemello/master

bunch of small refactorings
update 10/11/12
Include Foundation Walker properly
Utilize Drew Morris' foundation code instead
Added instructions for using as git submodule
test disabled EB
Add Ch32 Servlets
SockJSResource wooooo!
Merge pull request #1 from lvh/patch-1

SockJSResource wooooo!
Add resource tests. Allow passing of options to a resource
Support getPeer and getHost on wrappedProtocol.makeConnection
fixed static protocol under ssl

* Added sendDocument method
* sendDocument enforces content-length to be set
* Fixed header leaking in sendHeaders
Merge pull request #2 from ojii/master

Fixed static protocol on SSL
Remove arbitrary slash
Merge pull request #5 from Fugiman/master

Fixes #4
bump to 0.1.4, removed .parse and added preProcessor and postProcessor for model.sync
refactored the storage factory to occlude use of session and local storage in the same app
fix sha ending
fix typo in comments
Merge pull request #45 from schneems/schneems/typo

fix typo in comments
Update README.md

Use https for github urls
Merge pull request #46 from ctshryock/master

Use https in buildpack urls
ruby 2.0.0 doesn't need a build ruby
update changelog
Install libgd-dev headers into slug
Run rake extensions:build during compilation
ICU4C 49.1.2
Verbesserte Routenfunktion und Behebung korrelierender Fehler der Ortefunktion

Durch Umstrukturierung des Flag-Objekts verusachte Probleme beim Hinzufügen/Hervorheben/Verschieben von Orten wurde behoben. Außerdem können Routen nun hervorgehoben werden und werden sauber weggespeichert.
Neue Flags können nicht mehr beim Klick auf bestehendes Pin gesetzt werden
Adding jQuery 1.8.2 and jQueryUI 1.9.0
Rewrote comb(n,k)
Merge branch 'fast' of github.com:Drin/PyroprintSimulation into fast
GraphAlgs almost complete, no compile

It vomitted errors everywhere, so time to wade through all this
Working with Bamboo
Convert old Wiki to README.md
Added agent with fixed lights output.
The format for the lights is:
[[[x,y],color],[[x,y],color]]

Where color can be values from 0-3 or the words: red, green, orange, or
the characters: r, g, o
replacing \n with \r; updated psd; fixes #1
bux fix on route focusedMap
center button is now centering to Toulouse
NotORM debug log
2012.05.13.1405
1406
Updated the root module from seven20.
Open event map link in new tab
Update menu design to look like a sticker
seguro que va a haber conflict
file accept not escaped file path
book generated and deployed at 11/08/2012-13:35:06
operoi.php
a
usuwanie *.pyc
usuwanie *.pyc
usuwanie *.pyc
Print some more information when parsing JSON failed
Remove fork-throwing for diagonals; also, update notes on timer malfunction after new observations.
Added stronly typed model for Home page.
Ajout d'un nouveau fichier avec le vélo et le lion
Merge branch 'master' of github.com:FracArt/PFE_Green_Quizz3
Parse bind and unbind config options.
Parse all options configurable through poppler API.
Added notifications using libnotify + small cleanup
Fix: unrefernce NotifyNotification just in case
Version up to 1.1.0
Added button for quick disabling notifications
Version up to 1.1.1
Merge branch '#166' into #35
first pass at moving pupil generation routines to a separate function, tests pass
(#35)
added central obscuration support, using same input param definition as Gary in SBAiry
(#35)
passed obs support through to OpticalPSF class, after some testing decided to reduce default pad_factor a little too... There really is no need for pad_factor > 1.5 if the wavefront aberrations are ~< 1 in units of the incident wavelength
(#35)
added PAD_FACTOR to spline test to preserve previous behaviour after change to default pad_factor in OpticalPSF
(#35)
added unit test with obscuration, comparing to Gary's SBAiry.  Passes.
(#35)
update docstring for test
(#35)
updated docstrings for new central obscuration
(#35)
Merge branch 'master' into #35
removed obsolescent TODO
(#35)
removed obsolescent dx in OpticalPSF docstring
(#35)
changed obs to obscuration, and added a wquick check for obscuration >1 for good measure
(#35)
updated new obscuration in test_optics
(#35)
updated SBProfile SBAiry to match new obscuation usage (as per Rachel's suggestion)
(#35)
added new SBAiry obs > obscuration to base.py
(#35)
updated SBAiry wrapper in pysrc to use new obscuration kwarg
(#35)
fixed new obscuration usage in Airy calls within test_optics
(#35)
updated test_SBProfile to use new obscuration kwarg
(#35)
remove double 2.* and 0.5* in definition of npix
(#35)
fixed dumb npix setting bug
(#35)
Code using Daemon
game now updates status box

additionally:
* some significant updates to how JSON is generated and structued
* new 'gamestuff.py' file for meta-game and interface functions/methods
Operation create now does not have drop down list if unit specified - also returns to list for the unit specified
add post about embedded jre on beaglebone issue
message retention time cleaning now also working with multi-index storage. fixes #SERVER-139
cogl-1.12: recipes for the next cogl version
raspberrypi: updated meta-raspberrypi to current master
some methods in Particles interface has been renamed and decorated with @property.
Updated Helper.tt file

Updated with better comments and removed an obsolete method
updated gitignore

Exclude lib dlls
Added lib\readme.txt
Updated StringExtensions
Merge remote-tracking branch 'origin/master' into Glass-Mapper
small fixes php 5.2-
Added some more functionality no the home page.
avance de algoritmo en Digrafo
resolved thumbnail issue and TestURLs function
Added function def to visitor.
LayerViewer: Added a menu item for setting the viewer cache size.
Merge branch 'master' into tracking
added drawer for lightfieldgui
simple operations on lightfield now functional
added test-project for faster debugging
DC12C-56 enable active_record.whitelist_attributes
Entering party records; need to put info from researchers
Entering party records; need to put info from researchers
Applied Wall texture to all walls, new sand texture (may need to darken a bit)
Fixed owner_class_name option
Aprendendo a usar o GitHub!!!
Pavement!!!!!
Merge branch 'master' of https://github.com/Joem29/Cityscape-Mod-0.1.git
Changes ot pavement class
Fixed up the size class editor. Rows are added and removed correctly.
Fixed up size class editing and added in comment stubs so that
documentation only needs to be written.
TIM: Added a new function.
CLOCK: Defaulted the bus prescalers to 1.
Added custom library
Merge branch 'master' of github.com:Jost4/HUSACCT_Team_2_dev
removed old stubs in folders test and src
rollback the inputProto.pd to the right version (which has been overwritten)
Getting GPS to work
KNN no crash
Add selection previewer to designer
symbols stack elements type changed from strings to chars
Priorities replaced by operations with priorities
Division by zero task solved
Added simple tests for division checking
Fix for dealing with sequence operations without parameters
Added lexer with tokens. Added class with tests
Added lexer tests for negative/positive signed numbers
strings of lexems substituted by objects. Test are converted
some code cleanup and removed small clock option
Hell mode unlocked when winning normal mode
Button width can now be adapted to button text.
Less ugly buttons and labels
Update .idea/.name
added problem19.js
Block classes
added up/down scrolling
Merge branch 'ted' of github.com:LordPsychoMaster/Epsilon
cleaning up
accidental revert
better makefile
Adding email social icon
Clean up util folder
Add shapes for blue route as a test
Rename route json file to routes.js
Update stops file with correct link to routes/stops and rename variable to routes
Update trips text with shape id for blue route
Add optimized shapes util to build shape files. Add throttling and use waypoints for directions
Adds _request function
Updated to include commands usable in cygwin and Symfony2.0 specific short-cuts
Temporary mac build fix, bundle broken..
Frases Juniper (Correcoes)
Rename the table name of jobs entities
- bitmap text works <3 <3 <3
- removed cObject.h file, not usefull yet
Ajout de la suppression de favoris
Revert generic poller code. It was supposed to be in a branch
Pi becomes 5; project cleaned

Signed-off-by: Mathias Wynne <github@mathiasw.com>
Removed the "Pi as 5" control from the 2005 rar version of the server. The one for "I LOVE YOU" remains. Need to find that!

Signed-off-by: Mathias Wynne <github@mathiasw.com>
Minor changes - but just abpout to change the name of the class to avoid clashes with Mathias's class.

Signed-off-by: Mathias Wynne <github@mathiasw.com>
Tried a handful more of things to get my class to appear as a control, with no success.

Signed-off-by: Mathias Wynne <github@mathiasw.com>
Added the TestActiveXControl project to try and get it to work...

Signed-off-by: Mathias Wynne <github@mathiasw.com>
All the work done, now onto CMW
Sphinx is not needed any more here
Move pyth to full_requirements, add mimms
Docstring is fixed
Rollback changes in import code block, fixed my error of inattention in query2github
Safety cp
dot split fix
Additional Cyrillic glyph slots
Added Gje, Dze, decimal I, Ji, J, Kje, short U
FS#81 > fixing bug: windows are bad centered on multiple monitor screen (not tested)
small fixes and wrapping of parameters
Correct test for changes in filter spec. #2125.
Change #2197 - regrouped fields on receiving part for biospecimens.
Set instrument version in before_create hook if not set. #2948
Merge pull request #5 from NUBIC/instrument_version

Derive instrument version from survey title
A script for experimenting with merges.  #3007.

This is almost done; I still need to find a good way to load up surveys
from the private instruments repo.  But it's close enough that I think
committing it to master is fine.

The merge process involves three datasets and is therefore not trivial
to debug when things go wrong.

On the other hand, the merge behavior is deterministic.  Therefore
things that go wrong -- while they can be hard to understand -- are, in
theory, easy to reproduce *if* you can control those three datasets.

This script is a step towards turing theory into practice.  Ultimately,
it should be used to derive minimized test cases from staging and
production data.
fixed and refactored eligibility implementation and  unit testing, adding differentiation based on recruitment strategy
Merge branch 'task-2729'
Stabilize the internal structure of the conflict report.  #2148.
WIP feature for the sync attempt detail page.  #2148.
Stub out GET /fieldwork/:id.  #2148.

This commit also alters the response to GET /fieldwork to reference
fieldwork sets by public ID, because

1. it's symmetrical with PUT/GET /api/v1/fieldwork/:id
2. it eliminates the need to futz with internal IDs from integration
   tests
Show fieldwork metadata and conflict report.  #2148.
We actually do know what a blank latest_merge_status means.  #2148.

Assuming MergeObserver works and nobody is messing with the database
below the model layer, it means that a field client hasn't checked work
in yet.

(Yes, those are mighty big assumptions.)
The conflict report is now shown.  #2148.
[html] Set minimum zoom for pulling in full data, add ?nocondense option
Deleted _posts/2011-1-1-999-post-example.markdown
refs #2479 add Arch data for CPU , handle Void case for User and Cpus
Revert to the 1.5.0 registration
Don't push a block in the door, closes #79
oh fml
Additional initialization check
IDEA crap shouldn't hit git repo
Little refactoring
PermissionEntity refactoring - moved all regexp crap into separate class.
Merge branch 'master' of github.com:PEXPlugins/PermissionsEx
some doku pictures
bug fixes lots
Put in includes for the different packets. Also wrote conversions for
IP and MAC to ASCII, but they might be irrelevant with the standard
includes.
Added music test room; volume arrow fix.
Version 1.1

- Fixed addStyleP and addScriptP function names in common.php
Started skeletal tracking

compiling, but errors while running
Added Head Selector
Revert "temporal"

This reverts commit deb0bfe8cb9fd51230cfc84346dda1b0e266e31e.
Revert "Added shyla"

This reverts commit de19684d0fd21d486dd20d8d2dc68bf1c1a2fd8b.
Revert "fix npc radical"

This reverts commit ba234ab49f827bf4b3949a26826a36807c831e20.
25 halion's corporeality fix
Merge pull request #6 from Raelith/master

Contact page edits
Merge branch 'master' of https://github.com/Raelith/Illarion-Website
Merge branch 'master' of https://github.com/Raelith/Illarion-Website
Merge branch 'master' of https://github.com/Illarion-eV/Illarion-Website.git
IRC chat edit.
No longer requires an applet

Signed-off-by: Raelith <haeltera@gmail.com>
Optimize for mobile phones
Add new article: PyCon LT 2012
Removed Treehouse Verification file
skbtrace: add missed sk_skbtrace initilization
skbtrace: add missed sk_skbtrace initilization
skbtrace: fix bugs in tp tcp_congestion
skbtrace: add tp icsk_connection
Add css, basic navigation, and better routes
Finsih the layout and routes
fix typo to allow SSL for nova-api
Merge pull request #197 from SacredCoding/master

Update
Updated Metrics
Merge branch 'p000ison' of github.com:SacredCoding/SimpleClans.git into p000ison
Updated Metrics
Merge pull request #198 from SacredCoding/p000ison

Updated Metrics
Moving the Webserver into a Web directory and updating Namespace Info.
Fix Para DB y MVC
Update BGFixPack/modules/STORES-GullykinAndOtherStores.tph
Merge pull request #11 from jeffsws/patch-12

Update BGFixPack/modules/STORES-GullykinAndOtherStores.tph
Fix undefined variable
for construct: key, val support, parse vars as identifiers, loop variable, cleaning up
'for' construct docs
Change 'object' to 'hash'
Move for condition check before loop variable update
Fix indentation after replacing TABs with spaces
re-enabled whenever gem
Replaced lists of links with new lines.
Just call LLPipeline::refreshCachedSettings() in LLViewerShaderManager::setShaders() to avoid occlusion-related crashes if certain shaders failed to load.
unused styles deleted and a few tiny changes
now I am done
Further embellish regression test for threads/events
1. Add poi dependency to pom file
2. Add method export excel in question controller
3. Add new view QuestionExcelView to generate questions in excel
4. Update dispatch servlet , by adding xml view resolver to generate excel/pdf outpu
5. Add the location file for xml view resolver i.e. spring-excel-views xml
6.Update catogery details with generate excel link
Administracion de consulturio de oftalmologia
finished Meeting Role tests, all passing
Refactor attendances form: moved nested forms to partials, added application helper methods.
completed meeting roles
refactored meetings index page so that edit button display is based on cancan ability
Add manual selection in attendance form.
Spacing changes in attendance form partials.
Resolve merge conflicts after pulling changes to progress page.
Complete ajax to change projects menu when the manual selection changes.
has unit tests for meeting_role
merging meetingroles with origin master
WIP
Add user name of roles taken to attendance page.
Merge pull request #4 from SpeechLove/meetingroles

Meetingroles
Refactor attendance sign up logic so that speeches are updated instead of being created every time and are only visible to the current user.
Spacing changes in attendance form partials.
Resolve merge conflicts from meetings to master.
fixed broken spec in meetingrolescontroller
Merge branch 'master' of https://github.com/SpeechLove/speech-hacker into MeetingRoles
Updating new local branch with master branch on github.
fixed seed population failure due to meeting roles validations
completed tests for navigation bar and navigation menu
implemented Hot Items
prettyfied items.json
mmmmm
Merge branch 'master' of http://github.com/SpeedyShopOne/SpeedyShop
LFKDHJ:GVS
Tempature History graph

Added a tempature history graph to show inddor vs outdoor tempatures
over 24 hours.  each bar is a 30minute average.  loads defaults from a
csv file. The scale is dynamic ang changes based on the tempatures
observed over the 24 hour period.  next average is on the right and
oldest on the left.

Other minor changes as well...kinda forgot what need to comit more
frequently
Github being a bitch about settings files updating
Updated readme to be non-meaningless
Protection against unsupported unicode chars in strings
debug for shib #7, there may be a lot of these
Added PST to all deadline displays
- Statusleiste eingebaut
+ wird nur beim Spielen sichtbar
+ enthält die Anzahl der Aktionen
+ enthält die gespielte Zeit
+ enthält eine Progressanzeige, die angesteuert werden kann
- Neues Icon für Spielbarkeitsprüfung erstellt

Signed-off-by: JS <mcgaiver@web.de>
- Schriftarten in der Hilfe geändert

Signed-off-by: Nikolaj <info@nikolaj.de>
Changes by martin (and, in part, stefan)
Work on UI and stats fields
checks for negative click values
correct bug when rightclick on open field.
Merge pull request #3 from StefanRvO/Stefan

Changes by martin (and, in part, stefan)
Added .delete to commands
Added to .gitignore
Add context to enable basic authentication in Apache service
use the new `panels` infrastructure to maintain the Sauce Config
client-side code in this module, rather than core.
more descriptive constant names
Forward-time travel for Telephone Box implemented.
Geocoder OK
Login + inscription + ajout lieu
Revert agat63 cause I screwed something up
initial refactoring.
clean up gitignore.
initial commit
initial commit of the game logic
Flushed out some more objects
merge down default project
detect encoding instead of using the internal encoding
Merge pull request #1 from ethanckw/bugfix-59

detect encoding instead of using the internal encoding
Updated Gemfile not to use sqlite2 under devlopment and test.
some testing changes
removed breadcrumb font reduction
comment
correction bug argent
Browseranpassungen
remove useless wallpapers

Change-Id: I1bbdfccb4422891414a5151eafd8047f2b73c29e
Added a nick feature class
Implement more methods in SQLite backend
wrote some more tests, waiting for tq to finish revising harness
Merge branch 'master' of http://github.com/thequux/hammer
Rewrote tests to use tq's nicer macros. repeat0's test fails cos it's not implemented yet :)
Restore button disabled text color.
Center empty message for show list.
Give the widget some love: Light Roboto, bigger fonts on Nexus 7 like screens.

Closes #152.
Move menus to shows activity.
Do not create an auto-backup on first launch to prevent overwriting previous ones.
Organize imports, format source.
Update change log.
Add basic light theme with dark action bar. Not looking nice, yet.
Inherit some text styles from Android. Still far from correctly overriding base themes.
Set text styles via attributes.
Light title and tab page indicators.
Style action bar spinner.
Fix light text in action bar spinner.
Add dim variation for medium text appearance.
Style season watch count.
Style air data in activity.
Style friends header.
Style list selectors.
Add primary text color attributes.
Style powered by overlays.
Style all episodes link.
Site updated at 2012-07-19 13:28:59 UTC
Added static check that or sub-patterns have identical bindings.
Design changes, ability to skip build after an update
Добавлена библиотека для тестирвоания чего-либо
Calculator now passes 14/15 tests

Calculator does not handle spaces yet
Token now holds an Object, not a double. This allows either numbers or deeper TokenLists to be held
Fixed the TokenList.returnAsString() function which was returning nothing
Updated WiringPi submodule to latest commit
better handling of undo with modal tracks
Create RailsNewApp.sh
Adding eclipse project files and dirs to .gitignore
wicket 1.5.x branch
migrating code to wicket 1.5.x
hibernate validator latest release
wicket version 6.0-SNAPSHOT
rename to Wicket Validation
reworked some functions, cleaned up variables.
304.43
variable name change
Fixed label widths for #accounts-summary, #new-school & #edit-school
added title support to Dashboard and allow children to set self.name in their setup functions
Site updated at 2012-04-16 22:52:25 UTC
Salvación
Fixed typo in SQL schema file
Remove getRoleId from ZfcUserAcl\Model\RoleInterface
Merge pull request #6 from adamlundrigan/hotfix/schema-typo

Fixed typo in SQL schema file
Merge pull request #7 from adamlundrigan/hotfix/fix-interface-error

Remove getRoleId from ZfcUserAcl\Model\RoleInterface
support custom ACL assertions
remove useless stuff (view and commented config)
Removed refactoring of get_items
Concurrency applied when making payment to gateway.
Merge branch 'master' of github.com:adriancbjie/my-kitty-cat
Merge changes
pause player when links inside popup are clicked
reaquainting with the code, preparing for merge
Windows again?
windows...
trying to merge here...
Loading Bar on login screen
tep
what's going on?
merging
arg
preparing for merge
fixing merge confilct
fixing merge confilct
fixing merge confilct
merge conflict
fixing merge conflict
fixing merge conflict... again
Preparing more menu items
tweaked slider to reflect current level
added miner icon and pointer
forgot to add images to the last commit...
added some digging and dozing details
script to find the best k and write the output shading and reflectance
Implementing EKF segmentation.

Taahir
Site updated at Sat Dec 29 2012 15:06:28 GMT+0900 (KST)
adds standard database configuration
generate Member model
Stopword in README
add perf section to readme
printf's %u is fucked up... again
added double password verification
Modificada pantalla de bienvenida; modificados bootstrap.css y javascript
Merge branch 'development' of github.com:alessandrofg/NosTocoCruz into development
Refactor and reformat.
Refactor projection and canvas creation.
Refactor layer creation.
Keep bounds of layer, check bounds for lines.
Simpler projection creation. Scale autoadjust (autoscale) is almost working.
Autoscale for width working; for height not so much. Or should I say.
Post a heartbeat with the count of games in progress.
Scale is apparently working.
Paint a white background on the global update map.
bug with spryassert correct
Hotfix to jquery ui (see http://bugs.jqueryui.com/ticket/5959)
Hotfix to jquery ui (see http://bugs.jqueryui.com/ticket/5959)
Adding capture first frame pressing c, this allow change the first background.
Finish threads. Need to add a termination parameter
Removed undo plugin from list of plugins since it caused some issues with frameset and javascript on click handlers outside of the frameset.
updated impress.js demo to 0.21.x
updated demo-app for AE jQuery UI; added a system check if required *.php / *.log files are read/writeable
Merge branch 'dev' of github.com:alohaeditor/Aloha-Editor into dev
updated changelog
added info about getContents contenthandler settings
added info about Aloha.settings.contentHandler.handler.generic.transformFormattings settings
removed demo/test.html -- was never planned to be a demo...
In the sidebar the panel entry for the format plugin was always shown regardless if used or not
Merge branch 'dev' of github.com:alohaeditor/Aloha-Editor into dev
updated changelog reg. guides update and removal of demo/test.html
include first require and then jquery
Merge pull request #619 from evo42/dev

updated impress.js demo for AE 0.21.x
Updates mousewheel jquery plugin

The image-plugin resize fields didn't work with the previous version
of the mousewheel plugin. I suppose an incompatibility with the newest
version of jquery.
Fixes greyed-out image size inputs
Removes debuggin code
The image width input should come before the image height input
Added missing path to pubsub.js
Inserting a check if Aloha.activeEditable does is null.
Circumventing a IE7 browser crash caused by cloned nodes used in `getContents()'.
Changing the means in which we clone a element, to not use jQuery's clone() which sometimes causes crashes in IE7.
Removing the use of jQuery.clone() in the core files. Because of IE7 being
buggy with cloned nodes and removeAttributes(), cloning nodes with jQuery would
sometimes cause the the browser to crash. Implemented is a work-around that
circumvents the need to use jQuery.clone().
Implementing work-around for IE7 bug in `isCollapsedLineBreak()'.

The IE7 behaviour of getAttribute() is buggy in that it differs from the
documentation.  According to the DOM Level 2 documentation at:
http://msdn.microsoft.com/en-us/library/ie/ms536429(v=vs.85).aspx, the return
value of getAttribute() should be a string, interger, or boolean.  But when one
queries for node.getAttribute('style'), what is actually returned is not a
string, as one might expect, but an object.  The returned object is in fact the
style *object*.  I.e., node.style === node.getAttribute('style') .
Merge branch 'hotfix' of github.com:alohaeditor/Aloha-Editor into hotfix
Made java maven jslint checks compliant with githook checks. Somehow the nodejs jslint checks did not cover 'console' calls. Java jslint works better ;)
Update position
Add WMT 2012 papers
OOP improvements. No js errors.
Update the whole app
pg aliases
Using $EDITOR to edit files
removing white space
Surrendered to Sublimed Text 2!
Global git ignore
ln -nfs ~/bin/dotfiles/gitignore_global ~/.gitignore_global
Loading env config first
git flow completion
Renaming bash config files for better syntax highlighting
chrome style issue
Reorganising...

Created a histogram struct and put it in a new file because it was
irritating me.
Add video file with estimation steps.
mouhouhahaha
JavaScript Exercise 11
Getting the widget to talk to couchdb and validate
Merge pull request #47 from anton-github/master

email iconv fix
pr_r for all admins
Bumping up version
Updating update message
Small change
Added fork link + small changes
Filtering comments with small score
Bumping up version
Updated readme
Update app/securesocial/provider/providers/FacebookProvider.java

Fixed for most recent Facebook API.
Use am to send intents rather than a binder transaction.

This commit is by koush and is mostly copied from the CyanogenMod fork
of su.

By using am instead of a binder transaction, we can guarantee
compatibility with current and future versions of Android.
Build su as static.

With so many different versions of Android, using a dynamically linked
binary is just not practical, since things can be wildly different on
different versions.
Send information required for the result service in the intent
Update TPCodeaChunkExample.codea/tpBatch.lua
added the java pong version codes from sonal to tools/pong
canvis al readme i nom de la connexio
rename save_thought to save_thoughts
Adding --edit option
Adding some thoughts on --edit option
Initial "work in progress" placeholder.
FIXING WARNINGS THANKS TO  SOME NEW INSIGHTS ON C++ VIRTUAL FUNCTIONS
Replacing Font-Awesome with the Elusive-Icons font
add cycle-layout feature
Create Maven coordinates for our Ruby project.

* use these coordinates to compile, package and then mvn install jars
* change jruby-intergration sample project to depend on installed jar

Fixes #19
edited game.js
Adding the code for assignment 3.

All the comments are in README.md so please look there for more details.
Enabled support for VS2012.
Changed UI to use a menu instead of drop-down list.
Merge branch 'master' of https://github.com/ashmind/AttachToAnything
Updating the bash menu and the README file
[iOS] Detail View finished.  Added directions
first testcase

补充case
Issue #13: Fixing bug in oauth2-server introduced by pull request #9
WebUI > WebAPI
WebAPI 3.x is not going to handle user interface tasks, so we remove support for serving the website via the module
adjusting configuration
mapapi.cs handles map tile generation now
forgot to remove setup method
initial work on getting read-only methods use HTTP GET instead of HTTP POST
further tweaks on RESTifying WebAPI
[Scale] Refactoring (5): Get rid of unused workspace controls.
[Scale] Refactoring (6): Move ownership of _workspaces to the view.
[Scale] Refactoring (7): Move more members from display to view.
[Scale] Refactoring (8): Move even more members from display to view.
[Expo] Remove a couple of left-overs.
[Expo] Remove isDummy left-overs.
[Expo] Remove hideTemporarily/showTemporarily.
[Expo] More clean-up.
[Expo] Remove last dependency on Scale (workspace.js).
[Expo] Only a quick, decisive click should result in window activation.
[Expo] (hidden feature) Toggle global overview mode on/off by middle-clicking Expo background.
added static pages controller
static pages. checkout spork+guard-testunit
brujeria
brujeriaa
brujeria
Merge branch 'static-pages'
Small optiomization: use local alias to save a method call.
Fixed issues with UrlGenerator generating invalid urls.
First code and manifest of the ROS package
Communication, breachMessages and slaveMessages now resides within common-project, as this functionality is accessed by both master and slaves
Set request for Controller Callbacks
Use new Interfaces
BusHornet now only do remote connection:
The implementation only connect to started server.
TODO: Change name Bus to BusConnector
Change Bus name to BusConnector.
The interface Buss defined how to connect on bus and how to use it, so it Bus is rename to BusConnector.
The RemoteHornetQ is updated with new name.
The RemoteHornetQ implements the disconnect method
Update Factory to new BusImplementation
New Test1
maniferst
Jnu running without exceptions thrown
Reduce the history size.

Clean up Def.g for Jnu, so that there are less noise.
Add tutorial ideas. Still need to write.
Update documentation for 1.4.0.
fixed some inconstancies in the config comments
track campaigns dashboard and track campaigns cucumber tests
add day 6 and 7 HW
Å sette utgift til levert fungerer, endelig..
Simplified communication model
6yue5ri  wan
added mef2.1 tag
working on ... progressive enhancement or something
Fixed reversion history integration, closes #19
All 3 classes sequential, binary, hash.
Revert "another attempt"

This reverts commit 757ab9033828265f1b5e33c0c864c07aa2dbd244.
See if it is a post failing.
Merge branch 'hotfix/0.9.6'

* hotfix/0.9.6:
  See if it is a post failing.
update devise routes and added gallery
add more slides on data prep; fixed #+properties syntax etc.
Removed jQuery from assetic.
Restoring changes that I had previously overwritten from source develop branch. KNP back to suggests instead of require.
Optimized the call for js in the bootstrap folder through assetic. I was calling each file individually but replaced it with a *.js call.
Include HTML5Shiv by default in the javascripts include.
I needed to specify the output for assetic:dump to work by default. Currently outputting to "compiled".
recherche avancee + filtres
Register a src module/UI now available
Update required versions of CPANPLUS and CPANPLUS::Dist::Build
New Query
More dvds in some transactions
More stock in some transactions
add a link to this repository in README
Site updated at 2012-11-21 16:08:48 UTC
add Instructions and refactor MainActivity.java
Various changes
Removed some of the overlay as they are only icon changes
Added more dictionary for LatinIME
Compile some apps instead of using prebuilt ones
Annoying issue
sub overview and fixed cell display bug in feed table
added team spawn for all players
Upgrading to 15.1 triggers
Merge pull request #2 from lencioni/improve-readme

Improved readme file
Updated container spec for container edit test.
floodplainlocatormodel specs

current implementation of FloodplainLocatorModel done
Add a StaticPages controller
begin TDD
Finish static pages
Zrusenie polozky 'istic' z objednavkoveho formulara na kurzy.
Persistent variable BasePresenter::lang initialized manually.
Redirect panel added
Persistent variable BasePresenter::lang initialized manually.
Redirect panel added
Zmena textu v menu: PRE SKOLY -> SKOLY / DETI
Zmena loga partneri: hory a mesto, bez bieleho pozadia, priesvitne
Make menu on homepage taller
Store a hash of the API key (hash of a hash, yay) and move the SHA256 object around.

This way if the database ever gets compromised, the API keys are still secure and hashed.
The attacker won't be able to hit up the API on behalf of a user just by having the DB-representation of the key.
This also moves SHA256.hash() into an 'objects' package so that it's available from controllers and the User model.
setup script written, not tested yet..
added include functionality
adding the hello-world.html file
Merge pull request #1 from brettchalupa/_bc-fast_branch

adding the hello-world.html file
added sql database cmdlets
Revert "Removed double definitions of event methods. Waste of space."

This reverts commit a81bac689cc8d35c467e9f3949f62ed91a004583.
update to sql injection validator.
json parse error not in console, but nil error occurs in tests
Add YAML front matter block.
small tweak to data format for the web app
Updated site, see source branch for details.
obteniendo el id del archivo json y mandando mensajes al log
cambios en filename de json