labofsahil/github-event-dataset-2012 huggingface dataset:
Merge pull request #5 from emagana/multi-node

Fix indenting and minor typo
Merge pull request #7 from emagana/multi-node

Fix bug# 1086234 and Typo in VIF driver
Merge pull request #1 from CiscoSystems/multi-node

Multi node
estrutura ferramenta crm e dialog cadastrar cliente
Polishing invite friend functionality.

Adding table to look up private seeks per player and managing it when
seek/cancel seek requests are processed.
Clearing all current seeks when a private seek is received.
Changing timeout to a longer value on private seeks to give users a
chance to email each other and start game. Otherwise it would time out
too soon after navigating away from the page.
One server!
jckarter/clay@5862a15 (2012-07-30 09:18:50 -0700) Tests Failed:0, Passed:302
Add bold to TODO highlighting to blue
allow specifiying session_token to init, defaulting of partial init arguments, specifying PARSE_MASTER_API_KEY environment variable, and setting headers that are variable on Client to current values each request
Fixed the sizing of the Splicing Test Results figures
try org mode on website
Update version history to describe 0.3.2.
Apple OSX compatibility fixes (work-in-progress)
add some fixes/missing files for Mac OSX.
Added blanko-Support, Added check wheter file already exists
Added styles for the sections or steps of the wizard
carga precios descripcion corta update
Languagizes lists (drop-downs & radios), adds new functions/modifiers to deal with comma separated lists of phrases, updates language extraction/translation utilities and update to phrase libraries
Adds 'sort type' to tag lists/clouds for all modules
Moves breadcrumb navigation view out of showall to discrete method/view [#692]
bugfix - spatne generovani propojek
generovani pocatecnich vystupu
Merge pull request #115 from ezephyr/develop

Incremental improvement to the Previous Versions table
Merge branch 'master' of https://github.com/yapapaya/buddypress-media
Refactoring addons
Merge pull request #1 from faishal/master

Group code refactoring
Merge branch 'master' of github.com:joshuaabenazer/buddypress-media
albums refactored
Merge branch 'master' of https://github.com/yapapaya/buddypress-media
Merge branch 'master' of https://github.com/yapapaya/buddypress-media
Merge branch 'master' of https://github.com/joshuaabenazer/buddypress-media
add group extention class
separate group extention class in to another file and update references
Updated README.md to include the MIT license.
trailing slashes for API
Cleanup README

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Refactor into helper class. Added prefix option for file path
Update readme
Bumps version
Update dest defaults
Removed default channel handler. We're not limiting inbound on contact anymore, so we need to vet messages going to each respective channel. Essentially I removed default channel handing for contacts.
Tratamento de múltiplos arquivos

Inserido o tratamento de múltiplos arquivos e o funcionamento da
ProgressBar de contagem de arquivos processados.
Added marker file so the Shared folder gets commited into git
Updated package
[GIT-MISSINGS] Ajout de '-' comme raccourci syntaxique pour représenter la branche remote associée
allow for all paths to match if the request method matches
org.lunifera.p2.target.juno is need by the new tycho packaging type.
namespace support in JFactory::getConfig
Merge branch 'factoryconfig' into workflow
delete useless facade
quick color transition
Dokumentation Parameter für Mixins
add chinese for each model and revise InvitationCode admin
Refactor: extract code for enabling vsync to -enableVSync.
Refactor: Extract code to generate the cube's VBO to its own method.
Code cleanup: Edit comments and removed a few logging statements.
Well, it turns out that Xcode's extract procedure doesn't update the header.
Refactor: Extract code which resets the camera to its own method.
Refactor: Extract code to reset mouse input settings to its own method.
Refactor: Extract code to handle user input (for the camera) to a new method.
Code cleanup: Removed a logginf statement from applicationDidFinishLaunching.
Refactor: Code to submit the camera transform (via gluLookAt) is extracted out.
Refactor: Extracting camera code to a new class "GSCamera".
Check for GL errors at the end of every frame.
requirements file properly set
zoom change
Styles yo
fixed styles
Template changes
heroku static files? plz?
oops
using gunicorn
static files for heroku
heroku stuff
Heroku settings tweaks

Procfile changes

Settings update
Google Maps fiddling

settings for heroku tweaked
pulls from flickr

sources field accounted for

rollback
Google analytics added
Cleaning up git
Models updated to track source, jobs updated to not step on each other's toes
Google maps now opens one infobox at a time
Lightbox added for fullsize images
Added relocation if no geolocation, lightbox
Temp Admin Console and CR

CR of CRUD has been implemented
basic admin console at /
api starts at /API/user/(number)
Fixed TestRequest.java and updated classpath to no longer exclude TestRequest.java.
Fixed the examples for the network code.
Make configuration take in a URL so it's validated beforehand, rather than every time it's used
Make Configuration actually be a Singleton
Merge branch 'dev-exemplar-feature-janeway-network-tests-and-example-fix' into dev-exemplar-feature-config-refactor
Merge branch 'dev-exemplar-feature-config-refactor' into dev-exemplar
Merge branch 'dev-exemplar' into dev-exemplar-feature-button-actions

Conflicts:
	DefectTracker/src/edu/wpi/cs/wpisuitetng/modules/defecttracker/create/SaveDefectController.java
Реализована работа со страницами в модели доски для рисования
Added "plupload" module
This file actually has content
Delete blank document
Build with vala 0.16
Split out stuff
Added preferences file linker script
Tentacool and Vulpix
Vulpix
add iFly
Merge remote-tracking branch 'origin/master'
add download retry timer
modify TKCalendarMonthView.
Merge remote-tracking branch 'origin/master'
Removed django_admin_bootstrapped
Working on talk page.
Preparing for octopress
discount model re-structured
brand page and others
Merge branch 'master' of github.com:genxstylez/Empor-Fashion

Conflicts:
	product/migrations/0001_initial.py
Updated Github API to V3.

Github API V2 has been removed.  The response data format also changed.
Updated Github API to V3.

Github API V2 has been removed.  The response data format also changed.
bumped rbenv version fixing #743
Merge branch 'master' of github.com:imathis/octopress
Merge pull request #675 from zlu/master

Update Github API to V3
Merge branch 'master' of git://github.com/imathis/octopress into source
Attempting to update
Site updated at 2012-11-04 03:16:10 UTC
removendo _notes do dreamweaver
describe purgeUnterminatedFunctions test case, make it quiet as it works
Second pass - less double spacing, console log outputs directly after the code that generates it
Use pluggable_ui.
Site updated at 2012-04-02 08:48:25 UTC
Site updated at 2012-08-12 01:17:06 UTC
Better naming. FORCE didn't really say a lot. FORCED_MIGRATE sounds a
lot more descriptive.
added comments for wordpress generated classes with updated link
added coding standards links for author reference
removing functional code
added new script

this performs basic metadata addition, but doesn't perform any special handling of taxonomy. we want this to split taxonomy on semi-colons, and eventually we'll want the user to be able to specify more complex processing of each metadata entry.
parse_mapping takes process_fns variable

parse_mapping now takes a new value, process_fns. process_fns is a dictionary of functions to apply to metadata categories. The keys should be the column headings, and the values should be functions which take a single value. For example, if the values in a column called "taxonomy" should be split on semi-colons before being added as metadata, and all other columns should be left as-is, process_fns should be:
      {'taxonomy': lambda x: x.split(';')}

This is being added specifically for the taxonomy use-case, but could also be useful in the future for type-casting values, etc.
added special handling of taxonomy

first pass for testing - will want to generalize this functionality a bit before merge.
generalized semi-colon splitting functionality

users can now pass the list of fields with data that should be split on semi-colons, and defaults to 'taxonomy', if provided.
updated documentation.
parse_mapping allows users to override column headers

Users can now optionally pass a header list to parse_mapping. This is useful if a header line is not provided with the metadata, if users want to rename the fields, or if users want to include only the first n-1 fields where n is the number of headers provided (and the 1 is the first column header - typically either "SampleID" or "ObservationID").
expanded support for metadata processing

connected header renaming to script interface, and added more complex processing options for metadata categories. users can now process metadata by splitting on semi-colons (for hierarchical data), or casting to a float or an int.
adding new documentation page

which covers the add_metadata.py script.
fixed minor errors in sphinx build
adding example files

corresponding to the new adding_metadata document.
updated input biom table filename ...

... to correspond to the filename in the examples directory
documentation fixes
renamed hierarchical_fields as sc_separated

for consistency with convert_biom.py.
Merge branch 'issue-66' of github.com:gregcaporaso/biom-format into issue-66

Conflicts:
	doc/documentation/adding_metadata.rst
	python-code/biom/parse.py
	scripts/add_metadata.py
Try compiling with a large memory model if the initial compile fails.
Documentation and comments are still not completely coherent on
this subject, but the compilation issue itself is improved.
[RJA-985][feature]: Support variable grouping in DSL
[RJA-985][feature]: fixed groups
group name -> description
added internal group id
'required' is optional parameter now
Merge pull request #553 from ddurnev/master

[RJA-985][feature]: Support variable grouping in DSL
Revert "Reformatting." because it somehow messed up the build process.

This reverts commit e7f8b8fe1a4a0d5cfb47626342ad603b058639fd.
Add slots for setting correct answers.
Merge branch 'master' of github.com:group93492/economics_LPP
Move logging trait to common.
Move package utility code out of frontend-article.
Changed how Trail model is dealt with, add Article model.
Add common configuration object.
Add ContentApi service to common.
Merge pull request #2 from guardian/tag-server

Paired on this refactoring work with Daithi
Update version for 1.6-SNAPSHOT development cycle.
Introduce MetaData interface and tidy model.scala
Update version for 1.7-SNAPSHOT development cycle
Revert "Update version for 1.7-SNAPSHOT development cycle"

This reverts commit 6ba513059a36a97615457fa17120adae66367c02.
Merge pull request #3 from guardian/tag-server

Paired with Daithi
Update version for 1.7-SNAPSHOT development cycle
Merge branch 'master' of github.com:guardian/frontend-common

Conflicts:
	src/main/scala/frontend/common/model.scala
Added static path as a configuration option
Standfirst is optional
Some bug fixed and new funtionality

New functionality like autocomplete products search. It's not complete
yet in the next version probably.

Fixed bug that don't record the payments
Modificaciones de hoy
remove version gem dependency "awesome_nested_set";

Signed-off-by: Gullit Miranda <gullitmiranda@requestdev.com.br>
v.0.4.1.beta
Add mais_to var

Signed-off-by: Gullit Miranda <gullitmiranda@requestdev.com.br>
Removed the 'temporary' config keyword.
Don't allow __local property for replicated objects.
Documentation update.
Code cleanup.
部室イメージ追加
256bit birth
modified root link
Site updated at 2012-11-04 02:45:41 UTC
hard coding location

Signed-off-by: Vikram V <reachvikramv@gmail.com>
added rock ammo
Switched file extension
add two ignore:.DS_Store ,pyc
De-indent code blocks
Add in the ability to use non-raw images - ie no force to raw
První odstavec anglického závěru…
Další dva odstavce, Jde to jako po másle. Skoro.
Refined invasion code slightly.
Merge branch 'master' of https://github.com/hazamajaza/Neighbourhood
Implemented status command, reset command.
Changed output of css_directory and js_directory from //css and //js top /css /js in the rendered html markup.
Update test/headjs-ordered.html
Rest of Chapter 5
Site updated at 2012-07-20 08:10:01 UTC
Use the same bundle naming scheme for master and slave nodes
Bundle for fresh slave working
Don't enter configuration mode when comparing.
v1.064
Unified equalize_acl for ASA and IOS.
Parse lines even with CR LF.
Better log messages in equalize_obj_group
Fixed bug when generating object-group name in ACL

There was a bug,
- when transferring an ACL
- which references two object-groups,
- both object-groups are already available on device
The netspoc name of dst object
is identical to the device name of the src object.

In this case a wrong ACL was transferred:
src and dst were swapped.
v1.065
Moved "use Algorithm::Diff" from IOS to Cisco.pm
Simplified method write_mem.
Added Cisco generic write_mem method.
Moved noop methods for schedule / cancel reload
get_ip_prefix no longer accepts ip/mask
Fixed simplified method write_mem
Unified method check_max_acl_entries for cisco dev
Simplified error printing in checkinterfaces
Removed unused method check_firewall.
Fixed error message
write_mem checks for COMPARE mode now.
Simplified methods transfer and write_mem
Fixed: CMD2STDOUT -> COMPARE
fix when params of tags= is a array but not string, then you need to deal with them differently
rewrote before_save code
Task Metrics
Ribbons to show status
Couple of bug fixes and validation/messages
cleaner sass
Filtering and Toggling now all done by forms

passing real arrays rather than csv
Crud first draft
Added the presentation to oop-files
added some photos to the gallery and a background for the website
Some fixes to calendars manager.
Finish text and renaming ready for blogging. Also update functional R with more meaningful names.
Merge ../R_bridge/R_git
infra initial commit
more because more
Merge pull request #1 from F483/patch-1

more because more
sunc. Here i started once againg Models. And Logger.
Merge pull request #75 from illicitonion/master

Bumping to latest guava release, removing deprecated method calls
Upgrading to Selenium 2.21.0
Improved proto file readme
Alphabetising imports :)
Separate buikd_country_graph to work with records and countries
Improved color selection in headers, texts and listings
don't open :memory: at lauch with file
Added norm caching to tf and tfidf viewers
Add JSP fragment for Jetty to configure JSP
Site updated at 2012-08-02 10:35:58 UTC
Bump version & fix cert_chain bug
Merge branch 'master' of github.com:ipa320/cob_manipulation
Merge remote branch 'origin-ipa320/master' into automerge
remove machine package and add machine launch file arguments
Merge pull request #4 from ipa-fmw/master

