labofsahil/github-event-dataset-2012 huggingface dataset:
Corregidos algunos errores en los servicios web
Merge pull request #11 from rbrodyr/master

Probados los servicios obtenerLocalesCiudad y obtenerEventosLocal
Merge remote-tracking branch 'oficial/master'
Añadido el permiso Android de acceso a Internet.
Cambiado el tipo de idLocal a int.
Implementadas las actividades de locales, eventos y detalles del evento.
updated clean task
updated build file
Foto ajustada
documenting plugin usage
refactored testing; added testing for update and delete actions
updated tests
connman: follow oe-core to 0.79

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
systemd-compat-units: rename service to run postinst scripts

OE-Core uses run-postinsts script to trigger package configuration on
first boot so the service ought to be named the same, for consistency.

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
ristretto: update to 0.3.5

run tested on overo

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
xarchiver: add bzip2 to RRECOMMENDS_${PN}

error message for *.tar.bz2 was
tar: Error is not recoverable: exiting now
tar: Child returned status 2
tar (child): Error is not recoverable: exiting now
tar (child): bzip2: Cannot exec: No such file or directory

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
xarchiver: add unzip to RRECOMMENDS_${PN}

opening *.zip caused:
Failed to execute child process "zipinfo" (No such file or directory)

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
openbox: update to 3.5.0

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Merge remote-tracking branch 'upstream/master'
updating bin
adding name and mapping mouse coordinates to web app resolution (only works with 1 monitor)
Added a clarification to the readme
remove ep_supported_mods code
add composer.json
update composer.json for new zm plugin installer
Better start effect (white action bar style)
Removed test code at bottom of PHPBenchTime.php
same as before, fixed some thing based on jshint
Now pdf output replaces response content instead of being appended to
it.
added vim swap files  to .gitignore
added pdfname option
Added some searching functionality
cleaned up CSS
REST api for getting track waypoints. Drawing them to the canvas is
still a problem, AJAX request for each mouse move is a bit too intense..
Should probably store the waypoints in the DOM or a global JS variable.
Introduce CommandSystem
Use CommandSystem in Application
Added missing assembly file
Call setMeasuredDimension() in onMeasure()
Use a FrameLayout instead of a LinearLayout

LinearLayout is overkill.
Modificaciones 21/11/21012
Add `short` alias for a script showing common shortcuts
MoveUp/Down fix
Fix user forms
Adding test on project management
Improve composer.json & update deps
Merge branch 'improve-tests' into develop
Add config form
Update deps
Trying to fix tests
You had nothing to do here stupid copy
fix to join selections by "\n"
Added support for data-json-path on data provided by view-model.
add Weaklensing.tex
Add find a grave link

FS records: check for 'first name' and 'last name' before defaulting to
'name'
Add link for billion graves

Fix findagrave's name it uses for registering the link builder (forgot
to change the example name)
开始页面重构
fix example
implement key.accel argument with add_keybinding method
Added some brackets.

Logic inside alarm time check was incorrect without them.
Revert "Revert "added contact info cards, expanded on swap game""

This reverts commit d42139fd72445277b7158b6be472dc326566c161.
Refactored the index page to render the matrix
Merge branch 'master' of git://github.com/adaptives/competencies
change ctrlp.vim's ctrlp_working_path_mode from 2 to 0
Throw away ONBSocket. We don't use it and don't intend to.
Rip out old gzip data routines; nothing's using them in CK any more.
Started on inotify implementation + cmake build files
bytestring modify
Merge branch 'mysql-simple'
Shorter name for translation table(Oracle issue)
Translata select.
Remove junk checks and roles.
tutorial koydm
enable dynamic linking for FFI
Merge pull request #60 from eagletmt/ffi-link

Enable dynamic linking for FFI
Merge branch 'release/0.0.28' into develop
generic application forms for admin exhibitors
admin applications form
bump da version
Merge branch 'release/0.0.29'
Slides for VSLive Orlando
Updated to handle authentication redirects and dummy index/login page right now
adding the domain!
Init commit for Archlinux env
Add tmux config file
update .tmux.conf
add urxvt config .Xresources
Splite .bashrc to .bash_common and .bash_funcs
rm .bash_profile
commnet input method in .bashrc
rm .bashrc in master branch
Merge from master
Added Horizontal cells to main view. next version adds horizontal cells to appointments - date view
fixed multithreading debug in redis cluster.
Cleaned files up an added comments.
Tweaked the 'data' param docs to indicate that a file-like object is also supported.
Updated API docs for 'data' param in sessions module to indicate that file-like object is also supported.
Merge pull request #1052 from hozn/apidocs-tweak

Small tweak to API docs to indicate that file-like object supported for data param.
Finished order emails, with copy sent to person ordering.
Extended header image to fit widescreen browsers
Extended header image to fit widescreen browsers
switched from static header and footer to fluid page layout
Includes compiled lisp in the ignore filter.
Renames candy-chain-theme → color-theme-candy-chain
added newer level 0 and level 1 block diagrams to design section of final slides
Merge branch 'master' of github.com:killerfriend/womprats
Albert_Einstein.xml added to data
nil string bug fix
Update for another table
Broke up index.html into multiple pages
initial edit of the readme

Removed the _s-related content.
Meta Commit Style
Remove displayedModel
debian ubuntu packaging contraption scripts
support loading jpgs
Updating gemfile to use pg instead of sqlite3
Added the linking.
fixes an error when trying to get followers.

I think this happened because data is not an array but json, and the
users array i inside the users key.
don't need custom resource for usage
fixed db check on init
Added lvhcompelectical

Added lvhcompelectical.  This plugin allows easy creation of sensor
electrical charactersitics tables.
Updated other plugins to include my name and website in top comments.
Renamed Message to Body in EmailDoc.
Enhanced parsing in EmailDocument. Content-Type encoding is now taken into account.
added additional error checking
Revert "run make when you load the page, not on server start #build"

This reverts commit a3e32d7f6437d6607ce9f571ab0589ece546f1a2.
Basic segment highlighting added.

