labofsahil/github-event-dataset-2012 huggingface dataset:
Merge branch 'master' of https://github.com/THOK-SW/wms_rfid.git
Merge branch 'master' of git://github.com/THOK-SW/wms_rfid.git
Merge branch 'master' of git://github.com/THOK-SW/wms_rfid.git
Merge branch 'master' of https://github.com/THOK-SW/wms_rfid.git
增加3张新页面图片，更改货位利用字体样式
Signed-off-by: zqloon <zqloon@gmail.com>
库存打印字体大小更改
Signed-off-by: loou <loou@vip.qq.com>
修改下载分拣数据优化代码。
Signed-off-by: loou <loou@vip.qq.com>
Merge branch 'master' of https://github.com/THOK-SW/wms_rfid.git
Merge remote-tracking branch 'zql/master'
修改时间戳参数，库存分析单位改为标准件
Signed-off-by: zqloon <zqloon@gmail.com>
修改下载出库单据（下载时合单）。修改出库显示总数量字段。数据库添加出库中间表 表名（wms_middle_out_bill） 字段（bill_no，bill_date）单据和时间
Signed-off-by: loou <loou@vip.qq.com>
Merge branch 'master' of git://github.com/THOK-SW/wms_rfid.git
帮助目录新增错误改正
Signed-off-by: Endis <369029432@qq.com>
Merge remote-tracking branch 'zql/master'
Merge remote-tracking branch 'thok-zxl/master'
Merge remote-tracking branch 'jj/master'
Merge remote-tracking branch 'thok-zzb/master'
关闭错误处理；
Merge branch 'master' of git://github.com/THOK-SW/wms_rfid.git
优化x2
Signed-off-by: GitJun <122419795@qq.com>
some fixes trying to solve issue #7
Final change before expo to get steering working
Add ssh-essentials
Added debug menu for Address Book
Log errors to the tag trace.
Load all forms as tags. Uses tokenizer to check whether the form name evaluates as T_STRING or not.
MilaMegaParty Songs.
Latest asset fix from s3-jammit.
add Escaping test
slic3r config
second update to fix Motion
Performance improvment of World render()
fix bug 797943 - Add tablesort plugin to CKEditor
Added a note about nfs:true to the installation vagrant documentation
Honor timeout disabling Kumascript during deferred rendering
Merge pull request #656 from jasontclark/master

nfs: false affects to puppet
Merge pull request #657 from lmorchard/kumascript-needs-disabling

Honor timeout disabling Kumascript during deferred rendering
fix test_seo_title for ci
Merge pull request #659 from groovecoder/fix-unicode-test-for-ci

fix test_seo_title for ci
fix bug 800005: Remove Kuma preview from /docs.
Merge pull request #660 from openjck/remove-wiki-preview

Removed "New Wiki" preview from /docs page.
Merge pull request #661 from groovecoder/revision-dashboard-797589

bug 797589 - revisions dashboard 1.0
fix bug 800005: Remove the no-longer-needed kumawiki waffle flag test
Stop using kumawiki waffle flag altogether
Merge pull request #662 from lmorchard/800005-fix-kumawiki-test-failure

fix bug 800005: Remove the no-longer-needed kumawiki waffle flag test
Merge pull request #655 from darkwing/sort-table-797943-2

fix bug 797943 - Add tablesort plugin to CKEditor
Revision dashboard UI cleanup
fix avatar asset with new CDN
Merge pull request #669 from groovecoder/cdn-asset-cleanup

fix avatar asset with new CDN
Merge pull request #663 from lmorchard/800005-remove-kumawiki-waffle-flag

Stop using kumawiki waffle flag entirely
Merge pull request #668 from darkwing/revision-dashboard-797589

Revision dashboard UI cleanup
more v5.1.0 release notes
Overridable partials documentation
runtime.md guide focuses on valueForKey:, description, and NSFastEnumeration protocol
Partials Guide clean up
Rewritten number formatting guide, so that it uses filters.
added a couple copyright and author comments (again)
Added simple ahrd_example_input.yml in root-folder to ease finding it. Referenced also in documentation
updated the table styling from gsapp.cs
modify test DB to sqlite3
renames pins
renames even more pins
stubs method checking if diff between to times if greater then 10 seconds
Fix for work around has been resolved
Added Box Size mixin

Signed-off-by: hanakin <midaym@gmail.com>
fix App namespace
- Basic operation
Added repp widget
Beat blocks are sortable
ok
Signed-off-by: henrick21 <henriquebotega@gmail.com>
Ajustes gerais no layout.
mais commit
del
Fixed a couple warnings on linux
adds a group <g> element to the svg element that becomes the parent of all the svg shapes.

adds the setTransform method to the paper that sets the transform string of the new <g> element.
ability to update a note. audit notes and notebooks
add point class and update navigation calcul
Stopping containers now work
Clean up some TODOS, add btrfs stuff to roadmap
Little improvements and comments.
cleaning out warnings: semicolons and removing some unused imports
- Verweis auf Auflage 2 eingefügt
(yardoc) Add yardoc to Confiner.
(yardoc) w.i.p on provider.rb
(yardoc) Correct faulty yardoc link. 
Also minor language adjustment.
Fix my poor english..
completed modularization
Fixed problem in install script.
Add base game class
Add watches, bitches
add git config
bind tex file to gvim
add some tests with spies
bug fixes in PatientExtension (in progress) and fixed package.xml
Calendar
Login
Message
Signup
App
Settings
Sign up
Merge branch 'master' of https://github.com/hugoafj/TrueLove

Conflicts:
	Resources/ui/calendar/calendar.js
	Resources/ui/message/message.js
	Resources/ui/message/message_style.js