remove machine package and add machine launch file arguments
merge with ipa320
Better code indent
Better code indent
Texts fixes and improvements
Hide absolute local paths
added queryhint support
update gui version
Update portfollio-plugin/jquery.image.js

Change some animation
finshed translation and fixed js samples
Addition of the document assets from the old traitocws project
Adding comments the cli interface script.
Added test directory and started conversion to bundler.
Enabled JSON responses instead of plain text
Adding internal tests for the RSET command
Adding email parsing functionality to the Parser
Changing how emails are parsed, to account for headers in body text
API tested appropriately, should be returning properly formatted email output based on parseEmail
添加vo，scope笔记
problem 19 solved, problem 15 still now correct
take out handling of Key_Escape release event as well as press
Uploading sample app
fix the mathquill link
Merge branch 'production'
Merge branch 'master' into production
make sure bundler is loaded in the config.ru
load up other things *after* the app, which does bundler already
don't require sinatra/reloader unless it's dev
make sure the public directory is present
try adding a procfile that builds stuff
let $RACK_ENV just be inherited
use bundle exec after all
switch to unicorn
try python2.6
force rubypython to be more recent
add an assets:precompile task for heroku

and stop running it in the Procfile
stop trying to baby rubypython
don't use sinatra's global magic
add a vendored libpython object
make sure find_python_lib returns a string
what the hell, let's see what happens
rename libssl to make heroku happy
Actually add all files.
Add missing parameter -g
Linux 3.3.0
initial commit
basic server
using a template now yayayayay
forgot the view
Changed readme
added login view.
beginning to render teacher view
adding public folder + libs
Merge branch 'master' of github.com:jcbozonier/GrowStrong
Remove idea and cookies reference
was missing jquery and also adding more teacher view.
Signed-off-by: Justin Bozonier <darkxanthos@gmail.com>
pivoting
add list
add summary
remove travis, no default credentials
Merge pull request #2 from grosser/master