Need to find a way to scroll a table.
Fix filter doc typos
Show function signatures for eponymous templates in std.algorithm docs
Fix dataTimeout in std.net.curl

* std.net.curl: Added operationTimeout.
* std.net.curl: dataTimeout fixed. (Used to set operation
  timeout instead of inactivity timeout)
std.net.curl: Fix unittests on Windows
std.net.curl: Fix broken HTTP PUT example
std.net.curl: Do not assume POST data is null-terminated string

This fixes uploading data not containing null characters, or
non-null-terminated data.
varargin64 varargs issues
Fix error in comments.
Renamed mseconds to msecs and useconds to usecs.
Merge pull request #814 from bdsatish/master

Fixed error in comments
Merge pull request #797 from jpf91/timeoutCURL

Fix dataTimeout in std.net.curl
Merge pull request #800 from CyberShadow/std-net-curl-binary-post

std.net.curl: Do not assume POST data is null-terminated string
Merge pull request #801 from CyberShadow/std-net-curl-put-example

std.net.curl: Fix broken HTTP PUT example
std.net.curl: Use std.file.tempDir() in unittests
Update OS detection logic in posix.mak to handle OpenBSD and Solaris.
Merge pull request #816 from alexrp/update-os-detect

Update OS detection logic in posix.mak to handle OpenBSD and Solaris.
Merge pull request #815 from CyberShadow/std-net-curl-use-tempdir

std.net.curl: Use std.file.tempDir() in unittests
Merge pull request #773 from ntrel/algorithm-eponymous-doc2

Show function signatures for eponymous templates in std.algorithm docs
fix Win64 varargs bug
Merge remote-tracking branch 'upstream/master' into ldc-latest

Conflicts:
	std/format.d
Checking in changes prior to tagging of version 0.22.

Changelog diff is:

diff --git a/Changes b/Changes
index f472589..f612952 100644
--- a/Changes
+++ b/Changes
@@ -1,5 +1,8 @@
 Revision history for Plack-App-Proxy

+0.22
+        - Filter out Status header since it's forbidden in PSGI spec (miyagawa)
+
 0.21
         - Bump version to fix some CPAN issues.
ajuste das assinaturas dos metodos no servidor
Fix typos in 'Configuration' section
The virtual variable for integers is removed.
20.m
21.m
Add algorithm folder
Version 1.19.3.
Added select-previous-item and select-next-item actions to the single-selection tool
update detial
merge
update detial
Merge branch 'master' of github.com:lifang/gankao_season3
update plans
compat.h: Define M_PI if not defined

A newer gcc does not define that constant in c++0x mode, because
it's not in the standard. See
http://gcc.gnu.org/ml/libstdc++/2009-05/msg00091.html
[XML] fix calling descendants without params
org.lilug not com.example
new testing for vecviews (partially done)
Fixed bug with branchMerge
stream video by ffmpeg

Signed-off-by: Fudong Bai <fudongbai@gmail.com>
.gitignore */lib*.so (binary files)
update deps to latest stable
Last min changes to the comments
Updated API. Moved from APNS to get-updates every 1 second (hackish but works; too late for nodejs).
Merge branch 'master' of https://github.com/liviumirea/robotfight
pinned flooding_lib 2.47
removed testing solution from solution
Excperimenting with variables to get just the Year
first commit
Merge branch 'master' of https://github.com/lohithsln/Hello-World
remove more rubbish!
migrating from WebContent to src/main/webapp
Working on Socket class
jquery words
travis: install autotools stuff first
Ability to show the diff filetypes
Differences class structure reduced
commit message
Merge branch 'master' of https://github.com/luyangw/hw9-fall-2012
Adjusted debug level 2 and lower
Fixed typo
Changed color of human win to blue
Fixed temp ban reason
Fixed check for last human leaves server
Fixed between rounds team making
V1.1 Patch 2
Bulletproofing TeamChange
Meeting.description is now a textarea in scaffolding.
Issue #2
http://github.com/madeupname/juggernaut/issues/issue/2
Mono update: Use LoadLibrary to load assemblies on Windows.
stuff
Merge branch 'master' into mazedev
added feature vectors and abstracted preprocessing into data.py
Only send `ingredient_column` to essence if it`respond_to?` it.
Using correct RSpec syntax for expect calls.
Removes dependency status image from README [ci-skip]
Joe's fixes to make unit tests build
[finishes: 29931677] Add config options for gcode header and footer
[finishes: 29931677] If header or footer are defined, use them in the generated gcode instead of the built in code
[finishes: 29931677] Use start and end gcode from ReplicatorG by default
Merge branch 'bookend'
Tau!
Remove src and src/mgl from the include path.  We refer to those headers internally using "", and src/mgl/limits.h was conflicting with an stl limits.h on macos
hide suites by default and wire up click handlers to show them
Testing with spritesheetpacking
- fixed a minor issue with server's disconnect() method
Added logger module and logging options to gff3-ffetch
Removed validation option
-- 0040_xxxxx_01_mangos_playercreateinfo.sql
deleted search helper test files
slow fix, myfeed improvement, points calc
added MapBox source center convenience methods
Improved stages init, edited README
Change bitmap font for a better font

This font is more pleasant for the user. Also, this new image
has a transparent background.

Signed-off-by: Marcos paulo de Souza <marcos.souza.org@gmail.com>
Fix the turn off function for properly disable the radio

Without this change, when we close the radio app, the radio just
disable the bypass, and don't disable the radio. This could eat more power
of our battery.

Signed-off-by: Marcos Paulo de Souza <marcos.souza.org@gmail.com>
Remove debug message and fix a warning

The warning was about the get_center don't return a value out the if
conditions. Adding a return 0 silence this warning.

Signed-off-by: Marcos Paulo de Souza <marcos.souza.org@gmail.com>
Chnage the validation of range of frequency to screen

This is the first patch to remove the function start_radio.
start_radio function was used when I had the capture/playback
thread, and now we can call directly the setuo function.