Merge branch 'master' of https://github.com/hugoafj/TrueLove
h
fixed leaks in color animators
added global parameters to growth state
now you can click to re-generate the growth
Callback for unbind()
order button added to progress bar partial
remove first order link
fix test
add other mirKO buttons
tidy
version bump
simplify
bump version
Merge branch 'order_button' into ikmc_portal
add version to layout.rb; merge in order button changes
Fanning about
Site updated at 2012-07-10 15:48:17 UTC
don't rely on order of dict
Refactored search directory #242
Merge branch 'master' of github.com:iLanguage/iField
Refactored authentication folder #244
Removed glosserView from corpusReadView.

It won't end up in this release.
Fixed CSS syntax error.
Merge pull request #245 from trisapeace/master

More refactoring.
remove long lines from playground.scss
Primeiro template e view.
Major simplification and expansion of the README.

 - Added roar-ng's goals and more information about its structure.
 - Simplified the usage and configuartion information.
 - Added a paragraph about the origin of the name "roar-ng".
 - Added spacing to the logo.
add POC20101 for 耀宏team Restful web service
Completed exercises 5, 6, 9, and 10
Initial code migration from project Jetman
Skip maxima tests if there's no pexpect.
Incorrect name for function orthographic_projection_matrix.
More work on practise tests
Added .gitignore to cleanup git status
Suppressed double ApplicationConfiguration class
Prepared ElasticSearch re-index
Modified Month::setMonth to accept a string value.
-Changed mongo.php to not try to auto-restart mongo (as it was failing) and instead reports a helpful error.
Merge pull request #393 from mmcguinn/master

tweak to mongo.php
fixed the display of the session controls
Merge pull request #101 from jdalphon/master

Changed the way the session controls are displayed
Fixed the way the map is centered on initialization.
Merging manually
Merge pull request #198 from jdalphon/master

Fixed map zoom issue
-Added ability to NOT zero bound when getting data bounds.
-Scatter is now a scatter! (selectable x axis works)
-Scatter now uses filled circles instead of rings.
Merge branch 'master' of github.com:isenseDev/iSENSE into mmcguinn-newvis-common
Merge pull request #63 from mmcguinn/mmcguinn-newvis-common