list + summary
Adds Decimal formatter
using the jig engine scrolling class

Changed codes to use the jig engine's scrolling game class.

added:
-object classes
-level 1 game map
-jig engine physics rectangle collision handler

changed:
-updated spritesheet coordinates [I have no idea what i did to the
previous one, but the coordinates are all wrong]
-added type variable to vanillarectangle class
-reverted changes to the rendering method in the sprite class
Add HTML support for radio button user values

Radio buttons select exactly one choice out of many. We enumerate every
radio button and throw out any that aren't checked.

To be consistent with other user-defined values, the value's name is the
ID attribute rather than the name attribute.
Added link to Packagist and Composer on README
Added a e pos DIP switch and a HT8950 IC.
InstruccionesFase2
InstruccionesFase2
Started to split up long theorem into smaller lemmata.
Shellac repl v1
Fixed ethan theme install
Split "unsummarized_metrics" into seperate code segments
Renamed "my_strncmp" to "llist_strncmp"
Added the second menu item
Revert "Adding readme.txt - general explanation."

This reverts commit 99d32fc8f3ad642d223f4a384f17c3cc533528ca.
Re-adding README.txt - now with recognizable name

Re-adding README.txt - now with recognizable filename!
Trying to fix
Merge branch 'master' of github.com:jmohundro89/456_program3
Introduced concept of NodeHandlerKey

Along with:
* 'path to orignial root'
* Ability to short-circuit document traversal
* Optimizations to improve processing speed
* UnitTests for new classes & features
* JavaDoc addition and cleanup