Signed-off-by: Marcos Paulo de Souza <marcos.souza.org@gmail.com>
Remove the function start_radio, and use the setup function

Also in this commit, remove a useless funtion prototype, that was
used when we had the capture/playback function.

Signed-off-by: Marcos Paulo de Souza <marcos.souza.org@gmail.com>
Put the setup of color together with the setup of rects

With this simples change, we can remove on function, making the
same setup that was before. No functional changes.

Signed-off-by: Marcos Paulo de Souza <marcos.souza.org@gmail.com>
story #134 (Raphael/Mengqiu) refactoring tests and CreateAccountController
Added more detail to the description of DEMONS registration as suggested by Robin.
Fixing the styles for application.css manifiesto.
add thrift-mode.el
Get for loops running
Don't use wp_send_json_* handlers in the upload-attachment XHR handler.

The difference is the content type: application/json (which jQuery deserializes automatically for us) and the default text/html.

jQuery correctly handles application/json requests for IE, so we can continue to use the wp_send_json_* handlers elsewhere. Plupload rolls its own requests and does not handle application/json correctly. So, keep the standard text/html content type on upload-attachment.

props koopersmith.
see #22446.



git-svn-id: http://core.svn.wordpress.org/trunk@22845 1a063a9b-81f0-0310-95a4-ce76da25c4cd
Avoid 'Only variables should be assigned by reference' warning. Props wonderboymusic. see #21865

git-svn-id: http://core.svn.wordpress.org/trunk@22115 1a063a9b-81f0-0310-95a4-ce76da25c4cd
working on deployment
working on deployment
Changed + to * for live cell
.htaccess remote changes
Merge branch 'master' of github.com:martinhendleman/kgrme
Merge branch 'master' of github.com:martinhendleman/kgrme
Merge branch 'master' of github.com:martinhendleman/kgrme
Merge branch 'master' of github.com:martinhendleman/kgrme
Merge branch 'master' of github.com:martinhendleman/kgrme
Merge branch 'master' of github.com:martinhendleman/kgrme
Merge branch 'master' of github.com:martinhendleman/kgrme
Merge branch 'master' of github.com:martinhendleman/kgrme
Merge branch 'master' of github.com:martinhendleman/kgrme
Merge branch 'master' of github.com:martinhendleman/kgrme
Merge branch 'master' of github.com:martinhendleman/kgrme
Merge branch 'master' of github.com:martinhendleman/kgrme
Merge branch 'master' of github.com:martinhendleman/kgrme
Merge branch 'master' of github.com:martinhendleman/kgrme
Merge branch 'master' of github.com:martinhendleman/kgrme
Merge branch 'master' of github.com:martinhendleman/kgrme
Merge branch 'master' of github.com:martinhendleman/kgrme
Merge branch 'master' of github.com:martinhendleman/kgrme
remote production commit
Merge pull request #227 from masche842/master

Fix for #201
Removing not needed test dependencies
Settings for building against multiple databases on travis ci.
Fixes rails version dependence and removes fuubar rspec format
Using new FactoryGirl syntax. Removes deprecation notices in factory_girl 3.2.0
Refactors Pages#load_page method. Closes #210
Fixing FactoryGirl version for Ruby 1.8
Using reset database rake task with trace option before testing on travis
Fixing FactoryGirl to 1.7.0 since Bundler cannot handle same gem with different versions for several platforms.
Do not use rake db:rest to prepare database on travis
PostgreSQL fixes
Converting MySQL specific SQL syntax to Arel syntax. Fixes PostgreSQL compatibility.
fixes: reload sitemap after page has been deleted in english version
Merge pull request #230 from masche842/fix300_master

fixes: reload sitemap after page has been deleted in english version
v2.2.rc7
Removes double declaration of encoding
Fixes alchemy executable
Only display installation success notice if no error happened
v2.2.rc8
Fixes travis build status image url. [ci skip]
fixed read-past allocated memory in ATL_amm_rkK
added complex support A2/B2/blk copy routines
Set cplaylist->no_tracks a bit private.
init: use g_build_path
GATEWAY-2810 - fix for CONNECT internal mapping of GATEWAY_API_LEVEL to Spec Version
Gateway-2827:Cherry-Picked Commit from commitId:ca5c34f450770d686455c4a5ebb29f81873208ac
Gateway-2827:Commit manually copied from 3.3 to 4.0 for commitId:2597b314a8e14d0bb6d6eb268df5afce94e7958d
Gateway-2827:Fix merge conflicts for commit e398094d0727c4ccc63f46ea7f79be1d98064f60
GATEWAY-2810 updates and additiooal tests for NhinEndpointManager
GATEWAY-2810 updates based on new understanding of PD 1.0 and Deferred services
GATEWAY-2810: refactor of decider abstract test and addition of PD EndpointManager negative test
Gateway-2827:3.3 merge ported to 4.0 based on commitId
15e29e52dd6352548d6e505b2bfad9be1d6a0c8e
changing common loggings to log4j
choosing log4j over commons loggins
Merge remote-tracking branch 'bhumphrey/gateway-3196' into log4j_GW-3196

Conflicts:
	Product/Production/Common/CONNECTCoreLib/src/main/java/gov/hhs/fha/nhinc/logging/transaction/dao/TransactionDAO.java
Merge pull request #255 from matthewtiller/CONNECT_integration

 GATEWAY-3114 4.0 regression update
GATEWAY-3248: repackage xd-commons without ihe classes.
Merge pull request #256 from tparnell/GATEWAY-3248

GATEWAY-3248: repackage xd-commons without ihe classes.
GW-3196 Log4j for ConnectCoreLib
GW-3196 ConnectCommonWeb part
GATEWAY-2910: Fixed decorators that were adding endless interceptors to a static instance.  Unit tests for CONNECTClient.
GATEWAY-3144: fixes to include updated RI Agent and trust alias
Gateway-2827:Merge 3.3.1.3 fixes and PD service available for both PurposeOf/PurposeFor
Merge remote-tracking branch 'upstream/CONNECT_integration' into Gateway-2827CherryPick
use alarm() to time out workers
fixed codegen test suite
added logger macro wrapper and sample usage in main
Disabled Google Analytics on dev
Make more of a bonafide trampoline -- usually you don't bounce off of
it, you just stay in the air.  But add it into other places....
version bump
recompile for the browser
Revert "XML types file move"

