labofsahil/github-event-dataset-2012 huggingface dataset:
fixed attribute check for artgroup
Merge branch 'retoschneider' of https://github.com/naturwerk/naturvielfalt into ramongamma
include the map from area
include the css for the autocomplete field
Merge branch 'retoschneider' of https://github.com/naturwerk/naturvielfalt into ramongamma
Re-Formatted to our code style
layout update
on new search, reset the hidden fields
add status message on top
some functions for det method/attributes
add tabed menu (still not work)
layout update
hidden fields changed to textfields, but no showed, because the form
reset will not work for hidden fields
add id tags for html output
add detmethods&&attributes to the json answer
Merge branch 'retoschneider' of https://github.com/naturwerk/naturvielfalt into ramongamma
Add name to hidden fields.
Merge branch 'retoschneider' of https://github.com/naturwerk/naturvielfalt into ramongamma
Fix for last commit
beginning observation editing
add hidden geo fields
beginning editing observation
Merge branch 'retoschneider' of https://github.com/naturwerk/naturvielfalt into ramongamma
more fixes...but seg faults now...
worked out comparing tokens in the hashmap
add tpm2.net PoC implementation
Centralizing the Download directory
web version

Signed-off-by: hgun77 <hgun77@gmail.com>
going change plan. u-turn!

Signed-off-by: hgun77 <hgun77@gmail.com>
go back do...

Signed-off-by: hgun77 <hgun77@gmail.com>
let elaine test website version, even not yet complete

Signed-off-by: hgun77 <hgun77@gmail.com>
Merge branch 'dev'
added ajax-loading.png

Signed-off-by: hgun77 <hgun77@gmail.com>
nivo slider

Signed-off-by: hgun77 <hgun77@gmail.com>
something like jsonp

Signed-off-by: hgun77 <hgun77@gmail.com>
"

Signed-off-by: hgun77 <hgun77@gmail.com>
"

Signed-off-by: hgun77 <hgun77@gmail.com>
Remove video for the poster
Adding Cassandra support
Moved 'Definition of done'
Merge branch 'master' of https://github.com/nicolaikruger/BDSA-2012
Drupal root delted need to take build again
New drupal integration with spark & profiler
Adding lease_application controller and views
Adding old form for reference
add english traduction

add english traduction
Reverted from fubar state, no more loading atm
修改银行信息
修改薪资信息
添加修改页面的返回功能进行微调
添加资源的操作日志
添加资源的操作日志
Terminal ready for ballon launch
Blatt 4 geändert
Blatt 5 fast fertig

Weak Entities (doppelte Umrahmung zeichnen?)
Multiple valued attribute (doppelte Umrahmung zeichen?)
Blatt 5 überarbeitet

Weak Entities (doppelte Umrahmung in Tex zeichen) ?
Multiple-valued attribute (doppelte Umrahmung in Tex zeichnen) ?
Blatt 5 überarbeitet

Umrahmung Weak Entites + Multiple Valued Attributes in Tex
ScalaCLv3: use scalacl.Context more widely + smarter cache of Kernels
Added snippets for NUnit test fixtures and tests
Final Final Commit

Updated the notebook and created a README
modify execution
fixed template code indentation
bugfixes and hides admin tab based on ACL
cleanup on aisle 6 after merge disaster
Added pop3 check
Set connecttime value after verifying that the connection worked
Change name of 'header_Host' to 'exptected_certificate_name' for POP3 check and fix a couple of typos in documentation
Add extra check to make sure that the USER command succeeded before issuing a PASS command
Report failed USER status
Added message size as its own metric
Added HTTP Version configurability to the HTTP check
Added SSL support to Nginx check
Merge pull request #103 from pamaddox/master

Added POP3 Check, Added HTTP Version Control
gradient ok.
#378: Every box calls parent::options_form().

This is required for advanced settings to be handled properly.
Missed a line in last commit.  #1168
Found another small issue that has now since been corrected.  Issue pertained to the year selection, was selecting everything greater than the year entered in the parameter, I don't believe that was right so now it selects only publications from the entered year.  It still defaults to everything greater than or equal too the current year.
This issue was found while working on the port to D7
Added book plugin to sv list.  All it does is choose new view.
More box/context updates #144

Boxes import into the right place in the cp layout page.  They even get their labels added as info (labels were previously stripped out) if info is missing, fixing the Untitled widget problem we saw with #195.

Boxes still aren't necessarily showing up on the site.  I have a featured post box, site logo, and site info, but shield and search are MIA.  I should have a bio teaser, but that's not yet ported.  I'm also gaining a latest announcements, presumably from the preset.
Merge branch 'SCHOLAR-3-0' of github.com:openscholar/openscholar into SCHOLAR-3-0
Bigpic, Bunchy and Weft theme css (IE8) fixes
Missed adding user.inc to repo on Friday, #266
Merge branch 'SCHOLAR-3-0' of github.com:openscholar/openscholar into SCHOLAR-3-0
update vsite_menu_link_save to work when no override exists, should grab the default links from the ML table
OS migrate imports image galleries, preserving image order
Merge branch 'SCHOLAR-3-0' of github.com:openscholar/openscholar into SCHOLAR-3-0
Bug 880370
Merge pull request #979 from danmcp/master

Merged by openshift-bot
DFL-3496 Throws on bugfixes
Merge branch 'chrisk_bugfixes' into experimental
Set the correct flag.
Merge branch 'DFL-3356_maintenance' into experimental
Working on copy action.
Merge branch 'experimental' of github.com:operasoftware/dragonfly into experimental
Merged DFL-3356_maintenance to experimental.
[maven-release-plugin] prepare release web-1.0.12.1
updated documentation
update doc, add homepage
http now uses keywords :GET/:POST/:DELETE/etc instead of symbols GET/POST/DELETE/etc. they are a bit more portable across packages and easier to deal with, IMO. this will probably break a few things for some people.
fixing bug that was breaking http in tcp. draining an evbuffer wasnt actually saving the body data, making it always return nil.
Removed getclicky code, we're no longer using it.
added new languages: pt-pt and pt-br
moved share to linkedin and cia. to a class
Added runTECOworkflow function with subtasks
Fixed links on README. Added description
Changed greps to get texture to single join operation.
Added csv with reference textures.
Removed csvs from .gitignore.
Added checkstep
Fixed up the texture file (two pairs of textures had the same name)
Changed variable names to simplify code
Merge pull request #4 from sebastian-c/master