Signed-off-by: Jason Mosser (NISC) <jason.mosser@nisc.coop>
moving from deprecate Q.end to Q.done
fixed a typo in description
Created User class and added its FK to Tweet
Added files to store users and tweets
Added getURL for tweets and users
Created LoginWindow
LoginWindow extends JDialog
Changed incorrect tweet URL
Altered format of post titles and added date at end of post
changed path to favicon
Assets are being precompiled in staging/production.
å ä ö fixade
Only send bid data where it belongs
calendar my friend
models controlers game
Tweaks to start working on chat room features.
Using JQM for App form. New Validation with AJAX and CSS.
- Add 'computer jacket' photo from
  http://i.i.com.com/cnwk.1d/i/tim/2011/03/25/computer-keyboard-jacket.jpg

  Credit is to "Piccsy" according to this article:
  http://news.cnet.com/8301-17938_105-20047388-1.html
Add caption
.
change font
more work
Replace now() calls with clock_timestamp() (Fix #5862)

now() is equivalent to transaction_timestamp which for triggers
is not giving us the kind of resolution we would like.
Fix version numbers in OMERO4.4RC 1
Minor changes to sql/misc/Makefile
added number count behavior and starting to get url action going on.
add missing colorbox images and new base file
markdown for README
indenting
Collapsible help section
Location display uses Geo microformat. Placeholders for reverse geocoding fields (address etc)
added some todo's to readme
Starting with security
Fully working!

Still need to add error handling and validation (like making sure an org, tag and env actually exist).
added missing mux mode
added uart_write
Make sure tearDown always gets called, even if exception eccurrs during test. Also, dedupe some reporting code.
Rip out jQuery, import Javelin

After looking at their models, I think Javelin fits better with what I was
mentally wanting here. In particular, hooking up the ajax delete handler for
new items ajax'd in looked like it was going to be ugly (the "insert new item"
code would have to know about every handler that would need to be wired up when
adding new items).
Wire up sigils, print on delete item click
Add metadata to items for delete button

Not super happy with this living in the SR monad, but that's where I'll stick it
for the time being.
Should be the last thing
load task list on resume
added google analythics tracking
added sample site reference
website services update
changed something in datastructure
rearranging snippets
merging with master
pre meeting fixes
remove import
Merge branch 'master' of ssh://github.com/kennycason/legendofzelda
Fixed bug in observable creation during first-time mapping.
We're only compatible with knockout.mapping 2.1.2, as noted in #5.
We now pass the query data to the view_model constructor, when using that feature of the mapper. This solves a problem where you want to create a ko.computed in the constructor, but the observables you're about to make use of don't exist yet. Now, armed with the data, you have the option of instantiating the observables you need with the real data, so you can make immediate use of them.
Corrected an assumption: it's not for us to say that nobody will ever want "_id" to behave like an observable.
:punch: Bumped version to 0.2.3: bug fix on first-time creation, view_models now receive query data as a parameter to the constructor, and the assumption that you will never want to make use of "_id" as an observable has been removed.
bignum.h : Add operator % ; fact() perm() comb()
Actually save user after updating last_login
Fix build problems owing to changes in libav
Correctly protect a shared variable
Get rid of UDP/RTP output buffering
Don't fail if packets can't be written
Merge branch 'master' into multichannel

Conflicts:
	input/sdi/linsys/linsys.c
Handle possible (theoretical?) issues with pthread_cond_wait ending without a signal
Update to latest Blackmagic API
Fix bug in encoding mp2 audio. Samples were not read from FIFO
Merge branch 'master' into multichannel

Conflicts:
	encoders/audio/mp2/twolame.c
Allow user to leave league
Baron Silverlaine (second boss of Shadowfang Keep)

- Delete DB scripts
- Added core script (with errors)
Fixed issue 2,TODO more
fixed
adding layout
added some startups and shit
globalize3 workws
adding Keyboard listening node
제스쳐 부분 완료.
Remove lineshifts from config_flags file
Add file utility.
make friendlier admin for bios
took points thing out of match model
Added script to filter weird pip cruft.

Kept having to hand-edit the requirements.txt file down to something
usable.
Initial frontend work, broke some migrations.

It's OK, because no one but me uses this right now, and it's very
unlikely that when this is made public, anyone else will grab and
use the revisions with the old migrations.
add ability to configure pycurl options

Specificly, there was previously no way to specify TIMEOUT and
CONNECTTIMOUT on pycurl http requests.

Now, you can configure these and other pycurl options. Example below.

    import sys
    import os
    os.environ['PYTHON_HTTP_STRATEGY'] = 'pycurl'
    import braintree
    import pycurl

    braintree.Configuration.configure(
        braintree.Environment.Sandbox,
        "your_merchant_id",
        "your_public_key",
        "your_private_key"
    )
    braintree.Configuration.set_curlopts({
                pycurl.TIMEOUT: 8, # max 8s to complete request/response
                pycurl.CONNECTTIMEOUT: 2}) # allow 2 secs to connect
Merge branch 'master' of https://github.com/kortina/braintree_python
Fir Commit from Google Code.

Signed-off-by: koticR <kotic.r@gmail.com>
touch recovery for tf 101 and 201