This reverts commit 857e898d4cf8bd8bf024f49e5c3c0c3f0228320a.
Delete empty folder
replace_asci
remove using declaration from mklDispatcher.h
got MKL finding to work
more work on MKL build support
prepare to use mkl
added skeleton for clspmv dispatcher
Implementationsansatz zur live-Aufnahme der Session hinzugefuegt.
Merge branch 'master' of github.com:mblmg/BinauralBeatBox
compat-drivers: fix patches/network/25-multicast-list_head.patch

Hunk offsets differences required manual intervention.

Signed-off-by: Luis R. Rodriguez <mcgrof@do-not-panic.com>
compat-drivers: fix patches/drm/04-revert-prime-support.patch

Required manual intervention due to hunk differences.

Signed-off-by: Luis R. Rodriguez <mcgrof@do-not-panic.com>
compat-drivers: refresh patches for next-20121002

Signed-off-by: Luis R. Rodriguez <mcgrof@do-not-panic.com>
compat-drivers: add a few header BT header files to WSTABLE

Upstream commit 700fafdf4c84a5f4ace383353bf9e5e9c4119a68

I noted while porting a stable fix down that the patch did
not carry over a few header file updates. This was caused by
the fact that the WSTABLE variable did not carry over the
header files. Fix this.

Signed-off-by: Luis R. Rodriguez <mcgrof@do-not-panic.com>
Added app, Edited readme
update notes details works
Fixes to user interface for print full record
Make packager run continuously
Finished conversion to use ConcurrentSolrUpdater
Fix flag icon for colorado gov docs
Merge branch 'marmot-sprint12' into marmot-sprint13
Fix checkout of eContent in mobile theme when the user is logged out
Fix linking to full record from checked out eContent page in mobile
Fix returning epubs and pdfs early in mobile theme
Fix text and logo for read online in mobile
The README.md is the origin document for README and README.html
Issue #9 Backspace after smiley is messed-up
possible fix for issue #7
issue #5 : shift at popup keyboard fix
empty word crash in user words editor
NDK v8 + welcome MIPS
translations
issue #2: possible memory missing error
issue #3
Merge branch 'master' of github.com:menny/AnySoftKeyboard
typeless types
AngularJS

Change-Id: Id4d3ce17c7d3591a7be0fe1cdcdfcfcfa9ef635f
Organizing the Gemfile.
Ignore some temp files
Little improvements and removals of code.
Remove useless files and make slim the default template engine.
Fix conflicts
Remove and fix merge conflicts.
Refactoring and fixes.
Putting a spinner dialog to block the UI while the web service does
stuff.
Fixing initialization bug.
[packages] php5: upgrade to 5.4.10

Signed-off-by: Michael Heimpold <mhei@heimpold.de>
3D model works

Finally got the cinema 4D export working, only have to find a way to
invert the normals, shades look really blurry now. Also kinda started
on the sidescreens.
Rebuild of example documentation
Spacing between callout image and ad
updated fetcher
Merge branch 'master' of https://github.com/mikesea/donors_select
project unit tests
updated project model
Merge branch 'master' of https://github.com/mikesea/donors_select
moved functionality to the Person class:
a little drunk, needed to add some changes to commit
Initial brainstorming session.
Add icons and spec file
Add debugging installation script
add include for gitconfig
muokkausta lisää12
Merge branch 'master' of github.com:millaris/Pizzapalvelu.git
muokkausta lisää123
Merge branch 'master' of github.com:millaris/Pizzapalvelu.git
minor cosmetc stuff
convert to maven project layout, make most tests run, add a jetty runner for examples
adding gitignore
gitignore
pepified code
Added -gentle setting
demo: pass proper resolved path as oauth2 redirect_uri to js from template
manual merge master branch into gh-pages branch
added Brazilian Portuguese translation (thanks Guichaguri!)
change core.reloadChunkOnTeleport default to false instead of true, due to Bukkit issues in 1.3.1 with world.refreshChunk() causing odd behaviors
update version towards next release
Merge remote-tracking branch 'origin/master'

Conflicts:
	Changelog
	build.number
Fix examples in the helpfile
Fix examples in the helpfile.
Defer closing connection. Maybe that helps.
Balaji - removed 'functional test' related files from this project
Aravind/Sushmitha | #2098 | Checking if subscription exists explicitly on validation.
V2, Ashok | #1738 | Made callback asynchronous through events
Shruthi, BalajiN | #0 | Creating WHP release version
Bug 709773 - Deferred options, manifest and tests, checking
Merge pull request #23 from dglol/bug-709773-fix-v2