Somewhat dubious but doing it anyway
Added final update after finishing last team
response tests

Signed-off-by: Sam-Mauris Yong <mauris@hotmail.sg>
configuration mock and pView tests implementation

Signed-off-by: Sam-Mauris Yong <mauris@hotmail.sg>
pCommandParser tests implementations

Signed-off-by: Sam-Mauris Yong <mauris@hotmail.sg>
Add encoding: utf-8 to th.rb locale file.
Enhance Form Add
Enhance VIEW CSS
upd part2;
updating enum type + adding error handling when enum not complete
A workaround for the relative paths in the PHP code (mod_rewrite is still pending)
Finally got the mod_rewrite to work, fixed some of the related issues (soft link .htaccess from root directory is the way to go now)
Merge branch 'master' of https://github.com/pbelmans/stacks-website
APT Chapter 12 - Step #10
Updating onSave listener object in DetailForm to call the right
method (save() or update()) and finish() the activity
major updates to research page
logo fapdf
[PDI-8007] CQL queries using FIRST N or LIMIT clauses fail in Cassandra input due to parsing errors
[PDI-8008] Select * LIMIT N type queries in Cassandra input return 1 more row than expected when using Thrift I/O mode
Externalized some strings and a bit of a tidy up.
Merge pull request #20 from m-a-hall/master-cassandraCQLBug

[PDI-8007] [PDI-8008]
[PDI-7294] Create an AVRO step that is similar to the JSON Step
Merge pull request #16 from m-a-hall/1.3-avro

1.3 avro
Applying patch fix_make_distcheck against 5.2.0
added logging, converted spaces to tabs
Merge branch 'async-pika-refactor' of github.com:philchristensen/antioch into async-pika-refactor
Attempting to write a GitHub style readme.git
Merge branch 'pep8_cleanup' into cleanup

Conflicts:
	socketio/mixins.py
	socketio/namespace.py
Code for Issue #72
Wave of documentation.

Adds JsDoc comments for global/public elements.
No code changes.

See issue #274

git-svn-id: http://textpattern.googlecode.com/svn/development/4.x@4258 2fea6a4d-a838-0410-917b-93a53c48e9d2
Programming style and consistance.

Added some LFs, brackets, and sorted mixed indentation
characters.

git-svn-id: http://textpattern.googlecode.com/svn/development/4.x@4259 2fea6a4d-a838-0410-917b-93a53c48e9d2
Wave of documentation.

Adds phpDoc comments for global/public elements.
No code changes.

See issue #274

git-svn-id: http://textpattern.googlecode.com/svn/development/4.x@4260 2fea6a4d-a838-0410-917b-93a53c48e9d2
Programming style and consistency.

git-svn-id: http://textpattern.googlecode.com/svn/development/4.x@4261 2fea6a4d-a838-0410-917b-93a53c48e9d2
Wave of documentation.

Small example for filterSearch().

git-svn-id: http://textpattern.googlecode.com/svn/development/4.x@4262 2fea6a4d-a838-0410-917b-93a53c48e9d2
Wave of documentation.

Adds phpDoc comments for global/public elements.
No code changes.

See issue #274

git-svn-id: http://textpattern.googlecode.com/svn/development/4.x@4263 2fea6a4d-a838-0410-917b-93a53c48e9d2
Programming style and consistency.

Proper default value.

git-svn-id: http://textpattern.googlecode.com/svn/development/4.x@4264 2fea6a4d-a838-0410-917b-93a53c48e9d2
Programming style and consistency.

Few LFs, spaces and brackets.

git-svn-id: http://textpattern.googlecode.com/svn/development/4.x@4265 2fea6a4d-a838-0410-917b-93a53c48e9d2
Changed configuration method for the identity stores. Added more test cases.
Changed exception message when no identitystore was provided during the configuration.
Merge pull request #15 from pedroigor/master

See comments.
Added a box if no option does match the entered criteria
Removed the label "xxx displayed options" when every option matches the query
VS2010: add ../pioneer-thirdparty/win32 to include and lib paths

The repository is available at github.com/pioneerspacesim/pioneer-thirdparty
CHANGELOG for v0.3.2
Fix deserialisation of structs
Merge branch 'develop' of github.com:pixelballoon/pixelboost into develop
- cleanups, remaining pl etc.
setup all basic overlays in one step
Merge branch 'master' of git://github.com/plone/plone.app.toolbar
updates to 2028 bioterroism
removed the consoler logging from websockets, now that it seems like it's working
further isolate the Firefox longpolling hack
Bug Fix: paths now work between any range of points
Fixed #57
Fixed #56
Removed "Projectfork -" from sub menu strings
Fixed usage of deprecated db method in group access form field
Forms developments
Changed package name to rapture.html
Added solution to question 1.6
(Maint) Rename PuppetlabsSpec::Puppet{Seams,Internals}

The module PuppetlabsSpec::PuppetSeams has been renamed in the
puppetlabs_spec_helper gem to PuppetlabsSpec::PuppetInternals.

The method to obtain a scope object has also changed slightly.  Without
this patch the spec tests will fail because the stdlib module is not
aligned with the spec helper gem.  This patch fixes the problem by
matching up messages with their receivers in the spec helper library.

This change was made with:

    find * -type f -print0 | xargs -0 perl -pl -i -e 's/seams/Internals/gi'
    find * -type f -print0 | xargs -0 perl -pl -i -e 's/parser_scope/scope/gi'

Paired-with: Andrew Parker <andy@puppetlabs.com>
Merge branch 'maint/1.0rc/fix_spec_test_scope_issue' into 1.0rc

* maint/1.0rc/fix_spec_test_scope_issue:
  (Maint) Rename PuppetlabsSpec::Puppet{Seams,Internals}