Working newvis scatter
fixed offset bug in slicing
more deprecation warning fixes
change primefaces version and disable the primefaces layout
removed console.log ...
use binddomevent
add some comfortable mapping in vimshell
hide NonText (tilde for empty lines, I don't need them. especially, in vimshell)
quickrun nocursorline nonumber
cron to backup
* class is applied to container itself
Add domain setting
Support https
Merge pull request #3 from molfar/master

Add support https and domain setting
Fixed various warnings and added doc
Added some renderers
Added license file.
Merge pull request #1 from sale87/master

Add Apache 2.0 license file
Performance Indices Compuations Added
Moved ComputePerformanceMeasures and setNormalisingConstant to basis
add memcache doc
update linux doc
merged conflict
Renamed golden files.

This lets the following work properly, since the go tool no longer gets
confused about the types of files:

    go test github.com/jacobsa/...
import of new bin scripts
disabled shared session history
Fix for issue #9 (nth-child equations starting with + or -) and issue #10 (parser auto-close tags)
Additional handling improvements for legacy C/C++ code.
Merge pull request #2 from mnmcdermott/master

CCCC Update Reqeust
ScoutCamp: EventSource fix.
Merge http://github.com/espadrine/tree
checkout: prefer mode_t type usage over int
Fix MSVC amd64 compilation warnings
git_repository_hashfile: Only close file handle if we have a valid one

Otherwise this throws an exception on MFC based systems.

Signed-off-by: Sven Strickroth <email@cs-ware.de>
checkout: add notification callback for skipped files
Merge pull request #943 from csware/only-close-open-filehandles

git_repository_hashfile: Only close file handle if we have a valid one
Merge pull request #942 from nulltoken/topic/checkout-notify-skipped

checkout: add notification callback for skipped files
Make giterr_set_str public

There has been discussion for a while about making some set of
the `giterr_set` type functions part of the public API for code
that is implementing new backends to libgit2.  This makes the
`giterr_set_str()` and `giterr_set_oom()` functions public.
Make clear that git_odb_hashfile does not use filters

Signed-off-by: Sven Strickroth <email@cs-ware.de>
Merge pull request #948 from csware/comment-fix

Make clear that git_odb_hashfile does not use filters
Fix -Wmaybe-uninitialized warning
Tags: teach git_tag_list not to include the 'refs/tags/' prefix

Since quite a while now, git_branch_foreach has learnt to list branches
without the 'refs/heads/' or 'refs/remotes' prefixes.
This patch teaches git_tag_list to do the same for listing tags.
Tests::Object::Tag: move listing tags tests to an own file
Tests::Object::Tag: Add a mechanism to test which tags were returned

This patch changes the tag listing test helper to use a struct as input
parameter, which tells what we exactly expect.

As I don't think, we can rely on the fact that every os and every
filesystem will report the tags in the same order, I made this code
independent of the order that the tags are retrieved.
Tests: Add 3 tags to resources/testrepo.

Adjusts refs::list test (including the comments)
Adjusts objects::tags::list test
Tests::object::tag: also test for a 'foo/*/bar'.
Tests: reindent object/tag/list.c to use tabs
Tests: Add test for git_tag_list to check for 'git tag -l "*bar"'
refs: make git_reference_normalize_name() accept refspec pattern
refs: introduce git_reference_is_valid_name()
refspec: introduce git_refspec__parse()
make: updated SIRDsims-mcmc-density.RData and SIRDsims-mcmc-quantiles.csv
Fix syntax highlighting for variables containing keywords bounded by
underscores.

eg my_new_var was being highlighted in multiple colors.
Remap newline-and-indent to coffee-newline-and-indent
small fix of coffee-regexp-regexp so it doesn't cause massive hangs when matching across newlines
Workaround to avoid getting garbage chars in the comint buffer.
fixing triple quoted strings issue with code from python-mode
don't force key redefinition in major-mode hook

- One exists keymap per major-mode.  There is no reason to keep writing the
  same thing to it in the mode definition.
- By doing this, the user is forced to customize key-bindings in a inefficient
  way (i.e. in a mode hook instead of "eval-after-load").
Added support for iced coffeescript await and defer keywords.
Add a little note that this handles iced coffee script syntax also
Merge remote-tracking branch 'disnet/master'
Merge remote-tracking branch 'levskaya/master'
Merge remote-tracking branch 'chellmuth/syntax-highlighting'
Merge remote-tracking branch 'remotes/fred-o/readline-workaround'
Merge remote-tracking branch 'remotes/bartvandendriessche/master'
add support for the "own" keyword (for own k, v of obj ...)
"where" isn't a coffeescript keyword
autoload coffee-mode for .iced files (IcedCoffeeScript)
Updated gitignore, and fixed readme typo
removed old hardware
Squashed 'onboard/hard/' content from commit b6cc5c1

git-subtree-dir: onboard/hard
git-subtree-split: b6cc5c106ffb02b0ffcc48a31374ad5acb57282c
Merge commit '73568110d2ea6b804698436f74e5649f1f4c47a4' as 'onboard/hard'
Add header option to http GET
Initial update to the README
Updated README
Completed Nullable/Optional parameters information
gitignore now allows tools folder
[AS7-5652]; set TCCL for any POJO service invocation.
AS7-5904 JGroups startup before ISPN startup causes HotRod connector startup fail
Source code cleanup.
Upgrade EJB client library to 1.0.15.Final
Fix the testcase to take into account the fixes done for EJBCLIENT-53
Fix AS7-6014. Make NamingContext.lookupLink(String) perform lookupLink not lookup.
AS7-6013 Remote EJB invocations are read/written out one byte at a time
upgraded HornetQ to 2.2.21.Final
[AS7-5545] Upgrade to Remoting JMX 1.1.0.Beta1
[AS7-5556] Where we convert to a String ensure we set the charset to UTF-8 for both processes.
Move OSGi tests into a private area
[AS7-5012] cli expects invalid type for mod_cluster capacity
[AS7-5012] cli expects invalid type for mod_cluster capacity - tests fix
Fix deployment overlays XML bug
Fix bug with domain mode composite operations
AS7-5497 added exception wrapping for notSupported even for tx == null
Break jsf injection out into its own manven submodule so it can live in its own jar.
Create jsf injeciton module.
Modify poms for jsf injection module.
Make possible to have single/simple operation description return type. min-/max-lenght for BYTES
[AS7-5107] connectors & discovery-group alternatives

* use AttributeMarshaller to marshall discovery-group-name &
  connector-refs attributes for bridge, cluster-connection
  & broadcast-group resources
* define connector and discovery-group as alternative attributes
  for bride, cluster-connection, connection-factory &
  pooled-connection-factory resources
* add a AlternativeAttributeCheckHandler in the MODEL stage
  when writing attribute to these resources
* replace JndiEntriesAttribute's attributes by regular attributes
  with custom AttributeMarshaller
remove AttributeDefinition subclasses

* as in previous commits, finish to remove all
  AttributeDefinition subclasses and replace
  them by regular AttributeDefinition instances
  with custom AttributeMarshallers
spelling fix
use OperationDefinition & some minor jca cleanup conversion
ObjectTypeValidator move
Deprecate registerOperationHandler(String,...) in favor of Operation definition
AS7-5572 ObjectTypeAttributeDefinition does not honor key format in resources

- some cleanup of jca
Updated to 4.17.2.Final
Updated to 4.17.3.Final-SNAPSHOT
Renamed the project to fb_util rather than facebook_graph_api and added the parse_facebook_request methods
Fixed rounding algorithm
Changed b to (b) in macros.

Done to allow macros to be called with &b.
Add tests to Makefile
Added .swp to gitignore
Added som tests
bug consertado: agora funciona com uma chave primaria composta de tres ou mais atributos
busca de metas com um novo parametro: tipo. se for passado faz a busca filtrada por ele, caso contrario, ignora
mudancas sem importancia
metodo findAgenteDeSaude reimplementadousando criteria e verificacaode parametros
mudancas visuais
criado crud de cargo e competencia
Bug 1231 - Flatten tests to please IE9
Script for making new tmux panes that maintain cwd on OSX.
just added the Reddit canal index page
Automatic commit at Thu Dec 27 14:00:01 MST 2012
Automatic commit at Mon Aug 27 13:00:01 MDT 2012
Add numeric asserts for entropy and mutual info test, with 1E-9 tolerance
- updated iana ports list.


git-svn-id: http://unbound.nlnetlabs.nl/svn/trunk@2708 be551aaa-1e26-0410-a405-d3ace91eadb9
- FIPS_mode openssl does not use arc4random but RAND_pseudo_bytes.


git-svn-id: http://unbound.nlnetlabs.nl/svn/trunk@2709 be551aaa-1e26-0410-a405-d3ace91eadb9
Working on a 65816 quick reference guide.
zbais
hippo function dealing with creative is added.
If the source buffer somehow becomes modified during dash editing, die.
Use cond.
More cleanup of Diff code.
More cleanup of Diff code.
Migrations stuff removed
[lib] core: further improve block validation, with per-TX validation tests
Cleanup the 3-hyper directory a bit
Rearrange the syntax directory a bit
Go LGPL for now, so that people must contribute back changes
changed heap implementation
Improve code styles, bugfix to admin
Update Dropbox
Merge branch 'master' into subtle
adds prototype for cancelling directory progress from CDirectory::GetDirectory
drop the progress dialog from plugins retrieving folders, preferring to use the busy dialog from CDirectory::GetDirectory. Fixes #13244
cosmetics: indenting
adds GetProgress to IDirectory, and implement for CPluginDirectory
adds progress dialog support (id 10) to the busy dialog, and utilise in CDirectory::GetDirectory
cleanup - no need for updating labels on the progress during plugin directory fetch, as it is using busy dialog now
[confluence] adds progress control to busy dialog
[AE] correct BitsPerSample for bitstreaming formats
[droid] fix run-time errors for build-side programs
[amlplayer] fixed, rename AVClass so it does not collide with internal ffmpeg, it is just a pointer placeholder
[amlplayer] pull various fixes from upstream
 1) fixed stacked playback
 2) fixed missing a/v delay
 3) fixed video zoom mode under 1080p
 4) fixed hdhomerun, vector to our vfs and not directly info libamlplayer