Bug 709773 - Deferred options, manifest and tests, checking
Part of the fix for the global issue.
integrate simulated infobars into the gombot addon
add update_url to manifest
Merge branch 'infobars'
pushed first layout, list-detail
completed first pass of listview element
java security test with providers
use ScalaPipeFunction like in groovy's GroovyPipeFunction
change scope to compile temporarily (maven doesn't see the test libraries otherwise... fix!)
Login button
Always go to the "javascript-enabled" logout pg
Fixed referer capture
Merge branch 'master' into coe
Rolled in fixes for Summary link count bugs and page # bugs by contributors
Massive rewrite of all files, fixing cross-domain AJAX problems and simplifying installation.
fixed test for commit 78cab52582
SPF: removed test for removed is_in_relayclients()
Checkpoint before mods.
New version with new vocabulary and no top cut interface. added new bar event.
release
link to new version of tutorial
update target
tweaks, updates
MumbleKit: get rid of MKReadWriteLock.
Add first draft of MCPC 1.2.3 revised post
Revise
Add current 1.2.5 client mods
Add unmodified 1.2.5 Balkon's Weapon Mod config properties file
Add WeaponMod ids 5000+
switch to php-fpm automaticly running fixphpfpm ; fixed issue for '--system-default--' and indexfileorder ; also fixed and optimize template code
updates to nodejs_labs
cosmetics

; )
Lê arquivo de configuração yaml
合并 migrate
Merge branch '1.0.1' of github.com:mindpin-shcmusic/pin-2012-edu into 1.0.1
增加 migrate
删除 notification
增加了学期与课程相关的spec代码
Merge branch '1.0.1' of github.com:mindpin-shcmusic/pin-2012-edu into 1.0.1
Merge branch '1.0.1' of github.com:mindpin-shcmusic/pin-2012-edu into 1.0.1
整理 migrate
fix migrate
增加了学期与课程相关的spec代码
Merge branch '1.0.1' of github.com:mindpin-shcmusic/pin-2012-edu into 1.0.1
通过 Semester 的 系统能够使用学期抽象类获得学期值 测试
增加了学期与课程相关的spec代码
Merge branch '1.0.1' of github.com:mindpin-shcmusic/pin-2012-edu into 1.0.1
修改 course 模型关系
Merge branch '1.0.1' of github.com:mindpin-shcmusic/pin-2012-edu into 1.0.1
增加了学期与课程相关的spec代码
测试通过 能够在一个学期的某个课程下添加多个任课老师，并且能够取得指定的不同学期的课程下面的任课老师
增加了学期与课程相关的spec代码
student add_course
엑셀 스키마 문서 생성
엑셀 다운로드
mysql table 정보 추출 쿼리 생성
XML 파서를 생성해야 한다.
add true setting.ini in res
add docstring to main() of test/worker.py.
Merge https://github.com/narwhaltribe/parallel
Move call to _create_configs inside of PaasProvider's init() method
Implemented Facebook icon.
Update language/fr-FR/fr-FR.plg_system_less.ini
Merge pull request #1 from lomart/patch-1

Update language/fr-FR/fr-FR.plg_system_less.ini
submodule updates
Added node_modules to gitignore (use package.json)
tmux / copy paste changes, z now installed via homebrew
going thru abstract
Fixed error with queues, changed render mode from CONTINUOUSLY to WHEN_DIRTY
add show log to console for pryrc
gitignore
Cambios redes
added depot unit tests
Creating rooms with directions.
first init
Merge branch 'master' of github.com:newmen/horiuty_method
Grenade bonuses for %i frags in a row in JB; fixed some JB camera issues for spectators
modif sven
Added the discovilante zsh theme.
Show git_ahead with discovilante zsh theme.
typo
removed unused var
Second Commit

Becasue I didn't see the changes in the readme file on the first one
Made home and details page
Add single page for main widnow
optims + %p added to pies bullets
compiled
Update src/mypackage/MyApp.java

added a comment at server
PVS-Studio fix: V619 The array 'v' is being utilized as a pointer to single object. gropengldraw.cpp

git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9019 387891d4-d844-0410-90c0-e4c51a9137d3
PVS-Studio fix: V619 The array 'shipp->ab_info' is being utilized as a pointer to single object. shipcontrails.cpp

git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9020 387891d4-d844-0410-90c0-e4c51a9137d3
Whoops, fix commit r9020

git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9021 387891d4-d844-0410-90c0-e4c51a9137d3
PVS-Studio fix: There is only one PI.

V624 The constant 3.14159 is being utilized. The resulting value could be inaccurate.

git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@9022 387891d4-d844-0410-90c0-e4c51a9137d3
Reorganized packages
Reorganized some packages
MapClassifier: Remove 2 levels of identation

Signed-off-by: Niels Thykier <niels@thykier.net>
joli images for project list
blog renamed to nulog
open source category to project list
Merge pull request #16 from zaiste/portfolio

Portfolio
Make :set spell default in vim
Fix html snippets
Add .gitconfig
Add .gitconfig to populate
Don't double escape tagging fields.
Fixes #5925, report 0 for tags with no entities.