Update Debian packaging rake task to correctly create the orig.tar.gz
Merge branch '1.0rc' into 1.x
Lots of feature additions
commit2 of featurex
code mirror portion now updates correctly
- core was updated to 2.3.9
file chooser i kontrolery
Merge branch 'master' of https://github.com/qbajas/Face-recognition
po mergu
Add option to start qbt with Windows startup.
Merge pull request #151 from sledgehammer999/windows_startup

Add option to start qbt with Windows startup.
First release into the world wild web!
Helper for passing input data to an NSTask.
Merge pull request #1127 from tiennou/nstask-addition

Helper for passing input data to an NSTask.
Http.get reencodes body, if needed
Adds test for URI.valid?
Removes obsolete code
Updates gems and textmate project
Version bump to 0.3.7
Manual merge
Version bump to 0.3.8
Regenerate gemspec for version 0.3.8
added barra
Merge branch 'master' of github.com:rafaelmohedano/SESCMove

* 'master' of github.com:rafaelmohedano/SESCMove:
  Ajustes Breadcrumb
deleting ph_preset_old
p1 of cpp
page 404 custom

avec photo
page qui sommes nous v1

photos des nains à revoir
page pitch
page team
remove strange log dir
added indiviual LED tests...
Este commit modifica el archivo index.php y sólo agrega el llamado al plugin WebDev Studio Category News Carousel
adding support for hasMany through
Update readme.
Rename readme
Fixed "vibe init".
Fixed unit tests for MongoDB URL parsing. See issue #93.
added a new class to handle type operations
import branch directory to test svn moves
test svn move
forgot a file, now in place, test commits
Require exactly Djblets 0.6.19.
Switch the diff uploading LocalSite API unit test to not use GitHub.