Revert "fix: add swig to osx depends Makefile.in"
This reverts commit fadab05319e0464ca6caa3c39a0fde352181a15d.

This is wrong as it adds swig to runtime. Swig is already in
BUILDTOOLS, see line 3 of depends/Makefile.
Fixed wrong type check on xbmc.Player.play.
[win32] fix VS configuration for "Debug Testsuite"
[osx/ios/others] - fix linking when building depends with _DEBUG and core as release (fixes ios buildbot)
[osx/linux] - add vendor, cpumodel and features to CPUInfo and fix typo for SSE3/SSSE3 in CPUInfo in linux
Fix wrong sizeof() argument
Fix possible NULL pointer dereference in PVRManager.cpp
Fix use of uninitialized data in PVRClients.cpp

If GetPlayingClient or GetStreamProperties returned in error props would
be uninitialized when returned from this method
Fix dereferences before NULL checks in AddonCallbacksPVR.cpp
presentationfile
70 complete
71 complete
price update functionality
Some small changes to TODO
Move slurp from LayerManager to gs_helpers.py
Disable south debugging statements
Make sure updatelayers works still
Remove print statements in maps/views.py
Auto-logout, Sounds and Image Added
remove initial assignment of BASE

Change-Id: Ida6d71b65892a3c9a80f37d42e8951992918f781
added a package.json, with dist/bling.js as main, so we play nice as a node module
nonsense
add tests for NaN and toString (to capture recent fixes)
fix the various math reducers so they filter NaN/Infinity
protect 'key' from scope clobbering when adding default root-level funcs
tiny bit quieter
lots of little bugs and typos
push a stripped down bling.coffee into dist/
Ignore .gem files
wip - ensure clean/clean = clean
introduce Filter class so as to break up joins/where/order in a nicer way for the videodb
remove WHERE from Filter::where and append where they're actually used in Get*ByWhere()
Adding custom sort order back for getActivities call in mysql adapter. #665
Merge branch 'development' of /Users/jmathai/dev/opme/frontend into development
Fixing min set tables to scroll independently
[AS7-5538] fix pooled-connection-factory XML marshalling

* check the definition and keys of POOLED_CONNECTION_FACTORY node
AS7-5225    Support for TLS based mail servers

- model update
- transformers support
AS7-5225    Support for TLS based mail servers

- model update
- transformers support
- new xsd
AS7-4799 - Convert JDR subsystem to ResourceDefinition

 * clean up unnecessary stuff
 * add complex attribute return type support to OperationDefinition
AS7-4799 - put back few tests
split messaging subsystem XML parsing and writing

* add MessagingXMLWriter to write the messaging current version in XML
* let the MessagingXXSubsystemParsers handle only the XML parsing of the
  specific versions
make messaging XML marshalling more consistent
AS7-5540 Update jreadline version to 0.20
upgraded HornetQ to 2.2.21.Final
[AS7-5545] Upgrade to Remoting JMX 1.1.0.Beta1
[AS7-5556] Where we convert to a String ensure we set the charset to UTF-8 for both processes.
Move OSGi tests into a private area
[AS7-5012] cli expects invalid type for mod_cluster capacity
[AS7-5012] cli expects invalid type for mod_cluster capacity - tests fix
Fix deployment overlays XML bug
Fix bug with domain mode composite operations
AS7-5497 added exception wrapping for notSupported even for tx == null
Break jsf injection out into its own manven submodule so it can live in its own jar.
Create jsf injeciton module.
Modify poms for jsf injection module.
Trim whitespace.
Vim python-mode config
Fix typo in pynfc
Adiciona sistema básico de autenticação
underscores in usernames
Make MeasurementKey refer to StudyOutcomeMeasure

Work in progress story #372: MeasurementKey should not refer to Variable but StudyOutcomeMeasure
Images copied from GeMTC to avoid an issue with loading icons from GeMTC (not pretty, but it's just a
couple of small icons)
Replaced Logo.png with Chracter.png
CA-64962: Allow RO VDI to be copied as well

Signed-off-by: Vincent Bernardoff <vincent.bernardoff@ocamlpro.com>
CA-85032: disallow non-empty vif-maps in intra-pool (storage) migrations

Signed-off-by: Rob Hoes <rob.hoes@citrix.com>
CA-85972: Typo fix.

Signed-off-by: John Else <john.else@citrix.com>
Merge commit '93ff34406b4ea0bbee013e51df8cc255e452819b'
Merge commit 'acf078e7b5775d43b57d94e51ff24a156b238ad0'
Merge commit 'a5a764753e12fc4afe3dbe02a723a6cf38077b06'
Mimics Java's System.out.println(System.currentTimeMillis()).
Pulled the list of remote commands out of main.c

Created an extern variable to allow the list to be put in pd_command.c
Properly marks up strings in the Piwigo publishing dialog for translation. Closes #4889.
Eliminates a duplicate mnemonic in the preferences dialog. Closes #4934.
Fixes confusing strings that are shown to the user following an ACCOUNT_NOT_SET_UP or an ADDITIONAL_SECURITY failure scenario in the YouTube publisher. Closes #4941. 
Simplifies language in the Welcome Dialog to make it more comprehensible to novice users. Closes #4956.
Makes sure all the .help files needed for correct operation are copied; closes #4961.
This reverts commit 9c405d1942577bf15cc83754c52e766005c9e079.
Corrects an issue where certain pretty-printed date ranges could display incorrectly in en_gb; closes #4976.
added .ignore
fixed ddl sytax error on FK
Initial code check-in (completely untested)
Adding namespace, updated description
Updated README to include instructions for building ceramic-xxx.gem package from source.  Minor change to version number to prove it works.
Update postprocess.sh