Not sure what I was thinking when I originally wrote this line.
Apply lobo's patch from civicrm/trunk.
Fix template variable replacement in DAO::createTriggers.
Merge branch 'dev' into test
Use operation and fault in addition to serviceType as the groupd by key in the SLA monitor example
Prepared for 1.2.1
Merge branch 'master' of github.com:octo-online/robospice
Delete an unused function
Use git describe as version
Галерея фотографий к каждой базе данных
MinGW build fix
remove debug option
one more typo. sorry :(
Merge branch 'onphp-master' into onphp-1.0
Bumped ion defs
Bumped ion-defs for new Granule object
rename name to target
diskdev_cmds cflags
fix @slot tag, in line with src/library/stats4/man/mle-class.Rd
android guide updated for 0071
A first introduction to ofxAssimpModelLoader.
Merge pull request #131 from punkto/master

A first introduction to ofxAssimpModelLoader.
adapted implementation of guess_dest_platform()

harmonised choices with ohdevtools (as agreed with AndrewW)
fixed spelling of ohNet directories (Mac 32/64bit)

follow-up to AndrewW's recent work on build infrastructure;
defect first encountered and fix proposed by IainMcL
preemptively fixed spelling mistake

ensure consistent spelling of "Volkano" for least surprise
even though no adverse effects observed yet in practice
factored out configuration of toolchain

from ohTopology into new function configure_toolchain();
also useful for ohMediaPlayer
Handle the case where config items are not defined for overridePlaceTypeConfig
Merge branch 'sa-web' of github.com:openplans/shareabouts into sa-web
add a custom.css hook to teak nav bar link colors
Merge branch 'sa-web' into cb7-demo
re-do color fix after merge
Setting default nodes
Merge remote-tracking branch 'origin/master'

Conflicts:
	Bending2/src/tools/ConfigManager.java
Finished tha motherfucking config :D
Merge pull request #7 from superlode/master

CONFIG
Merge remote-tracking branch 'origin/master'

Conflicts:
	Bending2/.classpath
	Bending2/src/tools/ConfigManager.java
.
Merge remote-tracking branch 'origin/master'
Added bending to items
added fastSwimming
Cleaning up
Merge remote-tracking branch 'origin/master'
Fixed fastswimming should work better
Still some change needed but that should do fine for now
Changes
Merge remote-tracking branch 'origin/master'

Conflicts:
	Bending2/src/main/Bending.java
	Bending2/src/tools/ConfigManager.java
	Bending2/src/tools/Tools.java
	Bending2/src/waterbending/FastSwimming.java
Merge remote-tracking branch 'origin/master'

Conflicts:
	Bending2/src/tools/ConfigManager.java
	Bending2/src/waterbending/FastSwimming.java
/help command and perm for commands furthermore fixed the
"incompastibility" with spoutcraft client -air scooter-
Merge remote-tracking branch 'origin/master'
Little fixes :o
Merge remote-tracking branch 'origin/master'
blahblah
Merge with orn-branch
Merge branch 'master' of git@github.com:ornbja/GolfController.git

Conflicts:
	GolfController/Controllers/HoleController.cs
d
Merge branch 'master' of git@github.com:ornbja/GolfController.git

Conflicts:
	GolfController.suo
	GolfController/Controllers/CourseController.cs
	GolfController/obj/Debug/GolfController.pdb
d
Merge branch 'master' of git@github.com:ornbja/GolfController.git

Conflicts:
	GolfController.suo
	GolfController/bin/GolfController.dll
	GolfController/bin/GolfController.pdb
	GolfController/obj/Debug/GolfController.dll
	GolfController/obj/Debug/GolfController.pdb
a
updated for 0.12, builds fine, havent tested yet.
ODE now loading via CFFI in CCL (although infinity values are screwed)
Merge branch '0.12'
new readme
added helper method to shorten descriptions
don't cut out the description in full view
Merge pull request #189 from rewritten/fix_issue_169

Fix issue #169
Added 5 Ruby solutions and 1 pen-paper solution.
Update.
Final document.
Editorial changes
Convierte el index.html de static/ en template
Agrega la vista para mostrar la plantilla index
Agrega el control de carga de recursos.

- Solo se controla la carga de imagenes por ahora.
- Falta: Control de carga de la musica, fuentes, y el fondo principal
Agrega configuraciones para servir archivos media, con el servidor de desarrollo
Arregla error de importacion
Agrega control de carga del fondo
Merge branch 'master' of http://github.com/leferreyra/pampa-website
consultation des vols en cours
[2.1][Component][Yaml] fix 4022
Fixed quoting issues with Yaml Inline Parser

* Added test parse error in parseQuotedScalar
  * Expecting to throw tests, previously trimmed string
  * More details on issue: https://github.com/symfony/symfony/issues/4021
* Enforces single quote escaping when within string quotes
  * Shortens the scope of the validation match
  * Stricter matching rules
* Ensures double quoted strings are not parsed incorrectly
* Split quote matching into 2 types of quotes
  * Separates single and double quotes
  * Fixes intollerence for un escaped double quote
Adding new rake task.
New Changes

Preview thumbnails
fix likely and unlikely defined as nil
where oh where have all the sups gone? dropped in the static index generation phase
Update dependencies.
Starting PySimulators 0.2 development.
Added capistrano deploy file and hello world
streamlining RFI_Clipper (hahahaha)
Merge branch 'master' of github.com:pelican/pelican-lofar
Added OpenArena project
First screen to Castle dungeon
fixed a bug in mzidentml2pin
added more resolution and granularity to the log super grid search
Merge branch 'master' of https://github.com/percolator/percolator
improve comments and docstrings
add __all__
C++11 support for older gcc with -std=c++0x flag.
Ensure that video is only shutdown of sleep, not wake
Bumped build number to 4.
Fixes #3
more learning lessons
[maven-release-plugin] prepare release hw1-pgadde-0.0.3
Fix method instance check in manager + Fix conflict policy spec
ficha sociodemografica lista
Added a new config option, 'expose user emails', which defaults to true (to mimic old behaviour).  If set to false, then all e-mail will come from the site address defined in the Mail From field (or automatically calculated if not set).  I also split the code that generates the site e-mail address into a getSiteEmailAddress() function, so that we encapsulate the logic to generate it better - it can now be called from elsewhere, if needed.

This will involve a change to the DB data (to add the new option to the config_options table, and to modify the ordering of a subsequent item).  I have added the necessary changes to initial_data.sql, but I don't know how to manage updates to existing systems.  Here is the code that will need to be run, but I have no idea where to put it, I'm afraid!

    INSERT INTO `<?php echo $table_prefix ?>config_options`
     (`category_name`, `name`, `value`, `config_handler_class`, `is_system`, `option_order`, `dev_comment`)
    VALUES
     ('mailing', 'mail_expose_user_emails', '1', 'BoolConfigHandler', 0, 12,
      'Enable to expose user e-mails in the from/reply-to field, or disable to always use the site address, below.');

    UPDATE `<?php echo $table_prefix ?>config_options`
    SET `option_order` = 13
    WHERE `category_name` = 'mailing' AND `name` = 'mail_from';
Merge pull request #32 from MarkMaldaba/ExposeUserEmailsOption

New config option: Expose user emails
Force utf8 encoding for this test
All parser tests might need some time
bug #3516405 [display] Chart title is getting wrong within chart export
Merge branch 'QA_3_5'

Conflicts:
	js/tbl_chart.js
Tear down correct event handler
Fixed bug#3596070 - localStorage broken in server status monitor
Merge branch 'QA_3_5'
Fix link title
Fix formatting
Improve formatting
Make button texts translatable
implement JPA password validation
Merge branch 'master' of github.com:picketlink/picketlink
move FloatingFolders into examples
fixed the library filter for jquery 1.8.0
Merge branch 'jquery-update' into rate
- up to 0.9.9
simplified cli command handling
add 'test' command to cli
the intention of the command is to have some kind of highlevel unittest to see very fast if wifly is working correctly. It is implemented on clientside and the result is only seen on the leds, so the user has to recognize if everything runs well. However this should be a big help to have some kind of standard test suite on library level.
Merge pull request #33 from tawarisch/master

Simplification of cli commands
yaplog!で大きいサイズの画像をポストできるようにするパッチ。
 - リンクになってないと動かなかったのを修正。
Add descriptions for each template identifier, fix OIDs
Add standard category and qds data type to data criteria model
Merge changes from Andre
updated order of less import statements
Fix for delete in input boxes
Finish Chapter 9 - Finishing Users
localisation templates were moved to locale directory, license to the root
Podwójne bufforowanie w końcu działa. Można już chwytać za wierzchołki
danego stworzonego przycisku i ruszać nim sobie w różne strony:) Sam
przycisk Edytuj jeszcze nie działa, gdyż parser XML będzie podloegał
pewnej przebudowie i zrobie to dzisiaj rano, bo już jest późno.
Blogpost now more like post
take out atlas in urls
Really critical fix #3
Simplified prey-config.exe by removing standalone option.
reverted even farther back.
changed landng page cache to 30 minutes
Return blank from Provider#name_type_code_xref if no match was found.
Big - but currently incomplete - changes to paths
Corregido Agregar un Hood
Merge pull request #32 from ccamposcr/master