Change-Id: I6ce22fbdfbf0d2ef0a515c984396b2a84eed1b05
added more PropertyTextFields
updated ListChangeListenerAdapter so it tells index of removed objects, and started work on ObservableListMirrors
cleanup for List objects
cleanup and testing for BeanObservableList
Added custom select field with better null validation
Enable attribute key/value pair form fields
Enable attribute key/value pair form fields
layoutmatch displaying correct info
begin to desgin html
Corregido el manual
Mejorada la bibliografia
Site updated at 2012-12-20 18:56:02 UTC
Rollback to classic theme.
Updated at 2012-09-23
remove ciscocib from the list of walk trees
exemplo funcao python
I've done couple of formatting on README, creating sections about configuration, message format, and message writing.
Site updated at 2012-10-17 13:24:27 UTC
add index of book list and kind list
had implement delete-book function
Add  some mechesizm for refresh the manage.html page
put book-list to home page
add book list
nothing
Add another method to query all data in kind_tb
Add Order dao and implement because we need to operator order_tb
format code
Format all codes
Fix SQL syntax
Convert from paginated report to a single page, limit reduced to 800 results.
Adequação do aplicativo para utilizar CDI (JSE), implementação WELD-SE.
Correção de bugs no cronometro de worklogs.
Scheduler Quartz para cronometro de worklogs.
1º problem
cucumber tests fixed for feedback
Nice smooth tagline color transition.
p505: Build SIM toolkit
change tab from 520px to 810px, also fix in facebook.com/developer settings
Add instruction to scroll down after selecting days in calendar
Re-arrange display of result

Show fare type first, then date range, then cost.
Move total cost to the bottom, as part of the table.
Show animation while loading results
Make touch devices (smartphones, tablets) partially work
Add short explanation before best fare result
Use classList instead of className
Please upgrade message to all IE users. Add classList when needed.
Fix when to show loading animation and explanatory text

Loading animation only to be shown when AJAX request pending.
Explanation should always be hidden until there is a response.
Octopress init
Site updated at 2012-10-02 10:11:11 UTC
Random xcodeproj cleanup
Remove "moved aside" code
shove code through an uncrustify profile. Not ideal formatting, but, at least its consistent

Conflicts:

	Classes/BartColorsView.m
	Classes/DataHelper.m
	Classes/DataImporter.m
	Classes/Destination.m
	Classes/FavoriteStopsDelegate.m
	Classes/FavoritesManager.m
	Classes/FavoritesVC.h
	Classes/FavoritesVC.m
	Classes/LinesVC.m
	Classes/LiveRouteTVC.m
	Classes/NearMeVC.m
	Classes/NextBusStopDetails.m
	Classes/PredictionLabel.m
	Classes/PredictorOperation.m
	Classes/RoutesCell.m
	Classes/StopDetails.h
	Classes/StopDetails.m
	Classes/TripDetailsTVC.m
	Classes/TripFetcher.m
	Classes/TripOverviewBottomBar.m
	Classes/TripPlannerVC.m
	Classes/kronosAppDelegate.h
	Classes/kronosAppDelegate.m
Apparently ACTransit is bad somehow, and crashes if we don't leak this. I don't care enough to fix it yet. Also, cell selection style = none, as presses are handled by the buttons
ARC

Conflicts:

	Classes/DataHelper.m
	Classes/DataImporter.m
	Classes/FavoritesManager.m
	Classes/LinesVC.m
	Classes/NearMeVC.m
	Classes/PredictionsManager.m
	Classes/PredictorOperation.m
	Classes/Trip.m
	Classes/TripFetcher.m