fixed error
tests with modals
cleared
2012-03-27 04:07:14 -0700
CONNBP-13
- Draw "LevelConnectionsFor" graph

CONNBP-14
- Draw "RelatedTo" graph
started work on gallery module
Newly amended files and css change.
Merge pull request #11 from jougabetta/master

alteracao no crud
enviando sessao de escope session vraptor
Merge branch 'master' of github.com:demetriusf/umake
enviando todos mais arquivos da adm
enviando arquivos para o JouGabetta alterar
alteracao no crud 04/04/2012
Only perform d2c cache bumps for extensions
point rating headers on profile page to detail pages
cope with solitude checking the email (bug 776041)
add the category of the application to the desktop entry file (bug 760748)
bug 768136 - Add garbage collection to market

Currently only culls ActivityLog entries older than 90 days.
Should that be a config value?
Merge branch 'master' of git://github.com/mozilla/zamboni
Merge branch 'master' of github.com:jrconlin/zamboni

Conflicts:
	scripts/crontab/crontab.tpl
Fix suite runner function.
About to create import stage in separate file
introduce a embed RackConfig implementation
initialize the config from the application runtime
[embed] adjust Config property resolution; keep backward compatible Context constructor; add specs for Config and Dispatcher
Library, Adding JQuery plugin nivo slider
adding child count to node

in the future, i would like this to be an option to show or not
updated firebase reference
Wooo
fixing merge
Added COPYING and some other needed files
Add slate file
Fix dirty detection
comments can go after option in yml
Suporte a matriz - matrix instanciada
re-fixed default.cmake for local MPI systems
won't compile :(
new jar
removing .ignore
Add forms documents
Add admin form view
Begin dialog implementation
Continue implementation
Merge branch 'dev' of github.com:just1602/web-tp3 into dev

Conflicts:
	css/styles.css
Final commit…
Tweak History section in documentation
Restored multiprocess functionality to working order.

Two issues were addressed:

* The desired number of processes was not getting passed from the
  command line to the RPMD functions. To fix this, I added a new
  attribute RPMD.processes to store this value instead of having it be a
  parameter to various methods.

* An issue involving the potential function was resolved. The key here is
  that, to use multiprocess, everything passed to the pool of child
  processes must be picklable. In order for functions to be picklable,
  they must be defined at the module level. To make this work, I wrote a
  small wrapper function in the rpmdrate.input module. A bit of a hack,
  but it works.
Added option to ignore the missing radix argument for parseInt method.
Add {{:}} else syntax.
Merge pull request #1 from alice/master

Add {{:}} else syntax to the Java implementation of Handlebar.
sprite'y powinno dać się teraz usuwać
One bug registered.
fixed announcement and test
first cut at upgrading to bootstrap 2, reorganizing files and cleaning up less
removed unused files
added font imports
fixed content padding
fixed labels sizes for moderator and private
fixed filter bar
fixed nav bar
fixed pagination bottom
fixed content padding
fixed recent activities labels
fixes slickgrid people header
removed unused font family
fixed content feed group button
basic fix for calendar
fix results in pagination
fixed search page side bar
Merge branch 'refs/heads/master' into blaflamme-1044077-bs2-less-refactoring
removed unused css file
readded events portlet fix
removed duplicated vars
get active communities and some display style fixes
Bugfix.
Regenerate gemspec for version 0.0.39
Merge branch 'ccdev' of github.com:mvpdev/rapidsms into ccdev
Typo fix and script for converting old DOBs to ethiopian
Adding to-dos to docs
fixed spelling mistake
Merge branch 'ccdev' of github.com:mvpdev/rapidsms into ccdev
Fixing title in CHW Report
Translation of Child Count Plus terms to Tigrigna
Showing Temesgen how to use git
Merge branch 'ccdev' of github.com:mvpdev/rapidsms into ccdev
Localization
Uncommiting static files
Ignoring static files
Working in l10n for reports
Working on translating reports into Tigrinya
Reports generate in language specified by settings.LANGUAGE_CODE
Work on getting generated reports to translate into Tigrinya
PMTCT Defaulters report
convert to integer the number of nets issued
Localization
Adding docs
not quite done with Ch 18
addressing property issues
Merge branch 'master' of https://github.com/kbrafford/pyfly1

Conflicts:
	src/pyfly1.pyd
	src/pyfly1.pyx
MAYBE WORKS? PLEASE BREAK ME
Added rental system
Fixed gameinstall.
Dont forget to do the copy and drop instructions when moving a table.
Merge pull request #469 from Gravecorp/master

fixed gameinstall
file not verified message did not give submitted name
edited comment on need for ack. ta1 headings
improve file search in batch_get_st_block
edit handling of batch_get_st_info
version 2 complete
modify ack to search aspx and ascx files
Merge github.com:kienwai/dotfiles
create event after sync to google calendar
Support linux and mac
add AnsiEsc submodule
add AnsiEsc submodule
basic express 3.0 support

app.set('view engine', 'vash')

is all that is required, or

app.engine('vash', vash.__express)

to be explicit
caching express views based on env.NODE_ENV
gui semi modificada
Merge branch 'master' of https://github.com/HecThorFer/CSLUESFMO
gui semi modificada
Merge pull request #11 from HecThorFer/master