por favor hacer pull
Implemented more views, rich snippets and code cleanup.
collection helper added

Signed-off-by: pussbb <pussbb@gmail.com>
Reworked initialization of sounds, moved it to the class level and made it dynamic.
Added test for MongodbFeedInformation
Added fullscreen mode, running on Mac OS X Mountain Lion
getNotes does commas
Added youtube demo
Merge branch 'master' of https://github.com/ragnaringi/Dpfrd-Pzza
Added 'repeat search' button
Tweaks to YouTube demo
reload page every time we run out of videos
SSL Updates manually merged from D3Inferno.
Added in optional agreements TOS, EULA and RMAH.
Updated sources for ManagedOpenSsl to support PSK Ciphers, by D3Inferno.
Merge pull request #572 from Egris/SSL

SSL and agreement module updates.
Prettified server.cs code by by latest ssl-commit.
Default account password is now 123456 as stated in logger message.
Disabled agreements.
Removed redundant NO_Response RPCCallback logger message.
Added hardcoded hack for retail client disconnect - should be the first step for the solution. It seems retail client doesn't like our crafted bnet.protocol.EntityId's.
Fixed typo in test case and remove console.log statements

Thanks Public Keating.
Use postgres instead of sqlite
Rename User controller namespace to Users
Use environment variables to configure facebook details
Update confirmation URL to use heroku
fixed description
Merge branch 'master' of git@github.com:ralscha/e4ds-template.git
added a 3rd line from my machine
added clone to the dependencies
previous/next link texts made configurable
No Evil stuff on insert mode.
Merge branch 'master' of https://github.com/raulmpad/.emacs.d_wip
Stacked Inspector toolbarbutton size fix
Added unprefixed CSS animation properties, fixed #detail-icon(-container)
solucion problema 6
Moved first of 3d intersections into its own file.
Moved line between line segments in 3d.
Moved rest of 3D intersections.
If I were sexually aroused by busywork, the Microsoft ecosystem would be the best Domme ever
Rename this to WP8
Updated readme.txt to the fullest version extent I have tried.
Added first verson of website.
Removed VCF-filtering step for rain, instead using join w/NDVI during adjustment
Added toolpalette source files.
Make Photos full width
Merge branch 'gh-pages' of https://github.com/refreshmunich/website into gh-pages
updated index and working view projects
Merge branch 'master' of https://github.com/regalandroid/wdwebapp
Automatic update [Sat May 19 18:08:15 CEST 2012].
Automatic update [Mon Aug 27 06:12:02 CEST 2012].
modified, added and commented filter
add executavel
he modificado dos lineas
GRIM: fix drawing of long text objects
Merge pull request #625 from tobigun/font_issue1

GRIM: fix drawing of long text objects. Fix #623
Support 3 type of source
added handling of Type error for indexing revision length result
first non-working draft with backbone
added readme with some basic instructions for running the project locally
make base image use image upload provider, also take stuff out of helper that's only used in one place
update resource def a bit
removed dead code and renamed a function in the view namespace
cadfa
added link to Steven Le's Python client
minor name changes
trash from mv operation deleted
Merge pull request #53 from robertd/master

Fix couple of things in README.md
adding travis-ci
added rand_int that we have written so many times :), weighted_mean and switched to that for the default multi-objective optimization, started on DiffEvo optimizer
aggiunto linee guida
Minor cleanup and gem update
Making the app work on a windows server :P
repl accepts empty programs
text box addition
Debugged animations and added support for streaming to and from disk.
[newfiles] Signature files and sample eygl files.
Merge branch 'master' of https://github.com/ross-spencer/eyeglass
Add ability to change textFontSize
Add byobu.
Restore nested hash support for POST/PUT requests
Extract payload hash processing to new method

Since this is now used for both GET/POST requests, it shouldn't be in a
GET-specific method.
Remove unnecessary generate_get_params method

Now that all the logic is pulled out to process_payload_hash, the
GET-specific part can just be done in the convert_payload_to_url method.
Merge pull request #107 from dmarkow/nested_params

Bring back nested params support for POST requests
Added support for uploads in HTTP

I don't know if the code is clean enough… It is inspired from ASI HTTP
Request
Fixed crash when payload is nil
Convert value to string
Added comments
Revert "Added comments"

This reverts commit 318049b741a2f2082eebb0d314b445e46c685d77.
Merge pull request #65 from n-studio/1.1

Added upload support in HTTP
Add redis.go
Move bodyToByte from server.go to util.go
Using uxterm instead of xterm -- for Unicode.
Solarize
75 lines, not 50.
Merge branch 'master' of github.com:ryanjosephking/config
Getting the latest Syntastic.
Hide intro message.
More color tinkering.
Working.
More working.
Add sharpen but not work well
updated README to reflect chrome-autoswitching
Set ttimeout/ttimeoutlen.
add setup.py and other many important files
movies and data xml
SAKIII-5638 Remove all places that load > 20 items
Adding LAMP Drupal state
Adding ubuntu support for apache install
Merge pull request #5 from benhosmer/master