Updated Project Setting based on xCodes' recommendations
Fixed ARC issues with Appirater, UpdateManager, and A few other files
Rearranged project folder structure
Fixed flurry linker bug
Updated with the previous few commits (added Readme, added config.plist)
Appended…
Fixed ARC bugs in App Delegate
Fixed .gitignore
Fixed .gitignore again
add lib for placing singletones
Change not to use local repository as a stub (for travis ci)
added tournament
Merge branch 'master' of github.com:logangilmour/learnpython
fixed iterate in gol.scm
, <a href="http://ordergenericdrugs.com/products/deltasone.htm">deltasone online</a>,  966722, <a href="http://more-drugs.com/products/prevacid.htm">cheap prevacid</a>,  50124, <a href="http://shopdrugcheap.com/order-zithromax-online-en.html">buy generic Zithromax</a>,  =), <a href="http://ordergenericdrugs.com/products/propecia.htm">propecia</a>,  848856, <a href="http://shopdrugcheap.com/order-zoloft-online-en.html">buy generic Zoloft</a>,  587, 
comment1, <a href="http://price-drugs.com/order-cialis-online-en.html">buy Cialis online</a>,  qkev, <a href="http://shopdrugcheap.com/order-zithromax-online-en.html">Zithromax</a>,  yjhzy, <a href="http://price-drugs.com/order-proventil-online-en.html">generic Proventil</a>,  >:-)), <a href="http://more-drugs.com/products/deltasone.htm">cheap deltasone</a>,  :-[, <a href="http://ordergenericdrugs.com/products/prevacid.htm">cheap prevacid</a>,  ndiylk,
Added the customers
Quick dirty hack to support highlight of nav link (which was broken).
change gnu-linux to gnu/linux
moved from progress
Merge branch 'master' of https://github.com/luolimao/lilypond-pieces
Modified few comments
updated language files OTS<->SA
updated language files OTS<->SA
Start updating users API docs.
Updated path to run-travis-ci.sh
bad fix.
bug fix (related to unicode).
fix: gfan merge
add: test for reserved name in iiAddCproc in debug version
fix: interred (tr. #456, master) qring+redSB
worked on the vim commiting algorithm.
Test entry module.
Add backspace method.
Fix menu when no any icon in menu.
Added vendor prefixes
Merge remote-tracking branch 'origin/master' into gh-pages
Changed main font to display in Winblows
Renamed main site directory
Bump provisioning.
massive refactoring & renaming
delete invisible system file
Improve configuration so that build works automatically without modifying the path manually.
Documented how to make a custom permission class with per-object permissions.
Automatically list all contributors ordered by commits.
Updated conf.
Add permissions to library
Remove trailing whitespace.
Fix code standards in non test files.
Update failing tests.

Entities in css/script urls are now url encoded.  This changed
in CakePHP.
Replace all underscores with dashes.
fix title in bottom bar
install piwik
change input to email
Eq renaming
Remove Eq-specific file
Add CMAKE_MODULE_INSTALL_PATH to Common
Fix CMAKE_MODULE_INSTALL_PATH in Common
LIBRARY_DIR fix
Merge branch 'master' of https://github.com/Eyescale/CMake
Fix find script installation
Common default build type tweak
Add and extend FindGPUSD: implement QUIET, search libs only relative to include
Updaing my experimenal branch with the thread placement code.
Merge branch 'master' of https://github.com/Eyescale/Lunchbox
Merge branch 'experimental'
Prefer local time over UTC time, remove obsolete new line printing
Merge branch 'master' of https://github.com/Eyescale/Lunchbox
Merge branch 'master' of https://github.com/Eyescale/CMake
Common.cmake updates
Improve scoped thread check
Minor CMake tweak
Merge cleanup
Fix msvc 10 build
Modified tests to HTML within cas string - instantiated plots contain some HTML within Maxima strings.  This needs more thought.
few more options, small improvements
Sphinx implementation
update in Yes

update in Yes
adding search sort and paginate
added usage section to README.markdown
Adding new code to the state_stats method.
Changes to the state_stats method
Merge branch 'master' of https://github.com/mblackwell/event_manager
Enhanced dive script
Enhanced dive script
Added a few more menu items.
Added unittest_run make target
Added missing include to fix gcc build
recommended modifications
Add open & close dialog and associated operations
fixed MCS index problem. was off by one
「この拠点を選択」の機能修正
ダイアログ機能の見直し
プレゼントボックスに選択受取機能を追加
Ignore the spec/fixtures directory.
Adding an ensure_packages function.

This function belongs in something like the stdlib module. But for now
we'll keep it here.
Switch to the ensure_packages function.
Improve user#pic performance
layout

Signed-off-by: michael febrianto <michaelfebrianto@gmail.com>
Require resque in daemon scripts
Groups of type default (tx_begroups_kind=0) should be visible in be_users record
refactor and combine zoe http route files
No, like this
Added some models & abstract class for REST calls
DiagnosisAdapter implemented
Diagnosis: setter methods implemented
TODO: parse xml stream
Improving fields example
Print the row when an exception is encountered in parsing a row.
Merge branch 'master' of github.com:mjumbewu/legistar-scrape
Make load sql an attrbute of PgLoader class.  Allows for separate inspection of the load sql prio to load.
Previous version of MM a black gif snuck in in place of a transparent one
Changelog and version 3.3.3.
managed to break it in sandbox :-)
added 500bp separation constraint
added plotting of path only and label query scaffold
Added MT-related bundle for the assets.
Fixes the calculation resulting in the boxes not in the middle of the screen.
Merge pull request #1 from moneytree/rpr

Fixed the boxes placed not in the middle
Fixed PHP-372 (Error codes not being passed to MongoGridFSException)
Switch testdatabase name to phpunit and credit the actual author of this test
Merge pull request #74 from bjori/PHP-372

Fixed PHP-372 (Error codes not being passed to MongoGridFSException)
ZTS fixes
Merge branch 'v1.2'
unchecked tooltip changes
Change at DbUnit
DbUnit: add Supplier
Voo: changing clause where
change dbunit
Merge pull request #2 from moonjava/tafs_dbunit_tests

TAFS_02: DbUnit - Tests
Theme option and more callback options: legendsDraggable, legendsZIndex, legendsLeftPosition
Added GermBufferUtils (copied code from LWJGL).
Prueba desde PC
Prueba desde PC
Disabled the use of symlinks for repository.db to allow remote downloading from pacman
added portaudio.h
Updated site production url for naakka.net
standart Django project template
ignore files and settings for purchase module (SC)
included sc module
madifcar README
Actually return the xhr from the outer function envelope as well
The point of last two commits is that calling dajaxice function
returned undefined instead of xhr object.
1.add gitignore 2.fix bug white plan with inputtext
Fetch AsciiDoc executable from doctools. Added using native Python. Added refresh button.
Added partition view.

Tree Structure:
Job -> Algos -> reference -> hit_id
Render entire tree in partition view.
Enabled data export for all visible nodes in the tree.
Refactored view.

* Added table view
* Removed tree view for now
* Enabled smooth transition between partition and table (vice versa)
* Enabled filter and export operations in table view
* Updated gems
Added algorithm to table view. Refactored LSS data prep.
Reordered view as select menu. Replaced hit_display_id with hit_id in table.
Clicked node preservation bug fix.
Removed LSS.clicked property.

* Fixed filtering bug in multiple views.
* Instead of zooming to clicked node in partition view, re-create the view
  with the current dataset. Probably not ideal, but works for now.
Clear cached data when view selected is clicked.
Added None to table view if GBrowse link doesn't exist.
Added sortable columns to the table view.
Updated gems.
Fixed algo display bug when moving from partition - table - partition.
Refactoring.

* Extracted data export functions.
* Extracted jQuery events.
* Fixed data formatting bugs.
Added jasmine and updated gems.
Added guard, jasmine-headless-webkit and skeleton specs.
Added fixtures, gems and specs. Fixed jasmine.yml JHWK bug.
Refactored lss.js and added specs.
Added LSS Data Export specs.
Updated .gitignore
fixed self-ligation
Removing plugins until tinymce is working
Removing plugins until tinymce is working
spw/r
Merge branch 'master' of github.com:newhavenrb/railsconf2012.wiki
Merge branch 'master' of github.com:newhavenrb/railsconf2012

Conflicts:
	Sustainable-Productivity-with-Rails.md
Fix accidental headline on presenters talk
Merge branch 'master' of github.com:newhavenrb/railsconf2012.wiki
Fixed a crash if the transaction is nil
- fix paths' database with shared zcache when DBA extension is not enabled
was not putting into cache on jackpot
Added explicit support thx to @emostar suggestion
added test check on new user emails and fixed bug in post views
Added important
no done button
HTMLRenderer documented. It accepts the returnAt value. Table updated
updates for HTMLRenderer. Still do not work perfectly
ivn
basic files for omega
Registration Local Index- fixed
updated my problems to show answers
added answers to my problem display
updated gitignore
answers now show
fixed a few project settings
and some more project settings fixed.
INT-2748 Change CircuitBreaker Exception

Previously, when the breaker was open, it threw a
MessagingException. This was not wrapped so normal
error-channel processing 'payload.cause.message'
failed because the cause was null.

Change the exception to a new private
CircuitBreakerOpenException.
Merge pull request #623 from garyrussell/INT-2748

* INT-2748:
  INT-2748 Change CircuitBreaker Exception
INT-2567: Improvement & refactor Groovy component

Introduce VariableResolver, BeanFilter, FilteredBeanFactoryDecorator, GroovyVariableResolverBinding, refactoring ManagedBeansScriptVariableGenerator for usage GroovyVariableResolverBinding.
GroovyVariableResolverBindingTests.
additional tests for GroovyControlBus.
add 'spring-web' dependency for tests about 'request' custom scope.
Manual: change description about 'Groovy Control Bus' scripts limitation'.

INT-2567: Improve & refacror Groovy Control Bus

Introduce separate BindingOverwriteGroovyObjectCustomizerDecorator
Internal GroovyControlBusFactoryBean$ManagedBeansBinding with delegation to provided BeanFactory
Inline ScriptVariableGenerator implementation just for Message 'headers' variable
Tests for new GroovyScriptPayloadMessageProcessor logic about binding
Integration tests for managed beans in the custom scope
Reference Manual: polishing description about Control Bus' behavior

INT-2567 polishing added @link to javadocs
Merge pull request #446 from artembilan/INT-2567

* INT-2567:
  INT-2567: Improvement & refactor Groovy component
added file upload and json for jit closes #4
added serializer for jit closes #4
Merge pull request #12 from injektoxa/master

Issue #4 implemented
HTML5*Boilerplate
reverted permalink structure
修改了url映射，readme增加了demo
Added a script to bookmark a random subset of acts.
Bug 19484: Convert List Parser
removed dirname for browserify
Added snapping to dragable
Make Markdown requests POST not GET.
Markdown requests return plain HTML, so just return the string instead of trying to parse JSON or owt.
Adding flexible "region" recognition.
adding quiz 16
Merge branch 'master' of github.com:pajtai/JavascriptQuizzes
Added: chap06/
setup vcr
add guard, add member specs
Added Swedish javascript translations
BUG: Fixing a issue with a undefined variable in getLink
BUG: Installer templates

Installer was feeing the title "Title" to the template. Template
rearranged for usability concerns (people were missing the email and
password when going to the CMS login page)
Merge pull request #185 from patbolo/bugfix/7819

FIX 7819
Enable page sorting by Page name in list view (see #7601)
BUG Correct live state in SiteTree->getAbsoluteLiveLink()

Was fetching the record from live (and its direct URLSegment),
but all of its parents from the current stage, which might be draft,
leading to "mixed" draft/live nested URLs which might no longer
be reachable in live mode.
BUG Use AbsoluteLiveLink() for CMS previews

It uses the correct live URLSegments for its parents
by setting the global Versioned reading mode correctly,
see 8a514d8b64 for detail.
Merge pull request #189 from silverstripe-rebelalliance/open/7754

BUG: Fixing a issue with a undefined variable in getLink
Replace tutorial link
NEW Add warning if viewed SiteTree object class is obsolete
FIX Pages with obsolete class shouldnt do first versionless write
Merge pull request #183 from adrexia/installer

BUG: Installer templates
Merge pull request #175 from creamarketing/swedish-javascript-translations

Added Swedish javascript translations
Merge pull request #188 from phalkunz/7601-listview-sort-by-title

Enable page sorting by Page name in list view (see #7601)
BUG Removed 'Sort' field from CMSMain edit form

Related to #7740. The sort field gets stale if the current
record is moved in the tree. Since the sort value can't
be altered by interacting with the form, its not required
as a hidden field, either.
BUG Session namespace sharing for CMS controllers

Ideally we could do this without session, but pragmatically
we still need it, because of the inflexible routing system,
and because of performance considerations.

Example: The tree is lazy loaded via a generic  URL (admin/pages/treeview).
While we could add ?ID=<currentpage> to make the view (more or less) stateless,
it would trigger a full tree reload on every tree navigation action.
Instead, we assume that all "reachable" nodes are already cached,
and simply mark a different one as current. For this to work, we need
shared session state between CMS controllers.

See http://open.silverstripe.org/ticket/7815 for detail.
Merge pull request #191 from silverstripe-big-o/session-namespace

BUG Session namespace sharing for CMS controllers (#7815)
BUG Filter pages by LastEdited always returns an empty list

This is caused by the input date values entered by the user are passed into query without converting in a correct format first.
BUG Enforce $allowed_children in controllers on page creation (fixes #7694)

Original bug fix contributed by @kmayo-ss
BUG Disallow "add page here" shortcut to avoid $allowed_children edge cases (fixes #7694)
Merge remote branch 'origin/release-1.1.3'
Fixing bug caused by synching 200+ participants at once
Merge remote branch 'origin/release-1.1.4'
Merge branch 'master' into qa
Controllers can now pass Plugin:Folder:view.twig to render().

Added some checking to the render method for parseable template
falling back to conventional CakePHP path. Not quite sure if I like passing
the logical name of the parsed template to the helper callbacks.
Changing the link text to match others.
Add TextExtension method docs.
Adding link to the HtmlHelper class.
Fix syntax error in example.
updated gemspec for 0.3.0
Added savestate when receiving a phone call

This is just a temporary hack to be able to resume game after receiving
a phone call. Also fix default setting for rice plugin.
Setup Rspec to run tests
Header spec
Fix minor bugs from testing
Encoder, row and shaper specs
Product packages

adding openvpn, ssh, bla bla...

	modified:   products/common.mk
Change to Sphinx.
More README/TODO enhancements, some view placeholder verbiage
Increase the specs of the initial VM with sed.
- hopefully a bit nicer formatting
Sim setup and infrastructure updates.

Added code to initialize the sim, introduce new individuals into the
flock, and to age out old individuals. No rules are implemented yet.
There is a crash bug (missing method on nil class), but these updates
needed to be committed.
added 'edit user' section
1.0.0 final
Remove files in favor of gh-pages branch.
Corrected typo in English and added German translation
Revert "Corrected typo in English and added German translation"

This reverts commit db178757f8cd57c7ca49ac6478aaeda6bb7b61f3.
Corrected typo
JWT cleanup
Merge pull request #5 from anilsaldhana/master

cleanup
Remove old blog post dump
item edit/add templates added to static page content
Debian-Hibrido
Merge branch 'master' of https://github.com/piryguiry/Debian-Hibrido
added schema for texttile
Remove old test code and use an existing permission for the tile for now.@
Dropbox problem fixed
Added link to latest public bug tracker update on main page
updated site @ 2012-05-08 19:16:56
added hook info in README
feedback in ajax
Search page

- search page added to show results
- not complete
bug fix: html/plain mail part detect
some dumb code added
* Added support for dashes in LineStyles and improved street geometry
* RenderStyleConfig/Reader: modified LineStyle (replaced 'oneWay-' with 'symbol-' parameters, and added 'dash-' parameters)
* MapRenderer: improved the method used to convert polylines to street geometry (by using bevel/boxed joins and generating tex coords)
* MapRendererOSG: added support for LineStyle symbols and dashes
Corrected naming convention in test.
Added resources & asssets
added support for newer pyexiv2 api
Command-line use is easier
added example for ARB_shader_image_load_store
Alterações nos Users!
greg test commit to source branch per 20108
Use Zinc instead of Scalac
Refactoring network again so that clients don't need to know which network clients are available.
Working on making it more intuitive when opening the app (i.e. less menu's, try to infer what the user wants to do).
Added list-incongruent-methods.
Added list-shared-methods.
Improved clear-shared-methods.
Designed out the discussion pages.
Add find user per page function
Updated _posts/essays/2012-11-30-read-white.md
rework tests for most simple case of child termination
increase test coverage for whole of terminate_simple_children
fix bug in timeout handling clause of terminate_simple_children
cosmetic (trailing whitespace)
use ~p after all
otherwise we end up with {leftover_string,[102,111,111,98,97,114]} in
the logs
importing opscode ntp (v1.1.2) cookbook
adding base server role, and allinone role
updating role[single-controller]
fixing typo
updating allinone to use role[single-compute]
fixing typo
This resolves the 'No module named dashboard.views' error
adding external cookbook dependencies
Horizon requires use of novaclient.. which attempts to create a .novaclient cache file in /var/www (the apache users home dir). also Horizon has a forced dependency on their being a volume service endpoint in your keystone catalog, https://answers.launchpad.net/horizon/+question/189551
registry needs to come before api
adding recipes from opscode. rabbitmq (v1.4.0), erlang (v1.0.0), yum (v0.5.2)
updating role[single-controller] to use rabbitmq::default
removing openstack::dashboard as it was splitout into the horizon cookbook. removing openstack::rabbitmq as it was replaced by the rabbitmq cookbook
cleaning up openstack::controller, although this file will be going away soon.
Merge pull request #40 from galstrom21/ubuntu-precise

Nova Refactor - Part 1
Change of the font size of post titles
Improve post headers styles
Add responsive emails post
New & Noteworthy is falling behind.
Section Variables: fixed link.
Changes to Meter Rotator, tweak to Meter Line.
Built-in-Variables: Changed examples from XP to Win7/8
Put Sqlite3 into development in Gemfile
Site updated at 2012-11-02 21:29:07 UTC
Updated style and added medical terminology to classes
Merge branch 'master' of github.com:rchowe/rchowe.github.com

Conflicts:
	style.css
Updating the title attributes.
Setting some Sphinx options.
daily update, added westwind data crawling(data incomplete)
解决调用dll文件时，出现乱码的问题
move to evervolv libhardware and qcom_display
Escaped ampersand.
Improved stylability.
Dust.js template compiler support.
Replace makefile with rakefile

Add heroku integration spec (wip)
add whitespace, remove raw socket usage
vagrant setup for https://github.com/Pita/etherpad-lite
Homepage css, several css fixes. Part 1
visuals of poker table added
set MMC_BLOCK_MINORS from 8 to 32
update bionic patch
make List.take_while tail-recursive
fix interleave documentation + add test
splitting some long lines in test (more coming later)
batSubstring: fixed compare functions.

Fixed a bug in compare : compare (all s) (all s) would raise "index out of bounds".
Also switched the value returned to match the one of String.compare.
Merge pull request #259 from asmanur/master

Bugfix in BatSubstring.compare
LeicaSCNReader: Use correct IFD for z stacks

Use dimIFD to map correct IFD for subresolutions.
Can now move the camera independently.
Merge branch 'master' of github.com:rlyspn/Graphics_COMP5400
added mpi to path on vsp-compute-01
Add a fish collection spec.
Rebase from 'release/test_rospy' @ version '1.9.38'
Generated debian files for precise
Rebase from 'upstream' @ version '1.9.28'
Trimmed the branch to only the clients/roscpp sub directory
DH Publication
Site updated at 2012-12-04 05:51:26 UTC
put env var handeling in custom block