interfaz
added environ to configall.sh and added to README.md
Maintenant ça fonctionne !
J'ai corrigé le commit de koliaza pour que non seulement ça compile, mais aussi ça fonctionne! J'ai aussi mis en forme le rapport. Bon il y a quelques points à améliorer (par exemple 01 est reconnu comme 1 et non comme une VBitArray[0,1]), mais sinon ça va.
Fix non-ASCII usernames not working
Pridane nejake zaujimave clanky a zdroje, casom este nieco pribudne.
西村　人件費項目名称マスタ　追加
Added capability for levelset to get/set current level index.
Added storing of current level in settings and loading it at the game start. Fixed some bugs with fading. Added some cheatcodes.
Added possibility to load an external file with sokoban level collection (SLC).
Added storing of levelset (if set) in settings.
Fixed bug when loading file which isnt exist.
Made a new, original embedded level set.
Made README file.
Commit gemfile and lock file
minor cleanup
Enable hot deployment support for Ruby cartridges

Support the hot_deploy marker in the ruby-1.8 and ruby-1.9 cartridges.
adding not-origin tag to postgres cucumber feature and specifying complete path for ip program
Merge pull request #343 from abhgupta/abhgupta-dev

Merged by openshift-bot
Merge pull request #339 from danmcp/master

Merged by openshift-bot
Merge pull request #345 from ironcladlou/hot-deploy-ruby

Merged by openshift-bot
Restart proxy if its been stopped.
Create sandbox directory.
Merge pull request #348 from rmillner/US2683

Merged by openshift-bot
Fixing a few mode issues for Fedora packaging
chmod and shebang fixes for Fedora packaging
Merge pull request #349 from brenton/chmod_shebang_cleanup2

Merged by openshift-bot
Refactor runtime tests to improve retry times

Split tests to allow granular retries
restructure jboss tests to reuse single instance
wrap steps in calls to benchmark#measure
Move runtime assertions into their own file
Update Scenario headers
rebalance test threads
Introduce StickShift::timeout
Refactor cron tests to use perl
Refactor jenkins-client tests to use perl
Depend on ApplicationContainer.destroy to remove application
Added additional debugging output
move debugging to logger
use configure_order for move
fix for gear's group_instance_name being stale
Merge pull request #352 from jwhonce/testing

Merged by openshift-bot
Increase URL matcher to 5mins
Merge pull request #353 from jwhonce/master

Increase URL matcher to 5mins
Updating gem versions
Add enviroment for holding the variable states in the given frame.
Make the evaluator get variables from the enviroment.
Add assignment operator to parser and evaluator.
Added functionality for creating and evaluating new functions.

Syntax is more lisp-like, than scheme..
refactor generation of SimpleShape
rendering outlines added
sound class working
OCN-136 - each course item now contains unique id (uniqueId). Its parsed into internal Timeline structure as .courseId
testing ps gfx
Merge branch 'gfxtest'
taboo search
Fixes version for 'gem' command
Updated for build process

- Missing new items in BuildOrder.txt files
- Tests were failing in case sensitive databases (fixed)
- Added TempSignKey.snk to get around problem with unknown sign file password.
Added style matchers. Better organization and docs. Version bump
Modify the position of class power
add colorizeTerm.pl
Captcha for multiple invalid login attempts
clean up more tilde files.
Update README.md

Fixed the read me
Avoid OSX garbage to be committed.
Implement `--list` option for `pry-theme` command

Resolve issue #1 (pry-theme command should support a `--list` option to
show the list of available themes)

a) Refactor Helper#each_theme_in, so it yields the number of files in
   the directory;

b) Add concept of default theme: rewrite old mechanism, create a special
   variable, which stores the name of the current theme. Add getter
   method for retrieving this value;

c) Implement `-l` aka `--list` option, which shows all installed Pry
   themes. Every theme name heading is shown with a little colored code
   snippet beneath, which makes selection of a new theme a little bit
   easier (thanks banister for the idea). Mark currently active Pry
   theme with asterisk.

Reported-by: John Mair <jrmair@gmail.com>
Signed-off-by: Kyrylo Silin <kyrylosilin@gmail.com>
Fixed errors in meetings.rb update script
redis client can now be set directly via DulyNoted.redis= (and not only by URL)
update redis dependency to 3.0.0
WIP keys
cleaned up deprecated code
cleaned up deprecated code
gráfica correcta
LL
- Moved Home screen NIGGA!
LL
- Moved Home Screen
LL
- Commmit some user data
Added yoffset to streamgraph
allow multiline body
done ch2,all published++
updated store prices
attempts at purlMiddleware - using server/index.js to set
session.userId so can properly handle access paths
almost got accessControl working, getting errors in createWriteGuard
removing accesscontrol for now, but at least only subscribing to the
necessary data
Added Readme + Todo.
111
Merge branch 'master' of https://github.com/lengxilai/IGT004
111
111
Merge branch 'master' of https://github.com/lengxilai/IGT004
111
update the README
change from 1 to 2
Add command

Create 'compile' command that take care of compilation process
Register command

Register 'compile' command on application
Directory Iterator

Create function to get list of files recursively
Fix directory iterator

Fix directory tranverse error, add capability to sort out file by
extensions
Parse markdown

Get list of files, parse file content
Add option, save parsed file to output directory

Add option to specify output directory, save parsed file to output
directory
Merge branch 'dev'
- added some test data
- added pulling of projects and project details
Detect stack overflows and try a _slightly_ better cell allocation algorithm
deleted pledge partial
tested pledges model
pledge views
reset
cont
Merge https://github.com/lh3/samtools
heroku compile assets
heroku compile assets
change category and doctype to select lists
fixed data and dice similarity
First commit of HTSP (Tvheadend streaming protocol) client.  Specify a host/port/channel on the command-line and it will attempt to play the MPEG-2 video stream (no audio, no h.264)
change option to handle with meta again
fix version
Update DBO Comment via git Online Editor Again.
remove console.log/info/etc linting and arcTo (still buggy)
Added changes into help
Swap the columns in the lldb & gdb command comparison table.  I
often hear feedback from people that having the lldb commands on
the left hand side is non-intuitive -- they say "I want a *gdb* to
*lldb* table, not a *lldb* to *gdb* table".  It doesn't seem odious
to go from the right-hand column to the left hand column but I've
heard this same feedback enough that it's also pointless to keep
the format lldb-first, gdb-second when it was an arbitrary choice
to begin with.