Add an Ubuntu LAMP Drupal state.
SWF uploader not working reverted to post method. Popups need positioning but work
not first but second
not second but third
not 1st but 2nd
not 2nd but 3rd
conflict fixed
Dynamically modify first data source 2
Removendo flash message do can_redirect
Add another cool usage of md files
Merge pull request #1 from kuchbhi/master

Add usage of md files in generating a blog using node.js
- Contributed by @kuchbhi
Finished summary.
Added one discussion subject.
Print statements are now commented out in HWInterface
removing knockout
added knockout module
version1
Merge branch 'master' of https://github.com/scrumpam/Match-finder
Update php/system_settings.php
force termination of parser
Added -g in build scripts

Signed-off-by: Sébastien Boisvert <sebastien.boisvert.3@ulaval.ca>
Pigeon time!
https://issues.jboss.org/browse/AS7-5593
https://community.jboss.org/thread/205456 Dependency Resolution
https://issues.jboss.org/browse/AS7-4508 referencing jboss-remote-naming
1.0.4.Final
scraping unique
commit12130843
Makefile: added install.
widget: added label.
add sources about ruby and sql
Moved knife portal to new spawn.
Replace profile_callback usage with registration.signals.user_registered signal
comment model, url bugfixes
Visit functionality completed
Fixed a bug that caused the French translation to crash the private tribe frontpage.
Fixed two minor layout bugs.
Merge branch 'master' of github.com:sharetribe/sharetribe
language updates
Add UDD logo
Merge branch 'master' into api
Just updated to automatically install needed apps.
add file parsers
introduce SG_INPLACE_MALLOC to avoid inplace constructors
fix tagline and favicon
load by npm task
Ajout d'une tache dans la todo
BUG Video embed from Add Media Feature no longer works (open #8033)

Since the tinymce upgrade from 3.5.6 to 3.5.7 it seems like data attributes are forbidden on tags.
This fix tells tinymce to allow data* properties on img tags
Merge pull request #952 from stojg/open-8033-video-embed

BUG Video embed from Add Media Feature no longer works (open #8033)
ENHANCEMENT Allow opt-out of autofocus in CMS editor form, to avoid browser "auto scrolling" to bring the focused element into view (fixes #7242)
Add test for Cubature Library
spine resize added
Revert "recompiled JS with support for Wmode Transparent"

This reverts commit bafc207653044a7eef80e0e8a21205f5b6f8edc7.
First commit.
Add example test.
working, very slow
Continuing to move more functions from the view to the controller
procSerialDataRecieve was removed from the widget
procEnumerateDevices was removed from the widget
Removed procPrintTrace
removed initOptionsWidget from the connection widget
Removed initEnumerator and deinitEnumerator from the connection widget
Auto complete and statuses
cleanup .git
Separate views for recent and popular
Don't use twitter yet
Add note on cake.
Documentation, small clean up.
Commit small changes before big restructuring.
Major reworking into three classes of JK handler.
Re-merging broken changes after git nightmare!
Address feedback.
Merge branch 'master' of https://github.com/smblott-github/vimium into sync
Merge branch 'sync' of https://github.com/smblott-github/vimium into full
added a readme
Merge branch 'master' of git@github.com:snakile/Movie-Renamer.git

Conflicts:
	readme.md
Use jane instead of josh in client examples
fix problema compilacion tests
arreglando contacto y auth
upgrade to rails 3.2.7
fix date on index
Figure 3.13: Account.java
start extracting HTML printing into a seperate class
more WIP moving extracting HtmlPrinter
more WIP on HtmlPrinter extraction - main flow done
pretty much all HTML is now extracted into HtmlPrinter
HtmlPrinter: define big blocks of html with constants rather than methods
Cleaning up last bits of cruft from HtmlFormatter refactor
Use 1.8.x hash syntax
fix typo
run should_clean gem (it "does v it "should)
Fix funny indentation.
Use #stub_const rather than hand-rolled constant manipulation.
Use some helper methods to manage ENV manipulation.
Make glob order alphabetical, not file-system dependent

Dir[] and FileList[] have undefined order, so sorting them is strictly
better than not. Sorting should not have a performance impact in any
realistic use case: Sorting 100k shuffled elements is
near-instantaneous, and sorting 1M elements takes ~3 seconds, so file
system access time will always dominate.

One particular reason why this is useful is that undefined ordering is a
major source of flickering test suite failures.
Add specs for the consistent ordering of the files to run.

These are for #660.
Changlog entry for #660.
Check output.tty? on each formatter's output instead of global setting.

This fixes a bug where color is config'd but a formatter is given a file.

- Fixes #675.
minor refactoring for clarity
Amend 279a6d6f based on @dchelimsky's code review comments.
Remove obselete scripts we no longer need.
Use `stub_const` rather than defining an empty module.

The old way "leaked" in the sense that it globally added an empty
module that only a few tests need.
BK-220 Implemented Page tab in Control Center
Add error template for search.
Merge branch 'wobs-reloaded' of code.sourcefabric.org:newscoop into wobs-reloaded
CS-3995: Janitorial fixes required for packaging for Debian/Ubuntu distributions
* unsetting x flag on reported files
Merge branch 'next' of dev.sourcefabric.org:campsite into next
WOBS-1347: Agenda mobile version
* mostly adapting sizes
Merge branch 'wobs-reloaded' of dev.sourcefabric.org:campsite into wobs-reloaded
Merge branch 'wobs-reloaded' of dev.sourcefabric.org:campsite into wobs-reloaded
WOBS-1456: agenda, movies list: lightbox for trailers is too small
* adjusted trailers view at movie list
Tweaked the script more to make loading of coolant more efficient.
Thinking about compilation strategies
Stage 1 of Integration of Zurb Foundation
adjusting thumbnail sizes
Changing how references to API are made