The DiffResourceTests.test_post_diffs_with_site was using a GitHub-based
repository, but this fails now with the new authentication. Since we
can't really ship any API tokens in our tests, just use the same
repository that test_post_diffs use, which is the subversion repository.
Merge branch 'release-1.6.x'
Added mongoid URL Prod
unicode.py: generate category data tables
zip: use the document reader API to parse ZIP documents
added the feature creation logic and tweaked the toolbar a bit.
Introduction about to complete
more weather icons!
modified Sampling.py
Merge branch 'master' of https://github.com/rmcgibbo/msmaccelerator
TJL added Nina's method, probably broke some stuff
Add section notepad to reminder email. closes #55
Email reminder for not seen item now displays empty list if no programme items have happened in the time looked at.
Improved next_question
Added a disclaimer...
arregla acciones a factor, termino y exp
agrega comparaciones a la gramatica
agrega clase Cuadruplo para generar cuadruplos
agrega codigo a acg para manejar fondo falso en cond :D
Add toys.
Dodanie kruskala - pokazuje najwieksze drzewo rozpinajace
Dodanie zbiorow rozlacznych, algorytmy kruskala, szukanie naiwne i haszowane w jednym pliku z obliczaniem czasu
added GPS3
Generalize parameter evolution alogorithm.
move resources in a more generic location
Aggiunto lavoro con matrice
Improve line wrapping behavior where message charset is changed by plugins (including html2plaintext conversion)
Always save drafts with format=flowed in order to keep original paragraphs and line wraps (#1488799)
Merge branch 'master' of github.com:roundcube/roundcubemail
Fix handling of LDAP values - support arrays (#1488604)
setup CNAME for facebook4j.org
Bloquea modals que faltan
Merge branch 'master' of ssh://git@github.com/rsantander06/OrgrupPlay.git
Arreglo diseño de mensajes
Merge branch 'master' of ssh://github.com/rsantander06/OrgrupPlay
Ordenamiento de vectores listo... mostrar por pantalla con errores
Merge branch 'master' of git@github.com:rsantander06/OrgrupPlay.git
Complted functionaility of if user can create album
Start pulling in date information onto the PullRequest object
Load more PullRequest data, including the proper (html_url) url for the browser
gi: support struct loading
win32: give up GObject Introspection cross compile :<
Various fixes and patches
Set new default icon.
Add a --quiet option.
fix cell reuse identifier in nib
another wild chrome try
fixed best_move_available method, join method
cleanup initialization and legacy mode detection
add gitignore to parent
SAK-22978 - Implement new grouped assignment retrieval method



git-svn-id: https://source.sakaiproject.org/svn/assignment/trunk@117608 66ffb92e-73f9-0310-93c1-f5514f145a0a
Все работает збс, только getDataForCheckisfilein слишком медленно
[add] section on NSA information imperialism
[add] major outline for CIA autonomy and divergence from governmental and general public responsibility
matrix sizes
update report
Add a Static pages controller
Finish Static Pages
Finish Static Pages
Improved system_info page
Merge branch 'master' of github.com:sanichi/icu_ratings_app
text change for identifying browser
display error on timeout/cancel connecting
display error message on timeout
accept command line launch with arguments
postgresql: adding ptop
Add Format.to_string.
remove bogus gem
added initial player sprite
Merge branch 'master' of https://github.com/schonstal/ludum-dare-24
Updating features to change layout of groups homepage
made some mistakes... still learning... [basically reverted horrible changes i made]
Merge pull request #4 from flyinprogramer/master

fix
Droppable: Use internal guid instead of jQuery.guid.
Droppable: Fixed intersect tolerance.
Droppable: Refactored touch tolerance.
Interaction: Rename position hash to pointerPosition and use x/y instead of left/top.
Droppable: Added TODOs.
Draggable: Pass pointer position in the ui hash for all events.
Droppable: Only react to drag events if they're not canceled. Fixed pointer intersection.
Droppable: Account for draggable helper when calculating proportions.
Draggable: Position helper in the same relative position as the original element, compared to the pointer.
Button: Properly handle disabled option on init. Fixes #8028 - Getting unset disabled option on button widget returns jQuery object, not default value.
Menu tests: Removed trigger option.
Position: Update fullname reference; jQuery => $. Fixes #8029 - Position: There is a reference to the global jQuery variable.
Merge pull request #564 from arhea/master

Tabs isLocal function was not compatible with HTML5 push state
Core: Access offsetHeight on div for support tests to avoid a layout bug in IE 9. Fixes #8026 - minHeight support test affects page layout in IE 9.
Sortable: Added a variable to track if initialization is complete. Fixes #4759 - a major optimization is possible in sortable().
Merge pull request #570 from clear00/master

Datepicker i18n: Fix some issues on the Korean translation
Merge pull request #569 from ryanolton/master

Fixed #5818 - multiple DatePickers won't trigger close event
Datepicker i18n: Fixed Macedonian date format. Fixes #8040 - Datepicker: Macedonian locale has incorrect date format.
Draggable: Added start positions to ui hashes in events.
Draggable: Don't change position on drag stop.
Remove Sass cache from repo.
Merge pull request #5 from Kaelig/patch-1

Thanks, tons of cleanup and work to do to get this to beta. This helps.
Remove Sass cache from repo.
增加备案信息

增加备案信息
Adding back removal of slide show.
ocaml-inotify -> inotify.  added md5sums to inotify, omake-mode
Build out of Java-friendly swagger classes… does not compile.
new parser of vacation inside of actions, changes on Creating objects
ignore
new version
fix get_task and find_user
Point3d class extracted
added some view detail
LPS-15605
LPS-15605
LPS-15605 Test Formatting
LPS-29253
LPS-29253 Test Formatting
LPS-29253 Test Formatting
LPS-29286 Added translation to breadcrumb entry for Documents and Media portlet.
LPS-29286 Source Formatting
LPS-29310
LPS-29310
LPS-29310
LPS-29289 Typo on method call
LPS-28502 Document properties for schedulers
LPS-28502 Source formatting
LPS-29257 Pagination inconsistencies in Announcements portlet
LPS-29320 Document & Media Portlet Search returns inconsistent results
LPS-29320 Source formatting
fix exceptions when there are no targets and bros
Merge pull request #6 from nashby/patch-9

fix exceptions when there are no targets and bros
add new auto_load option for mutli bundle mode
Updated images
m
Prepared find server with player, or with server name. refs #31614
[header] fixed constants
[verilog] fixed header file
[verilog] changed IO names
Added a few enemies...
Material + DUMP
Merge branch 'master' of https://github.com/skosta/portal_academico
OR1K: add directive to add ".section" before ".bss"
Added Skroutzstore web-shop app to apps.rb
changed static to dynamic page
qmake: Build tools as part of the project

md2tool, wadtool and texc are now included in doomsday.pro, unless
qmake config contains "deng_notools".

Todo: Check installation for Windows and Unix.
md2tool|Unix: Fixed missing header include
Clean up the cleanup method
disable liking of websites until implemented
Restructured test code.
Adjust style for directory
added probabilityToSnpMatrix and 2 unit tests
reorded some lines of probabilityToSnpMatrix to improve clarity
cookies party
changed to show branch
Agregando todas las fotos.
Updated link to video docs outline.
Missin' a comma
Merge branch 'jenkins_agent_class'
Ayman Commit:  committing for Ayman since he's not able to get the push to Github working.  Note:  In addition to the BizCollege web application changes, there were a couple of changes to the Data layer domain that need to be applied to the db schema and unit tested (Miguel will make these changes)
Fixed things not rendering for android.
Merge branch 'master' into premium
Revert "adding getCommentCount() to contentRenderer as a helper method"

This reverts commit 1a37bb68dcf4deb9b22a2414097aab4b66721fc2.
gh-2182 Pkg file delete should not require a local copy of the pkg file

Signed-off-by: Stuart Ort <stuart.ort@lexisnexis.com>
Adds BackboneJS to the web development index.
Remove regular expression flag
Added tedfile from ted
changed results.html
Merge branch 'master' of github.com:stuycs-ml7/project1-pd6
k
Merge branch 'master' of https://github.com/stuycs-ml7/project1-pd6

Conflicts:
	Group0/appTesting.py
better README added; no real changes to code
UNO put back into GROUP_1. I guess we'll be GROUP_1 again for now.
Merge branch 'master' of https://github.com/stuycs-ml7/project1-pd7
adding templates
Merge branch 'master' of github.com:stuycs-ml7/project2-pd6
Update Group4/templates/login2.html
failing test for (require)("skipme")
fix (require)("skipme")
First run of changes to the events template.
Changes for AccelService
Added survey_state model, migration, modified user model
Merge branch 'hackathon' of https://github.com/switchboard/switchboard into hackathon

Conflicts:
	db/migrate/20120428163342_create_survey_states.rb
Removed useless branch alias for dev-master in composer.json
Fixed a typo
Merge branch '2.1'

* 2.1:
  fixed CS
  fixed CS
  [Security] fixed path info encoding (closes #6040, closes #5695)
  [HttpFoundation] added some tests for the previous merge and removed dead code (closes #6037)
  Improved Cache-Control header when no-cache is sent
  removed unneeded comment
  Fix to allow null values in labels array
  fix date in changelog
  removed the Travis icon (as this is not stable enough -- many false positive, closes #6186)
  Revert "merged branch gajdaw/finder_splfileinfo_fpassthu (PR #4751)" (closes #6224)
  Fixed a typo
  Fixed: HeaderBag::parseCacheControl() not parsing quoted zero correctly
  [Form] Fix const inside an anonymous function
  [Config] Loader::import must return imported data
  [DoctrineBridge] Fixed caching in DoctrineType when "choices" or "preferred_choices" is passed
  [Form] Fixed the default value of "format" in DateType to DateType::DEFAULT_FORMAT if "widget" is not "single_text"
  [HttpFoundation] fixed a small regression

Conflicts:
	src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/MongoDbSessionHandlerTest.php
fixed CS
Display bug fix. Now the progress bar should correctly show 100% (but
the fix is very ugly)
site remembers last site
Bugfix in the installer and LSB compliant init script
finished refactoring auction
Load ajax on buttonclick (setday)
Introduce user-installable textfilters.

Implement plain text, nl2br, and Textile as core textfilters. Introduce a 'textfilter'.'register' event to integrate custom textfilter plugins, and a 'textfilter'.'filter' event to interface with custom pre- and postprocessing plugins. 

See https://github.com/rwetzlmayr/wet_textfilter_markdown for a plugin sample with a Markdown textfilter and a sample preprocessor/postprocessor.
  
 Fixes issue 204.


git-svn-id: http://textpattern.googlecode.com/svn/development/4.x@4115 2fea6a4d-a838-0410-917b-93a53c48e9d2
Use Hive as fallback instead of Classic. Thanks Gocom.

git-svn-id: http://textpattern.googlecode.com/svn/development/4.x@4174 2fea6a4d-a838-0410-917b-93a53c48e9d2
$failed isn't used.

git-svn-id: http://textpattern.googlecode.com/svn/development/4.x@4906 2fea6a4d-a838-0410-917b-93a53c48e9d2
Programming style.

git-svn-id: http://textpattern.googlecode.com/svn/development/4.x@4560 2fea6a4d-a838-0410-917b-93a53c48e9d2
cm: New boot animation from Cameron Behzadpour

 * Promo video here: http://www.youtube.com/watch?v=ogp9f4_yEoU
 * It looks *way* better on a device, though :)
 * The animation is square, so the names have changed.

Change-Id: I8eebdf29a7d30632d75210a6d3975d7ea17d5246
Add moto targets
Add moto targets
add a10 target
Merge branch 'jellybean' of github.com:Quarx2k/android_vendor_cm into jellybean

Conflicts:
	jenkins-build-targets
Merge remote-tracking branch 'cyan/jellybean' into jellybean

Conflicts:
	config/common_full_phone.mk
	config/common_full_tablet_wifionly.mk
	config/common_mini_phone.mk
	jenkins-build-targets
fixes
add 1200x600 bootanimation
Merge remote-tracking branch 'cyan/jellybean' into jellybean
Merge remote-tracking branch 'cyan/jellybean' into jellybean
Merge remote-tracking branch 'cyan/jellybean' into jellybean
Merge remote-tracking branch 'cyan/jellybean' into jellybean

Conflicts:
	jenkins-build-targets
Merge remote-tracking branch 'cyan/jellybean' into jellybean
Merge remote-tracking branch 'cyan/jellybean' into jellybean

Conflicts:
	config/common.mk
	config/common_full_phone.mk
	config/common_full_tablet_wifionly.mk
disable no needed packages
Merge remote-tracking branch 'cyan/jellybean' into jellybean
Merge remote-tracking branch 'cyan/jellybean' into jellybean
Update ubuntu/README.markdown
Added test for fetching url by ontology mapping count service.
Added docstrings for messages
fix a command
fix an added typo
name revision file "REVISION", not ".revision"
Refers Ubuntu
Got a simple framework in place for managing a custom map. For now, it just loads adefault mapbox map, but it can now be extended to do more interesting stuff.
Changed address display
Bumped version
Add ability to register custom strategies
Clean up Registry decorator
删除了test，增加了rspec
增加了分类页面
update annotation
Revert "Fixed errors for data in java-source that is not analysed yet"

This reverts commit 3eb833acaf4f5c5168a6782191fdfcc9743db510.
Revert "update annotation"

This reverts commit 44f8aa336daa377ef6f54718d7fa3a6561dd008e.
Add convenience routines for basic What section.
[maven-release-plugin] prepare release ohim-maven-skin-1.5
[maven-release-plugin] prepare for next development iteration
issue #74 added skeleton for Admin view and AdminViewModel
issue #74 added styles for inquiry card in Acmin view (from Week view)
issue #74 edited unit test for Admin action of Inquiries controller
issue #74 added implementation of Admin action of Inquiries controller
issue #74 fixed Admin view
issue #77 added Move to sub-menu item to context menu for inquiry in Admin view
issue #77 added Employee property to AdminViewModel, added Assign to sub-menu item to context menu in Admin view
issue #77 added Add comment sub-menu item to context menu of inquiry in Admin view
issue #77 added Tags property to AdminViewModel and Add tag sub-menu item to context menu of inquiry in Admin view
deleted unused action method and view
fixed data base name
Daily Commit 2012-05-16
[#38161165] READMEをアプリの説明に変更した．
ru version
min-height
min-height
min-width
com version
Merge branch 'master' of https://github.com/tohojo/image-processing
Messed around more with camera calibration, added some notes on it.
Add "View" menu to re-enable closed dock widgets.
Make close/open of docks work properly.
Dock widgets show/hide working w/state restore.
Save/restore state on open/close of main window.
Fixed initiative reset bug
上行删除动作同步
skelton generated all services.
oops , i miss hmacsha1.js
AWS.request working
Fixing the mediafront demo 2.x
залил стили для поп окна "напишите нам"
More changes basic changes to the type. Added basic beginings of what will be a provider.
removed facebook-stuff related to the party-promotion (no more wallpostings and no joining the event, still have to supply basic permissions to set username and fbid)
Better explanation why delay is used.
Changes for kylian's foodstore
Add Fine Dress and its dyed variants
New maps for Waric and Orum quest. + minimaps
Changes on existing maps for Waric and Orum Quest + adding warps to new maps (055, 056)
Add Warlord Boots made by Ali-G.
Collision Fixes, Warp fixes
Fix the drop shadow styling for the footer.
Incredibly close to a version 1.0!
The search is working much better now. The features that I want are in place. Um... testing, but then I just might be ready to launch!
Bumping versions of depenedencies and plugins
gitignore file
Fixed alignment issue on admin table
Add supplies.
Resolve conflicts.
implement RESTController
Added link to Heroku App on README
Merge branch 'master' of github.com:unobliged/EDICT2_Parser
stateの状態遷移についてのコメントを分かりやすく修正
コメント修正
Added command line option for labelprop resolver, added stub LabelPropResolver.
vetoed song doesnotexist
DbRef, BsonRegexp json serialization.
Update compiler script
Update defconfig
Update build flags
added swap cards
Merge pull request #1 from valentinzberea/ilinca

added swap cards
move syntax settings to the root
Added a check on the len of the note, max 253 char
renamed some files
file renamed to english
Deleted raster image files. That was nonsense...
created model user and school ...

added between the user model, school and contact information.
created models hall, group, training_place

added relationship
add model timetable

revised the connection between models
created models

added four
Merge branch 'db_create_school_group' into develop
Merge branch 'db_create_tournament_group' into develop
added new models

created a new model and the relationships between them.
fix

fixed connection between the models. Modify the fields in the models.
fix
added new model
added model in db_create_rating_group branch
Merge branch 'db_create_rating_group' into develop
models finished
first page

connected the bootstrap and created a controller user
Merge branch 'develop'
Added "exit' button's procedure
relative heigth
test kalee
[ENH] Add mesh triangulator (2D meshes only for now)
[ENH] Subdivide hexahedra in the triangulator
[ENH] Mesh triangulator splits Quad3D surface patches
[ENH] Add store_timings signal to Component
[ENH] raise_mesh_loaded is callable as signal
[ENH] UFEM NavierStokes specializations are optional
[ENH] Add ptest for UFEM assembly performance
[FIX] Utest compile error
[ENH] Mesh triangulator works in parallel
Merge ../branches/coolfluid3
mkdir fix
devConfSaveCisco.sh worked
devConfSaveCisco.sh worked
Starting to work out a dependency resolver. Only supports GitHub so far, but trying to make the interface simple enough that a new tpye is easily achievable. This is just a weigh point.
Updated PF App to use VoxCommands dll
New android support library
- fixed illegal update in non-UI thread in BackLoading list
Merge branch 'master' into API10
lint the app.js
Status Bar: Fix title string

* Move title string back onscreen
  (Should scale better now)
* Scale status bar background

Open-webOS-DCO-1.0-Signed-off-by: Josh Palmer <jpalmerwatkins@me.com>
QML UI Scaling: Fix multiple definition errors

* All QML components now function
  (And I've learned my lesson about find & replace)

Open-WebOS-DCO-1.0-Signed-Off-By: Josh Palmer <jpalmerwatkins@me.com>
Update templates/bbcode.html
Merge pull request #1 from xxxrenegade/patch-1

Update templates/bbcode.html
Adding getLoadedText function
Added config.yaml to .gitignore
make process bar
the training ui
add serial code for ATMega__8
Remove list line-height
Fix label line-height
dfadsfd
fixed bug when empty recipient_list and setup.py packages
Basic APT9 functionality added. Thread pauses and resumes on interrupt.
cleanup mongoid branch
Added manifest.mf, .properties. pom.xml to ignore list
first aid now can be shot and appear above ground properly
got the basic outline of the area area down
finished doing the full background layer thing including bathrooms
create select ui framework
增加Select组件样式
Mark implemented questions as "DONE".
Add Right Swipe Gesture to MWPhotoBrowser
add a message about SSL
[Improvement] limited test gems to development and test environment
[Improvement] adapted build_resource call for creating new session according to Devise 2.1
my first commit
Merge branch 'master' of https://github.com/yupengfei/my-colornames
loni-student X
fixed
Fixed HTML formatting on all pages
additional retry code paths, always reset retry count on successful connection
整理代码缩进
Stereo: Check if stereo triangulation succeeded before checking if the triangulated point is in front of the cameras
Stereo: Chick if the triangulated point is in front of the second camera ass well
Remove warnings and spelling, minor cleanup
disparitydebug: Allow user to set normalization range

This is useful for comparison of many disparities.
configure: Add GDAL as a direct dependency of ASP

We use some features of GDAL that we don't acquire through VW. This
requires us to list GDAL directly as a dependency on Ubuntu 12.04. No
free lunches on dependences.
Changes travis
http status code detecting
Ignore temporary files and artifacts
Add some more info
add README
edited gitignore concerning the handling of netbeans project files
added the possibility to pass label: '' as option in tags, which cause the absence of label in html output
Prevent bot spam
Test setup: Loads also AccessControl's meta.zcml, because the permission.zcml uses now the role directive.
Update workflow
Merge pull request #3 from 4teamwork/es_update_wf_from_izug

Update workflow
almost ready. most stuff works.
almost ready. most stuff works.
added manifest and compiled version
select.mk: Tune ccache options

With these adjustments, cached object files can now be shared across
multiple Android trees on a single workstation:

* Compiler binary modification time no longer causes cache misses,
  as a hash of the compiler binary is taken rather than looking
  at the mtime and size
* Header file modification time no longer causes cache misses,
  the headers are now always hashed
* Macros such as __DATE__ and __TIME__ no longer cause cache misses
* All paths in preprocessed source (due to use of -g) are now relative

These options require ccache 3.1 or later to be used; ccache 2.4 will
ignore these.

Change-Id: I7839637e9dacf7240bd9b7bfaa6406b1db423560
Signed-off-by: Andrew Boie <andrew.p.boie@intel.com>
Merge branch 'jb' of https://github.com/AOKP/android_build into jb
its in apps
AOKPCB
basic template that isn't gross
small style fix to make error pages a little prettier
Merge pull request #15 from haaksmash/feature/15-500-handler

500 handler
added User object
Merge branch 'master' of github.com:AdamSaleh/TcmsRpcLibrary
Se invirtio el video con un metodo implementado
renvoie des tests
Tab selection on page load
ticket_4 tests for context proc
Hole validation added to OrderlyCreationOfDirs
SketchForce Organization Update
I did stuff :D
Merged manually; Conflicts
Fixes for ancestor lookup when arriving at Class.
Make some options for user_timeline and search API available.

search:
- lang: omit 'en' by default
- result_type: change type
- until: add a date
- include_entities: create an entities node

user_timeline:
- trim_user: omit the user object
fetch all pages (via cursor) for GetFriends and GetFollowers
basic requirements file for pip
added requirements.txt note
Merge branch 'master' of git://github.com/ianozsvald/python-twitter
add user option to GetFollowers so it has the same interface as GetFriends
Merge pull request #14 from ianozsvald/master

Allow GetFriends and GetFollowers to fetch all friends and followers
Merge pull request #9 from larsweiler/master

Make some more options for search and user_timeline API available
fixed GetFollowers test by removing the invalid parameter.
adjusted GetFollowers() to handle the return from the API properly.

https://github.com/bear/python-twitter/issues/6
Removing GetPublicTimeline - it is deprecated and doesn't exist even
v1.1 API
https://github.com/bear/python-twitter/issues/13
cleaned up the compiler errors and begun moving arguments to a vector to manipulate while parsing
testing for the argument vector finished, now beginning argument parsing again
swapping out the for loops
finished a base version of argument handling (only hardcoded flags so far)
working on help function and changed the flags so only one ouput flag can be given
updata index and css
add rss submodule
descriptions for articles
tweak css
fix date sorting
fix mouseup
add xml creator
rss submodule
Imma slacker :P
Fixed color skew during white fade-in
updated todo list
HistoryToDBViewer v2.2
use :user_name attribute
reading in myanmar part one
GATEWAY-2639 changes to regression suite for 3.3.1.1 release
Merge commit '621e41806c19150c9ac292477f54e21c198c6ac8' into 3.3
HttpClient class.
HttpParser class.
Changed the order of floor and time.
Project update.
update dependencies to hadoop 1.0.+
rename shell script to load, fix tests, fix selfupdate feature
Quote event names for event model detection in IE.
Some detail regarding device filtering in the readme
a few new pvp strings

also, readme changes again
Optimized collisions.GridCell.add_entering slightly

-Used itertools and generator expressions
Slight code cleanups

-Mostly relating to whitespace and declaration alignments
GameObject no longer executes update()

-It doesn't hold a dict() anymore either
Fully moved ufo.STATES to the UFO class

-Also made Enemy speed increase as the game lasts longer
Slightly optimized color.py

-colorsurface declaration is cleaner
-Added WHITE to Colors (but not to Colors.LIST)
Began creating a statechart for the game's flow

-It's quite messy and far from complete or useful
Merge

Signed-off-by: Austris Landmanis <aus3ys@gmail.com>
improved hover effects + decreased amount of header img. fade
migrated blog metadata storage from local to DB
cleaning up unnecessary Config metadata storage
fixed copyright metadata not loading from DB
Remove comma between categories on proposal.
My DatabaseManager.java is out of sync.
Replaced list initialization and immediate list->set conversion with a simple set initialization.

>>> {1,2} == set([1,2])
True
Site updated at 2012-07-09 03:57:06 UTC
Site updated at 2012-07-09 03:57:48 UTC
- Fixed #80 - File tab goes back to Home tab when BE loses its focus
- Ref #96 - Bugs and Suggestions for Beta 1 - Fixed Search location problem
- Fixed #90 - Search location won't change
Generated documentation for 5674ab5ae46f7ea9faf09fd198bb821b9dcfea09
changed default exception to file not found exception
changed default exception to invalid argument exception
changed default exception to invalid argument exception
changed default exception to invalid argument exception
changed default exception to invalid argument exception
moved tmp dir
updated todo for 0.8.5
remove unknown blog_entries trigger
updated phpdoc for method remove
merged status into executor
merged statistics into queue
removed old files
removed status & statistics calls
fixed status & statistics calls after refactory
fixed status & statistics calls after refactory
fixed status & statistics calls after refactory
do not use process id for the daemon ipc name
Refactored daemon state IPC usage

- Removed Statistics & Status dependencies (merged into queue & executor)
- Used IPC Factory in stead of manually initializing IPC components
updated tasks lists
added phpdoc & removed unused methods
Ajout Thread et amélioration interface choix nombre de Joueurs
Decode messages before logging them
Updated to depend on ResourceLoader
Updated so that reports now work for Spring based test cases as well.
Updated to move to the latest report jrxml file
fixed AddScreen, dragging via qml, removed drogbar

:D
* fixed flatness and darkness tools when switching characters
* flatness tool opens by CTRL+F in addition to CTRL+L
* darkness tool opens by CTRL+D.
added button to get back to previous craft if you clicked on ingredient in craft window
Initial commit with fresh Symfony2 Project Structure
whereima < geo.php
Test commit for branching

Signed-off-by: Peter Mårtensson <veritas.is.me@gmail.com>
Started event based state changing. Added overridable events to GameState.cs.

Signed-off-by: Peter Mårtensson <veritas.is.me@gmail.com>
Merge branch 'dev' of https://github.com/FooKittens/Team_Practice into StateMachine

Conflicts:
	Teamcollab/Teamcollab/Managers/StateManager.cs
First version of statemanager completed. State changes working. StateManager is now used on game launch.

Signed-off-by: Peter Mårtensson <veritas.is.me@gmail.com>
Minor fixes
Initial prototype
First version of statemanager completed. State changes working. StateManager is now used on game launch.

Signed-off-by: Peter Mårtensson <veritas.is.me@gmail.com>
Merge commit 'ce8483c677922064fea61f693a0f5d85be9b6dac' into StateMachine
Merge remote-tracking branch 'remotes/origin/dev' into dev
index on InputManager: c626436 Fixed edge case in InputManager.KeyAnyNewDown
On InputManager: Stashed changes in menustate
Merge commit 'stash' into StateMachine

Conflicts:
	Teamcollab/Teamcollab/GameStates/MenuState.cs
Merge branch 'InputManager' into dev
Merge branch 'StateMachine' into dev
Revert "Merge commit 'stash' into StateMachine"

This reverts commit 14c33964e746421c9c2003947a43d937b5092452, reversing
changes made to 05b658d1febbbfe12eae651e9209f88478a0d02f.
fixed buggy residual inclusion of kmax in kwargs, caught by doxygen
(#166)
Made Add constructor take either a list, 2 GSObjects, or 1 GSObject.  Also added the __add__ method for GSObject to return an Add object
(#86)
Switched Demo.py to use the + operator for adding two atmospheric PSF components.
(#86)
Added obj*x and obj*=x to change flux.  Also improved multiple constructor implementation for Add and Convolve
(#86)
Added tests for new a+b, etc. functionality, and added other tests that should have been there already for GSObject stuff
(#86)
Added tests for regular applyShear
(#86)
Added obj += obj2 syntax
(#86)
Adjusted usage of atmos_a + atmos_b in Demo script to use the flux-weighted version, which I think is a bit nicer.
(#86)
Merge pull request #110 from GalSim-developers/#86

#86 ready for code review
AP_IMU: make unimplemented IMU class members pure virtual
AP_IMU_INS: improved console reporting
IMU_MPU6000_test: fix for barometer, now checks accel calibration as well
AP_HAL_AVR: Do not init HAL's dataflash
ArduPlane: init DataFlash obj
AP_HAL: remove Dataflash driver
AP_HAL_AVR: remove Dataflash driver
TMI in good form
later changes
conflicts resolved
Site updated at 2012-10-29 14:25:31 UTC
added actual move function

* should be updated when LOS is also
itemoptions
all internal engines do shallow queries
* Fix for script failing for missing embedded files when using crypted stamps.
OSX Build Tweaks

Changed location of dylib (as building with make files).
Removed MacSetRect and SetRect (as not supported by 1.8 SDK).

Signed-off-by: Gordon Smith <gordonjsmith@gmail.com>
Use configuration name in build target.
Boost use static libs on windows.
Fire events should take const references when possible.
Scroll wheel direction was wrong (was fixed in X11 base layer in FireBreath)

Signed-off-by: Gordon Smith <gordon.smith@lexisnexis.com>
www.gradzi.ca
more improvements in extensions.py and several other modules; also, added the stack_fields method in Particles class, which is useful to pack data together before send it to the kernel function.
Viljens Triumf fix
Merge remote-tracking branch 'origin/master' into HendryBranch
asdf
article comment
Merge remote-tracking branch 'origin/HendryBranch'
Y stage base almost complete.
Added Motor Controller updated files
Added motor controller *needs tracks *gerbers coming soon
Disable debugging code.
major refactoring, documenting and renaming
update mq_deploy.rb to load default capistrano
Site updated at 2012-08-24 01:31:59 UTC
Proposed changes for the API to work with Facebook OAuth v2. Instructions on 'CakePHP-Api-Datasources' project
杀掉尾随空白、重构第二章

尊敬的提交审阅者  你好，

本次提交重构了 Ansi Common Lisp 译文的第二章，

杀掉了 第二、四章文件内的尾随空白。

你谦卑的仆人,

台北小码农 Juanito Fatas Huang 于台北 <katehuang0320@gmail.com>
moving samples to one solution
added phone support, went async
worked on phone sample
changed all config to Config.cs file
moved to getting config from env
Revert "Also with you"

This reverts commit 48d61875d4a5a2f4dc6c29ee757110c15463a254.
Update default.xml

I will make you work soon...
AbstractFactories #2
Repopulate Twitter node if degree == 0
Merge branch 'master' into entropy
Ignore Eclipse project files
minor changes (format, variable names, logs...)
Creation of a sampl app, taken from EmailAlbum's photo picker
[Composer]: Bundle now required symfony/symfony
Simplify factory; Serialize providerKey
correct gitignore
Added Mrc, Odnoklassniki, Vk providers
Patched dispatcher.h to compile with new containers
Reformat

Just don't want to hide changes in previous commit
Merge pull request #2 from Dema/master

Пропатчил dispatcher.h т.к. исчез тип Queue, Сделал вместо него RingBufferPO2
Updated routes for home page, deleted public/index file, removed '' from visit ..._path
Forced commit due to shared drive between computers.
Remote conflict merge.
forgot implement it on the reducer and fixed a nullexception bug
When image gets resized, a new image file will be created with the corresponding width and height
21cake data ready
Parser & Qt pro

Upload parser's cpp file and Qt project file for making lib.
Parser H; UTF8; Fix

New: Compiled with parser
Fixed: Recoded h and cpp to utf8;
Fixed: wchar_t to ushort converting
Merge branch 'Kolun/master'

Conflicts:
	src/parser.cpp
	src/parser.h
	test_plugin.pro
Updated Makefile to new MP
Initial commit. Includes IO Threads for UCI.
added test stub
documented parameter
simulated root package in tests
implemented test
implemented tests
changed variable name
added attribute declaration
added possibility to overwrite paths in root package
removed unnecessary isset() call
added comments
Updating user last_activity should work now
Checking out new collab-panel submodule.
Update user_guide_src/source/libraries/javascript.rst
Merge pull request #1892 from kitsched/patch-1

Fix for issue #1891
Fix user guide typos [ci skip]
Session Native, respect cookie settings

Respect config settings for cookie_secure and cookie_httponly

Signed-off-by: GDmac <grdalenoort@gmail.com>
Native PHP Session, don't regenerate session_id during ajax

Signed-off-by: GDmac <grdalenoort@gmail.com>
Cookie helper testsuite
Added captcha helper test

Note, test isn't implemented

Signed-off-by: Alex Bilbie <alex@alexbilbie.com>
Added download helper test

Note, test isn't implemented

Signed-off-by: Alex Bilbie <alex@alexbilbie.com>
Added language helper unit test

Signed-off-by: Alex Bilbie <alex@alexbilbie.com>
Added security helper unit test

Signed-off-by: Alex Bilbie <alex@alexbilbie.com>
session native, fix cookie settings

Signed-off-by: GDmac <grdalenoort@gmail.com>
Updated composer.json to use official PHPUnit package

Signed-off-by: Alex Bilbie <alex@alexbilbie.com>
Merge pull request #1894 from GDmac/develop

Session Native, respect cookie settings
Fix issue #1897
Remove redundant comments and commented-out code. Done with #2265.
Correct (?) image copying rake task. #2266.

The cap script uses this path and its newer than the rake task, so I assume
this is the current correct path.

Also made better use of the capabilities of a Pathname.
Use deployed rake task for copying images. Closes #2266.

This ensures that the configuration on the server will be used.
`deploy:symlink` is gone. Closes #2265.

It was removed in Capistrano 2.11.0. Discussion in the changelog indicates
that deploy:finalize_update is what we should be hooking into.
Use current_release instead of current_path. Done with #2265.

`current_release` points to the actual `releases/TIMESTAMP` directory.
`current_path` points to the symlink. This makes `current_release` more
useful, since it points to the new deployment before the symlink is actually
switched over.
Link surveys on cases deployment. Closes #2264.
Update fieldwork schema.