git-svn-id: https://llvm.org/svn/llvm-project/lldb/trunk@165294 91177308-0d34-0410-b5e6-96231b3b80d8
Update the intro paragraph of text describing the table below to
reflect that the columns were just swapped.


git-svn-id: https://llvm.org/svn/llvm-project/lldb/trunk@165295 91177308-0d34-0410-b5e6-96231b3b80d8
typeo

git-svn-id: https://llvm.org/svn/llvm-project/lldb/trunk@165296 91177308-0d34-0410-b5e6-96231b3b80d8
typeo

git-svn-id: https://llvm.org/svn/llvm-project/lldb/trunk@165297 91177308-0d34-0410-b5e6-96231b3b80d8
Symbols::LocateMacOSXFilesUsingDebugSymbols() - perform tilde
expansion on the dSYM path we find if it starts with a tilde.



git-svn-id: https://llvm.org/svn/llvm-project/lldb/trunk@165299 91177308-0d34-0410-b5e6-96231b3b80d8
Make sure to check the module is valid after trying to find a shared module.



git-svn-id: https://llvm.org/svn/llvm-project/lldb/trunk@167471 91177308-0d34-0410-b5e6-96231b3b80d8
Pass context pointers to LiveRangeCalc::reset().

Remove the same pointers from all the other LiveRangeCalc functions,
simplifying the interface.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@157941 91177308-0d34-0410-b5e6-96231b3b80d8
Remove unused variable.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@154661 91177308-0d34-0410-b5e6-96231b3b80d8
MachineBasicBlock::SplitCriticalEdge() should follow LLVM IR variant and refuse to break edge to EH landing pad. rdar://11300144

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@155470 91177308-0d34-0410-b5e6-96231b3b80d8
Add a testcase for 155440

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@155475 91177308-0d34-0410-b5e6-96231b3b80d8
Fix the testcase. We do expect two vblendw on XMMs.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@155477 91177308-0d34-0410-b5e6-96231b3b80d8
Remove one of the LLVM-specific CMake hacks in favor of standard CMake
facilities.

This was only used in one place in LLVM, and was used pervasively (but
with different code!) in Clang. It has no advantages over the standard
CMake facilities and in some cases disadvantages.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@158889 91177308-0d34-0410-b5e6-96231b3b80d8
Remove an unnecessary 'finally' that breaks py2.4 support
Bump to version 0.2.
added a font link to markup

from google web fonts. font name "IM Fell French Canon SC"
Minor change on Qiangrw's pull request 3
Загрузка телефонов и парсинг номеров
added back button on profiles view
SDL: Slight cleanup.
SDL: Properly handle extra pixels for scalers in showOverlay.
main app OK, script moved to root
fixes #49: new option to select nested optgroup options
servlet updated
coordinates applied to set/get cells on row, new params for table.row methods, test units, fix set repeated on repeated
added my pem-file to ignore list
Readme is markdown
Play with badge
add modelo mtraerVictimasActo
Merge branch 'master' of https://github.com/luisalein/idheas
cairnsmore: Beginnings of new driver, with automatic upgrade from Icarus detection

CAIRNSMORE1_HASH_TIME based on 10000 samples
remove this line which gives a warning
add a missing vim plugin
move links to top
increase padding of status view for bigger screens
show all ip addresses
set max frame height to 64px
update version
remove back button
add backup and restore
new fix for offset
same scan width/height on different devices
move location of tesseract data
add backup/restore, fix offset by moving original frame and use display metrics to help setting frame size equal on different devices
fix imports
update strings
update strings
fix: leave fileable only on -awol,late,undertime- remarks
bdb.tex: translate "The Underlying Components".
new copy for these pages
make (un)install
spec:s for ~.local.LocaLUser
connecting UDP withs as expeted with TCP: server knows directly, no init packet required + user fix
LocalUser skeleton
getter+setter encapsulation in User with synchronisation
forced use of User getter and setters
LocalUser skeleton extended with friend data
todo list for orphan taks
LocalUser done except loading and saving
LocalUser complete
reconnection (should) work in hub
todo
--format=csv described
giusto tipo campi di user
Refactoring + scaladoc
Segment -> private
blueprint-allow-insert-fields:

New operation '!' (insert) to box.update Lua fuction was added.
Add tarantool_snapshot_rotate script to debian package
Add manpage for tarantool_snapshot_rotate

Fix debian/copyright (closes lintian warning).
added a new step oscillator
exiftool 9.08
brew-test-bot: add skip cleanup, setup options.
brew-test-bot: print bottle output with --log.
sort after deliver cards

yesterday the submit cause github crash, I have to remove the branch and
re-sync the code to recover the environment.
changed condor configuration
Better errors from xhr module, and add postJson method
Some performance evaluations
antimake: improvements from dev repo

- aclocaldir
- More tracing macros
- Rework O= support to use make functions instead shell
- Add hooks concept
- Add externally loadable features concept
- Move libusual hacks from antimake.mk to amext-libusual.mk
- amext-modes.mk: add more ways to compile one target

To load 'libusual' or 'modes' extension, add AM-FEATURES to makefile:

  AM_FEATURES = libusual modes
antimake: postpone varoverride in BigTargetBuild

If variables are overrided immediately, they don't
see changes made inside BigTargetBuild.
changed from indention to spaces
Collector locale changes, improved navigation
Add test case for <rdar://problem/8808566>, which is now fixed by inlining support.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@152894 91177308-0d34-0410-b5e6-96231b3b80d8
Added more categories
Improved description
Initial commit
Added analytics
finished implementing jobs/pjobs
Prepartion for 512 MB raspberry.

Updates memsplit handling code
Switch to standard kernel instead of cutdown
A10: do not load lcd/hdmi/disp modules as they are now built-in
Deleted files in main directory
funcionalidade de acompanhar usuário
Add vs. Average table into player page.
oc AXI
Revert "Revert "remove ar6k suspend/resume functions""

This reverts commit 8855ce7a11e9631455a06de25ce19689baa8508a.
typecast fix to eliminate single complement conversion warning on windows
postgresql fixes for manufacturers
beta version: o mnie, oferta, cennik, kontakt
Players get opening hand now.
Added decks. Game will gather a starting resource deck.
Still in development warning to newreadme snippet.
Added a model for Eol Taxon Concepts
Initial install of WP
Adding support for wordpress multisite
Adding deployment routine
Reworked AsyncFirst tests to have good and bad cases
Add support for POLYIGNORE for fields create_lua_library would otherwise choke on
content deletion - adding CLI actions
updated migrate controller path
yellow flash-top, thanks Paolo
some more flash style changes
new bigint type, DAL(...bigint_id=True) works better
added public to methods and added argument for searching methods
Merge branch 'master' of https://github.com/melstrom/cs304p3
Message-ID zwracane przez EmailUtils po wywołaniu send.
Komentarze - wysyłanie na Google Groups.
Merge branch 'master' of github.com:mendlik/meetings
Add Places Resource to API v1
Remove old experimental api from worshipmap
Fix urls.py of worshipmap
Add epsg transformation to /places/ resource and improve xhr client
Add markers for places of worship
Add link to detail view
Move javascript into own file and start dev of detail page of place
Add request_id to places/ resource to make it simpler for api clients to map respons on request
Display more detail informations
Add required zoom level to get places
Move status messages in navigation bar
Fix typo
Render addional information from OpenStreetMap in DetailView
foreignkey to unite table .. commented.
Merge branch 'osm'
Merge branch 'wikipedia'
migrating some new foreignkey
Added media queries for text resizing

issue with main cta comics breaking and forced to another line
Theme updates and new aliases
tests pass, ribbit ribbit
CFpoint: allow pressure coordinates; profile uses id;
try 2
[maven-release-plugin] prepare for next development iteration
hdf5 data table
[maven-release-plugin] prepare for next development iteration
Merge remote-tracking branch 'remotes/origin/target-4.3.11' into target-4.3.12
Merge branch 'target-4.3.11' into target-4.3.12
Some modest HDF5 refactoring
Some modest HDF5 refactoring (2)
Fixed csv headers in ncss requests
put UsageLog calls into filter for all requests; remove from calling code.
Merge remote-tracking branch 'origin/target-4.3.12' into target-4.3.12
add SOCIB to top catalog.
add cataloggen to tdsMonitor service type
try again
try again
Merge branch 'nc4' into target-4.3.12
Added time range support in WMS capabilities documents. 
Added optional element intervalTime to standardName element in
wmsConfig.xml
Added the wmsConfig.dtd as an external reference.
Changed the content type for ncss' csv responses from text/csv to
text/plain
nc4 jni testing
face modificada

Añadido de funciones de eliminar y cambiar coordenadas de vértices
Merge pull request #6 from AlberFernandezYFranRamirez/master

face.h modificada
update web to include rich snippets
Added skeleton code for mouse movement and interaction with squares.
Added pre-commit hook for CoffeeScript linting. Modularized grunt shell tasks.
hlisp compiler plugin seems to be working
Created _posts/2012-07-19-brand-new.md
closes #191 tour with tour status registration closed and canceled are now
exported as well
jetzt kommt das erst
2 paragraphs
Github line.
Temporary README.md
Ingoring .c9 and .dotcloud directories
Restore/create J SMTP DB row on installing/upgrading
Merge branch 'development' into dev/j3/common
Draw gate imges
Draw gate imges
asdks
update readme about integrating into B2G
added caching to makejpgs
added more samples and previews
removed ._ files
Add layout. Add jquery support
clear_cache! to explicitly reset the @cache ivar
issue #1564:fix a logical erroe in CCRotationTo
Added class for handlind bsp tree.
spostato slogan sito e tolto bordo sotto search form
posizionato form di ricerca
pattern di sfondo
tolto dal footer link autore tema
stile css background body
inserito logo.
cambiato font slogan sito
README second commit
Corrected timedelta argument from hour= to hours=
static import for code clarity.
[t2734] Share editor is hidden if project is not saved, + tooltip
[#2567] Use play instead of playing for state control and only skip skip plugin whle playing.
[t2617] Changed font system to use ems, added global media query mixin
Bug 2700 - Added new projects

- Stop and frisk
- Chocolate covered bacon
- Internet Bus Tour 2012
- Make a breadboard
- 101 things to do
- Messing around with maps
- Soundscape
[t2742] removed instances collection, replaced with app reference.
Bug 2710 - Prevent crash when BrowserID polyfill has not been loaded
[#2743] Only display track event delete warning dialog if more than 1.
Bug 2606 - Restart butter service after upgrade

Closes gh-1199.
Bug 2720 - Preserve dropped images file type when possible
[#2494] New projects will start backup when loading from dashboard, but bail early if no changes are made
[✔] Fixed background.
Test expectation block added to a stub

Current behavior: When setting expectations on a stub variable that
include a block, the block is not executed when the expectations are
being evaluated.

Expected behavior: I would want the block to be evaluated just like it
is evaluated when not setting the expectation on a stub existing
before.
Fixing styles on buttons
privatesite added label
message event now indicates if messge was encrypted or not, no need to check for session.isEncrypted()
Added a README file for the CSC258 folder.
Changed shelve so writeback=True, giving more reliable behaviour.
Still tweaking for production
Added menu and local storage examples
Added week 5 final code
Added week 6
Merge branch 'master' of https://github.com/rioleo/CS147
121107
Harshit & Duck | Restructured test directory and setted up framework for hibernate repository integration test.