labofsahil/github-event-dataset-2012 huggingface dataset:
Some translation fixes and more missing translations for pt-BR
[#983] Translated several keys to Bulgarian language.
Remove cookie cleaning method as it is not required anymore
[#988] Improving Swedish translation
[984] Allow to change locked and sticky status and the board of messages
Require WikiContent directly so WikiContentJournal is loaded before it's patched.

Error: uninitialized constant MergeWikiVersionsWithJournals::WikiContentJournal
ChiliProject on Travis <3 <3 <3
scm: mercurial: fix unit adapter annotate test fails on Windows Mercurial 1.8.4+29-e597ef52a7c2.

git-svn-id: svn://rubyforge.org/var/svn/redmine/trunk@6042 e93f8b46-1217-0410-a6f0-8f06a7374b81
Don't rely on ordering in news_test

The tests would fail because not all storage backends have a default
ordering
Also test stable and unstable branches on TravisCI
Updated czech localization by Radek Tříška
Correct email sending on attachment to document #1008
Fix comments missing in wiki add/update mails #986
Handle the '(Un)Check all' link. #994
Recalculate last reply of thread on message deletion #968
Fix a typo when calculating the menu X position. #1007
Reformat CSS to use the coding standard.

Formatting was done mostly by hand using the following as a guide
http://gnuvince.wordpress.com/2007/02/26/reformatting-a-css-file-with-vim/

" Replace all sequences of white spaces with one space
:%s/[ \t\n]\+/ /g

" Go to the end of the command, then forward one character and insert
" a newline
]/lr^M

" Make sure there is a semi-colon before each closing bracket
:%s/\([^; ]\) *}/\1;}/g

" Add a newline after every semi-colon
:%s/;/;^M/g

" Add a newline after every opening brace and make put one space
" between it and the preceeding text
:%s/\([^ ]*\) *{/\1 {^M/g

" Add two newlines after every closing brace
:%s/}/}^M^M/g

" Remove 'trailing' spaces in front of the semi-colons
:%s/ *;/;/g

" Make sure there is only one space after a colon
:%s/: */: /g

" Make the text before the colon lowercase
:%s/\(.\{-}\):/\L\1:/g

" Remove all trailing spaces at the beginning of lines
:%s/^ \+/g

" Indent the whole file
gg=G

" Split each rule onto its own line (This also matched some
" property/value combos so needed confirming
:%s/\([a-z0-9]\+\), \+/\1,^M/gc
Merge branch 'css-whitespace' of github.com:EspadaV8/chiliproject into css-whitespace
Adding Kithly.
use helper to attach callbacks to a specific session
only decode rtp packets in srtp mode
[maven-release-plugin] prepare release quark-1.0.4
[maven-release-plugin] prepare for next development iteration
added some pictures of the sunseabar
Add documentation for two new config options.
Adds user configurable LogLevel to bot configuration
Added obbSize(), obbCenter() & massCenter()
Merge pull request #86 from Tolyzor/patch-3

Added obbSize(), obbCenter() & massCenter()
Autodetect GitPath

GitPath can still be specified manually, but is no longer required.
Updated tests
Fixup StyleCop warnings
Change function getCount, use list expr
Fix LFTag.h for external package consumption
Floppy files can now be any size

If it's smaller than an actual floppy, it'll be padded with zeroes, if
it's larger, it will simply be cut off when the standard floppy size is
reached.
Remote: 12
Integration with js-fiddle.  Add fiddle button.
Made sure that BiomeAPI.getNextBiomeID checks the config file for ids as well.
Added functionality to BiomeGenBase to all biomes to be disabled.
Updated the example to reflect the changes.
Changes to Session customizetion

Allows to set woocommerce->session cookies expiration time
programmatically and to regenerate cookie on each visit (if required)
date-time format should accept times with fractional seconds part (with either comma or dot as separator)
Fixed navbar location bug
Change comments to comply with Drupal coding standard
Documentation text changes
Refactor render array
body class is no longer the same class as individual links
specificity changes, include ordering
Use specified fonts for text only bar
Move hide text so text is displayed for text only theme setting
basic focus and hover support
Agregando Fabrica rara

Se agrego una fabrica extraña con el mecanismo de Objective-C inventada
por completo durante una extasis de sabores en mi cerebro. Agregando
tambien un documento de error en el StoryBoard por que a la madre, que
raro es… funciona a la perfeccion en el simulador pero no se ve bien en
el archivo del storyboard, ahhhh!!! te odio iOS, Cocoa Touch y
Objective-C espero algun dia aprenderte a amar.
Changed watch library (Watchr) latency improvements, no double events fired
hackish fix for mapping
Merge branch 'master' of git@github.com:InsanerGamer/Abandead.git

Conflicts:
	Abandead/src/net/scylla/abandead/core/Game.java
add 1 elem to gitignore
Merge branch 'master' of github.com:InssetGrpB/service_CG
Merge branch 'master' of github.com:InssetGrpB/service_CG
Support Gson Date
Modificatio sur Login.
Merge branch 'master' of github.com:InssetGrpB/service_CG

Conflicts:
	classMain.java
change build
2 new modes
changes to the pom to support a new syntax highlighter
Adding another binding that looks at data-type to allow html safe data.

This behavior breaks pure MVC and does not conform to agility's stated goals but it is a nice hack/feature to have in a crunch.
One intended use for this is to allow for more flexible views without having to redesign an entire object.
set number inputs to type=number
Using new Register classes definition for Tranlation.
Merge branch 'master' of github.com:ralpheav/processmaker
Adding request PEAR classes temporarily
Merge pull request #980 from ralpheav/master

Adding new register classes instances
changing autoload function callback parameter from:
spl_autoload_register(array(Bootstrap, 'autoloadClass'));
to
spl_autoload_register(array('Bootstrap', 'autoloadClass'));
cause make appear NOTICE message.
 Adding time for CSS.
Merge pull request #981 from ralpheav/master

Adding changes to unset warnings
Adding delete Case classes need to the autoLoad.
Commenting unnecesary require files.
Merge pull request #982 from ralpheav/master

Adding classes to the Autoloader
Commenting DB interface requiere files from processMap class, already in Autoloader.
Adding fix for Bootstrap::SendHeader at set time for a non file.
Merge pull request #983 from ralpheav/master

Commenting classes that already are been loading in the Autoloader
BUG 6828 "Request that the address and label of link fields in..." SOLVED

- New feature
- Request that the address and label of link fields in DynaForms can be
  set and saved using case variables
- Populate links in a grid via trigger
- Added this new funcionality
- Take into account the following (examples):
    > Triggers
        * Populate a link field
            @@MyLink = "http://www.php.net";
            @@MyLink_label = "Read about PHP";

        * Populate links in a grid
            @=MYGRID = array();
            $i = 1;

            $rs = $stmt->executeQuery("SELECT USR_USERNAME FROM USERS", ResultSet::FETCHMODE_ASSOC);

            while ($rs->next()) {
                $row = $rs->getRow();

                @=MYGRID[$i] = array(
                    "MyField" => $row["USR_USERNAME"],
                    "MyLink" => "http://www.php.net",
                    "MyLink_label" => "Read about PHP, $i"
                );

                $i = $i + 1;
            }
    > JavaScript, populate a link field:
        getField("MyLink").href = "http://www.php.net";
        getField("MyLink").innerHTML = "Read about PHP";
* Available from version 2.0.46
Merge pull request #984 from ralpheav/master

Adding fix for SendHeader IE9 issue
BUG 9935 "DEL_INDEX PM Table Value" SOLVED

- Every time I send E-mails with PMFSendMessage() function, it doesn't
  keep a track in DEL_INDEX field from APP_MESSAGE table
- Added parameter $delIndex to the function
* Available from version 2.0.46
Adding AppFolder to autoloader, missed in Save Cases feature.
Commenting log lines.
Adding AppFolder to Autoloader
Merge pull request #987 from ralpheav/master

Adding classes to the Autoloader
multi threading with Qt
deleting..
added pointlight, some bugfixes
ALL the materials!
Missing comma
Added a plugin.tiddlywiki file for the zoomigator plugin
ViewEntityAction on non-existing pages displays right link to create entity

Before when on a non-existing page using an entity content model, the page to create a new one would refer to Special:CreateItem. This is changed now and in case of entity type query there is no link displayed at all since we do not have one currently.
Added a new function EntityHandler::getSpecialPageForCreation() which returns the special page for creating an entity of the kind.

Change-Id: Iff21b706f73c2e8e8c58189c5e3e44a1c53fc8f8
inserting table headers when adding the first site link

on a new item, when adding the first site link, the table headers were not attached to the site links table

Change-Id: Id84f0b5255c167adebadb963d0e5fa8046770582
(bug 40565) removed hard-setting font

Change-Id: I3121484fa78daf31e9155103f9d8c83aa85db21d
(Bug 40227) Add title and remove returnto

Patchset 2: Spelling error
Patchset 3: This should work for both property and items.

Change-Id: I6d803a237ee7f1a34c58458c1388882ffeb0a0d6
Merge "(Bug 40227) Add title and remove returnto"
Merge "(bug 40565) removed hard-setting font"
Remove pointless wikibase- prefix

Change-Id: I28eed930cc364d3b51c85dd88d36aecd15ded3cd
Attempt to fix item lang+label+desc uniqueness restriction

Do not merge without merging the follow up commit as well. This commit conatins broken state,
but code I also want to keep in the history, as it represents a nicer solution then the follow
up but is not possible due to bug in PHPs PDO, or at least in the SQLite implementation of PDO.

Change-Id: Id1e2ec3e70b5b44d12e57da01198aa98fd7ef681
Merge "ViewEntityAction on non-existing pages displays right link to create entity"
fix for autocompleteString test assertion

autocompleteString assertion was not working in Firefox

Change-Id: I5d52a21056ade2310e530c7fe7dfc2bdfeefd6dd
Re-implemented lang+label+desc uniqueness restriction for items

Change-Id: Ia9899e2214f170a531fd32a301f6b7f6cce2004b
Consistency

Change-Id: I9b0ead189d680d2e5f715851bd6f5bed70a27124
(Bug #40550): Use http get with https whenever possible

Change-Id: Idf0a6547325fe3e8d3d8ff7ce891d101b8d1529a
Merge changes Ia9899e22,Id1e2ec3e

* changes:
  Re-implemented lang+label+desc uniqueness restriction for items
  Attempt to fix item lang+label+desc uniqueness restriction
putting disable/enable functionality into a separate extension

- patch set 2: exchanged setDisabled for setState method
- patch set 3: addressed mentioned issues
- patch set 4: reverted some of patch set 3, trying not to be smart in interface's getState() implementation

Change-Id: Id64cedf742efb0f84a29429f81e92c374dd5a94f
Merge "putting disable/enable functionality into a separate extension"
Merge "(Bug #40550): Use http get with https whenever possible"
Merge "fix for autocompleteString test assertion"
Merge "inserting table headers when adding the first site link"
Merge "Remove pointless wikibase- prefix"
Finish
finish2
Refactored cpu code and eased the stylecop rules
Added disassembler and a few tests for Cpu class.
Merge pull request #2 from JohannesEH/work

Work
début de blog inutilisable pour l'instant
More accurate calculation for Mud/Water Sport

* .33 is closer to what the game does instead of / 3
Water Plant Trunk now with water animation and new speed
Level experience + start of entities
The internal (fake HTTP) requests will now prefer to send JSON to the client
as it is a richer data format that the standard HTTP media types.
Created default Rails 3.2.3 app.
Added a header file, added jquery-ui to assets pipeline
Halfway through hooking up events.
Merge branch 'master' of github.com:Kurt-von-Laven/lembic
Made workflow switch upon creation.
i've added the boolean function and made some changes to the other functions
32 tests
pwm for servo works-leds dont
bump http-proxy dependency for nodejitsu/node-http-proxy#266
Merge pull request #4 from bkw/http-proxy-dep

bump http-proxy dependency for nodejitsu/node-http-proxy#266
some german translation
Merge branch 'master' of github-rigid:Libvisual/FroyVisuals
Fixed issue #6693: Error whan saving global settings with IE8 only
Dev: replace .trim() function by $.trim javascript function. (.trim soesn't exist in IE).
Dev: IE8 on Linux don't work. Only IE6.
dev: speed up survey listing by not loading the model (show columns / create etc.)
dev: keep dbversion and update also on config after we load them saves extra db calls
dynamic size for prompt
Merge pull request #27 from LtSquigs/master

Fixing Serialization Saving/Loading
Merge remote-tracking branch 'upstream/master'
refactored triggers
added game state triggers, commands, and serialization
Fixing parsing error with game state
Some more work on the packet structures
Updated guide + settings bundle + fixes.

[UPDATED]   Guide updated with UI changes.
[FIXED]     Don't animate pushing the unlock VC when appearance of main
            VC is not animated (eg. application startup).
[FIXED]     rememberKey -> rememberLogin in settings bundle.
[REMOVED]   saveKey from settings bundle.
[UPDATED]   Removed lock from the Default image; show a dummy avatar
            instead.
[FIXED]     Don't forget key when signing out.
Add default front page and html error pages
added Twig
Testing construct
Removed tab stop from the window and the tab stop from the window commands container
Merge pull request #217 from flagbug/no-tabstop

Removed tab stop from the window and the tab stop from the window commands container.
Blogique: refctoring
Dodanie modelu, oraz klasy Connection

Rozpoczecie zapisywania dostepnych dla danego punktu polaczen
Skonczone połączenia pomiędzy wszystkimi punktami

połączenia dla każdego punktu przechowywane w tablicy _connection w
Modelu
Skończone połączenia v2.0
Skonczone polaczenia v3.0
Merge model-Poloczenia do mastera
Czyszczenie po merge'u
fenetre bien
coup fleche rangement videau
maj fab
j'en ai marre!!!
Merge branch 'master' of https://github.com/Marie38260/Backgammon.git
Created a new 'fancy' skin, refactored stuff and added new stuff
Subversion stinks! At least git-svn cannot handle + signs in file or folder names :-(
Marked fs-packages as deprecated.
CSS Changes

Change-Id: I1d65422aeb460ea05c456c231400589eb0bd70bd
few fixes

Change-Id: Ifefdf3b6c7ea34849246edc727426adb979380d3
Working continious reading
wuhc: 提交客户端处理代码
introducing remaining polygons
ElvUI 3.33-26
Uniform color for the open/close tags.
Allowed both paddles to move at the same time.
Change I09b5260e: Fixes bug contacts cannot be matched if its number contains extension

Change-Id: I317f0615336b3ce906cba9ba34ed0467cfef08f1
Change I94805c30: Fixes bug that highlight of extension number is incorrect for CDMA

Change-Id: Ia6f1b882995495d5996debcbe09582ce123328d9
Change I7d9d811d: Fixes bug that contacts read error from some SIM cards

Change-Id: I55f419c02a8ce091e790abc648f554c98ffbaeb5
Change I08942ada: use proximity sensor to prevent operations while device is in pocket

Change-Id: I6c009466b490e4307eae27a69f3406967fd5079a
Change Ic9c6e04f: fix dead lock caused by sending broadcast while changing power state

Change-Id: Ieabaa192ec91259c15369d848ea07f140e3101cc
Change I002379cf: add constructor and change access for porting

Change-Id: I808d793ac593128fac8bb8fbfd4e30344ac40fcc
commit for revert

Change-Id: Iafd61370c7ad5957301781b1fb8d4ad32d7f0b12
Revert "commit for revert"

This reverts commit 055c07b680427e11f3c29c5a5bad0a3147443ddd.
new stockrom b932

Change-Id: I6e9eaeed38fcf7de8663a70be0e06f21d93a70cd
workspace of new stockrom

Change-Id: I1e685c652844dd0f9cb43ae396e56f1b7db3f469
apply patch to new stockrom b932

Change-Id: I33a8ae19106901ce54b28a10b48a4bf0dba2714e
Change Iad99ae13: fix method parameter fill error

Change-Id: Idbd937cdb4e8caf5ee7eac799d67457c4f339a52
Change I2e0edbdf: fix bug that disabling event dispatching incorrectly

Change-Id: I3842fc9a7299f0414553989fb179ad90e8a39545
Change I83d62001: Change default UA for apache http client and HttpURLConnection

Change-Id: If4df9202f24eaecfa54ee8db10b7eb53ae290012
fixed pod, fixed example configuration
Temporary fix put in place for github hosting down :(
Merge branch 'master' of https://github.com/MizzouACM/ACM-Website
packets: Big update, some packets need to be finished still. Search TODO.
offline authenticator: updated and working again
packets: spawn painting tweak
packets: minor login packet change
protocol: bump to version 47
authenicator: correctly send the login packet
.gitignore: ignore logs
protocol: bump to 49
Merge remote-tracking branch 'brutal/master'

Updates protocol to a modern version.
It's drawing now ^^
It's counting static situation
cosmetic changes
Adding flow 1
Added some info, really just to test the workflow.
Updated Readme

Made the readme not useless.
Spritesheet async loading fixed.
Users -> all, Edit/update
JSCH now fully integrated and working.  Tweaks and testing still required.
Latest Nette
gstreamer : add specific package for omap
gst-plugins-base : bump version to 0.10.36
Adjust and test extraction of server name
Changing the names of the calculation method properties for theta and VaR and removing information from the horizon calculator constructor
Fixing tests that were broken due to a refactor
Fixing the time calculator test
Reformatting some code
Adding checks for empty time series in the P&L functions and fetching time series when the maximum number of points is not set
slight improvement of handling constructor parameters
Changing SABR functions to use USD vols for all currencies - temporary change so that we don't hit data limits
Changing SABR functions to use USD vols for all currencies - temporary change so that we don't hit data limits
include unistd.h for close(2)
Tidying up some code and adding a toString() method.
Generate exception if portfolio to read cannot be found
Merge branch 'master' of github.com:/OpenGamma/OG-Platform
Merge branch 'tmpx/daniel1'
[PLAT-2464] Created a pricing method for bond future options (Black pricing, so assumes European type
Add travis

git-svn-id: svn://pc-lab14/SVN/xap/trunk/openspaces@128858 eb64e737-3616-4df0-8941-5ee2ae88103d
GS-10806

* added spring security web to lib, pom updated

git-svn-id: svn://pc-lab14/SVN/xap/trunk/openspaces@133923 eb64e737-3616-4df0-8941-5ee2ae88103d
New screens

New screens for NumericalTextInputHelpDialog and timerentry
comment modeling

comment用のモデリングをいったん完了。factory_girl使いたかったので追加。
comment表示

movieページにそのmovieが持ってるコメントを表示するようにした。
コメントの追加削除

webページからコメントの追加と削除をとりあえずできるようにした。
コメント削除後のリダイレクト

コメント削除後のリダイレクト先にコメントのついてたムービーを指定。
integrationテスト失敗

とりあえずコメントアウトでテストは書いておく。
Facebookのloginで無限リダイレクトしてるっぽい。
コメント追加削除ajax対応

コメント追加削除をajaxに対応させた。
htmlタグをリファクタ。
リファクタ
コメント表示１０件まで

最新の１０件までのコメントを表示
View Allをクリックして全て表示できるようにした。
コメント機能プロトタイプ完成

いったんこれで完成。デザインやら細かい機能は後ほどつめる。
Makes Bronson object-oriented and emitting events.
documentation for tests.
Merge branch 'master' of github.com:Originate-Inc/bronson
fixed bug in willUnload delegate callback
Generico Clientes y algo de logica
factura 6
Abrir Caja funcional
Merge branch 'master' of https://github.com/Pedussi/Viva_la_Pizza
Mozo(falta todavia)
More whitespace edits, for consistency
Make contact for a Django CMS plugin

This allows the user to configure the content on the contact page.

Implementation for #306
wx version problem
Merge branch 'master' of github.com:PlayOnLinux/POL-POM-4
Fixed LuaJava, don't broke it again!
Added basic functionality of Card and CardSet Classes
Added new Game look and interaction
Added new game look and interaction
Added new game look and interaction
Remove color for email in *.php
Merge pull request #17 from axome/ColorEmail

[+] CORE : Remove color for email in *.php
[-] WS: Fix #PSCFV-5915 temporary images deletion
Rationnel ok + indentations
Exppert balancing policy
Started to implement new design. Fixed bug with multiple adding of annotations
Added new images
Revert "added .html file extension to readme"

This reverts commit 7bf65cc40c01340ebcbb7e93fbcb281937f5f201.
Program is fully functional
[mr2026] some corrects to utility subsystems (required for dynamic_vmaps)
[mr2026] implement dynamic_vmaps (Reamer version) - dynamic line of sight base code by Silverice; - Trinity implementation by subv; - Corrected liquid type extraction by Shauren, close #901; - final cleanup and re-implement by Reamer. vmaps version changed to V4.00 2012_02. need re-extract vmaps and mmaps! close #770.
[mr2026] remove old compiled utility binary and also some VC projects (not supported now)
[mr2026] add compiled binary utility packs for win32/64.
[mr2027] implement and use PROC_EX_IGNORE_CC. related to #1044
Merge branch 'master' of https://github.com/mangosR2/mangos

Conflicts:
	src/game/Spell.cpp
award presentation
award presentation
Se arreglan muchos problemas.
Se han ampliado las estadísticas, y ahora también se muestran los records del universo. Se ha detectado que los planetas gaseosos no tienen masa.
Check in InAppEmail project.
Updated .pkameta
Updated Readme file
Updated Readme file
Merge branch 'master' of git.curseforge.net:wow/elvui-repooc/mainline
Modified some of the locales to point to ElvUI Repooc for tickets
Updated TOC
Fix install loop, add skin for bliz scroll of res frame
Loop Fixed?
Added Auctionator Skin
Removed README and updated CHANGELOG.txt
Moved some additional options to its own area of the config
Moved some of the additional options to its own area of the config labeled Repooc Extras
Added Elv22 Screen Resolution Fix.
Removed the attempt to skin the blizzard timer
copyedit
Proof-read from 2 to 2.3.1
Merge branch 'master' of ssh://github.com/RobinMorisset/Btrsync

Conflicts:
	doc/report/btrsync-single.pdf
	doc/report/btrsync-single.tex
	doc/report/btrsync.pdf
Update README.markdown

added album + chatlog
Updated README regarding mongoid 2.X support
Merge pull request #21 from Katen/mongoid

Updated README regarding mongoid 2.X support
Merge pull request #1 from RussMan/master

Requesting some file
This is my comment
Merge pull request #2 from zokir/master

Hello
fix line-ending
properly sends error message to client
Fix error message
CreateProcess with CREATE_BREAKAWAY_FROM_JOB may fail in some situations, just ignore it
Fixed unicode support. Fixed downloadable mat_codes
Added additional validation for Backup and Migrate
Prevent users from entering an absolute path.
small changes to instructionsScreen
Adding permission check, cleaning up code
reconnecting parport
Adding possibilty to check host (permissions)
Removing debug output
Changing to 127.0.0.1
Merge branch 'hotfix/project-status'
Merge branch 'master' of github.com:SciLifeLab/scilifelab
Add new check for sample map
moved slurm methods to module
refactor status_query.py
Add code for sample map and tests
Add new sample_map function to project connection
Updated tests: fixes bug in hs_metrics
Merge pull request #31 from b97pla/develop

Merging it in but re-opening as an issue afterwards, requires some work on the drmaa front...

Refactored some scripts and tests
Update sample_run_metrics name and add parsing of Demultiplex_Stats
Add test code and parsing code
Add header information from template
Remove comment
Change info to debug in bcbio.qc. Add pattern for picard_metrics
Update tests, note generation and data upload
Merge branch 'hotfix/barcode_id_to_name' of github.com:percyfal/scilifelab into develop
Remove old qc parsers and objects
Merge branch 'develop' of github.com:SciLifeLab/scilifelab into develop
Have to set flag to get casava structure
Remove pre_casava flag again; use dates to determine casava/pre-casava
Fix issue #93
Merge branch 'hotfix/sample-status-flowcell-specific'
Merge pull request #95 from percyfal/master

Hotfix - bug fixes
Adding new structs to DBM for tracking tables
Minor fix for reading hg18 pileups
Added a recipe that builds ruby to the home folder of the user and hooks it into bashrc
dökümanların içeriğinde yer alan dökükmantasyonu toplayacak script olarak documentation.sh eklendi
Ajout de playlist + playlist intelligentes
added feed service
updated manifest feed service addition
added string, also right before renaming package
Swap from ".minecraft" to "minecraft" folders.

Add in compatibility support for .minecraft folders.
Remove code that never executes.
Basic User model and secure password
success
Merge branch 'master' of github.com:Song-InSeok/Akropolis
P2: More opcodes.

Signed-off-by: Gyx <2359980687@qq.com>
P3: And more opcodes.

Signed-off-by: Gyx <2359980687@qq.com>
P4: Fixed some opcodes. Fixed HandleReadItem (CMSG_READ_ITEM).

Signed-off-by: Gyx <2359980687@qq.com>
P5: Typo...

Signed-off-by: Gyx <2359980687@qq.com>
Merge pull request #4652 from Gyx/4.x

Gyx 4.x update
Core/Protocol: Enable some handlers
Merge branch 'master' into 4.x

Conflicts:
	src/server/game/Achievements/AchievementMgr.cpp
	src/server/game/Achievements/AchievementMgr.h
	src/server/game/Entities/Corpse/Corpse.cpp
	src/server/game/Entities/Unit/Unit.cpp
	src/server/game/Quests/QuestDef.cpp
	src/server/shared/Database/Implementation/CharacterDatabase.cpp
	src/server/shared/Database/Implementation/CharacterDatabase.h
Change the way we deal with SQL files and merges on 4.x:

- All SQLs will be in sql/update/world;
- If after a master->4.x merge any DB content needs to be removed, a new SQL on 4.x shall remove that content from this branch
- Old SQLs shall not be changed
(Deleted 4.x folder)
Core/DB: Fix corpse loading prepared statements (typo introduced in merge)
Core/Movement: 4.2.2 structure for MSG_MOVE_FALL_LAND
P6: Rename 4.x sql

Signed-off-by: Gyx <2359980687@qq.com>
P7: Small clean-up.

Signed-off-by: Gyx <2359980687@qq.com>
P8: Fixed corpse loading crash.

Signed-off-by: Gyx <2359980687@qq.com>
P9: Update ItemClass & ItemSubclass from ItemClass.dbc & ItemSubclass.dbc

Signed-off-by: Gyx <2359980687@qq.com>
Core/Protocol: Enable 3 more handlers

Closes #4507
Core/Movement: updated 2 more movement structures
Core/Movement: 4.2.2 structure for MSG_MOVE_JUMP
Core/Movement: 4.2.2 structure for MSG_MOVE_SET_PITCH
Core/Movement: 4.2.2 structure for MSG_MOVE_START_BACKWARD
Merge pull request #4709 from Gyx/4.x

Gyx 4.x update
Merge branch 'master' of https://github.com/SuicideNote/vashapara

Conflicts:
	src/main/webapp/WEB-INF/spring-servlet.xml
Spring version moved to a pom property
php delete_video api
3 applications.
add .! and %! to notes
finished! Just need to figure out how to set mu, and possibly debug
Adding web.config for having the public folder act as root folder
Merge pull request #1 from DragonBe/master

AWESOMESAUCE
Add licence GNU GPL v3.0

Signed-off-by: Vincent Peybernes <vpeybernes.pro@gmail.com>
Merge branch 'master' of git@github.com:Techniv/node-cmd-conf.git
Licence readme

Signed-off-by: Vincent Peybernes <vpeybernes.pro@gmail.com>
Corrected spelling on names
improved code to allow actual drawing
dritter commit

neue penisrübe
added /usr/local/bin to exec-path and associated .dart files with the dart-mode
a little work towards working with node-ffi
Removed Shuttles from Home screen
Actually removed Shuttles from Home screen this time
New Shuttle button link created
Made new icons and css styles for map shuttle button
fix error message
Merge pull request #194 from DannyJoris/7.x

fix error message
test123
Merge branch 'master' of https://github.com/UDecide/UDecideProt01
adding regex lesson slides to class materials
Stubbing work on #155
Adding CSV importing + DidacticsBundle
Added README file (Empty)
Added PHPUnit coverage reports
FE de-DE.com_virtuemart language string correction

git-svn-id: https://dev.virtuemart.net/svn/virtuemart/trunk/virtuemart@6346 87cc427b-4a1e-0410-b729-b2260ec0f063
Update german language files plus some minor corrections in backend en-GB.com_virtuemart.ini

git-svn-id: https://dev.virtuemart.net/svn/virtuemart/trunk/virtuemart@5845 87cc427b-4a1e-0410-b729-b2260ec0f063
Overlooked one "%s" in de files

git-svn-id: https://dev.virtuemart.net/svn/virtuemart/trunk/virtuemart@5846 87cc427b-4a1e-0410-b729-b2260ec0f063
Background connection, automatic  screen if not connected
Recorrect Errors
added some fields in create university page
^ htaccess.txt cleanup
htaccess.txt example revision to enable SSI and "harden" direct file access

Options -Indexes
DirectoryIndex index.php /index.php
Options +Includes
FilesMatch "\.(php|ini|xml)$"
mod_breadcrumbs still had nesting and constistancy problems
^ 'bc-item' to 'bc-label' applied to "Show here" and "Last item"
- class 'first' from <strong>; it's unique anyway
+ missing "pathway" wrapper for link "Home"
- "branding" styles from highkey.css
dont post self bans, and don't crash if no banner
don't make a post if its a self ban, don't error on a ban done by b3
commit hoy
actualizar ultimos archivos
using theirs
Merge pull request #2 from poo-Codigo5/master

clone desde repositorio de grupo
c
prueba de commit
Merge pull request #11 from Wilmermo/master

bbjb
Merge pull request #12 from RichardAranibar/master

grupo estudio v2
commit de grupo de estudio 30-07-2012
Merge pull request #13 from RichardAranibar/master

pull request de grupo de estudio 30-07-2012
Merge pull request #5 from jorgecabezudoupc/master

actualizacion jorge
Merge pull request #3 from poo-Codigo5/master

Titulo Prueba10.00pm
OminAuth apply
Switch header values for contact info
Make format_percent helper a module function
Styles for overview headers and tables
Fix text alignment when there is only one cell in a table row
Empty list
Remove web item template and render with default
Fix overview box borders
Styling for overviews
another error fix
fixed yet another derpy error
made emeralds not drop
Added support for activation on element hover
Added project-level `README.md`

Signed-off-by: Zearin <zearin@gonk.net>
Performance issues.
Added MySQL code for school.
Translation files updadet.
added library stubs for usb_drive methods
Fixed pressing "D" while in the past
added files
Merge branch 'kareem' of github.com:abdgemei/Sym2-JobSite into kareem
Removing .DS_Store
Updated gitignore
Latest
Merge branch 'kareem' into develop
Account, Seeker and Employer entities with doctrine relationships
Clean up
Added relationship attributes to ORM entities
Documentation Updates:
- Added `direction` option to documentation.
- Updated code to use version 1.1 of the plugin.
Added an option to provide directional control over the plugin.
Added xslt extension to MimeClass.inc
Merge pull request #142 from jordandukart/6.x

Added xslt extension to MimeClass.inc
Merge pull request #141 from adam-vessey/6.x

6.x
Little more checking if there is any tab content...

...  If there is none, we don't bother rendering the tab.
added debug logging
added ability for overriding type loading
updated readme
fixed type in readme
added notes about snapshotting
Merge branch 'master' of github.com:adambird/entity_store
Added option to configuration file to control which program is executed when edit flag is used
Modify numpy array size to match expectations.

When the format is not specified, we use the last
dimension of the array shape to determine the number
of channels.
The example should show this.
Update the RawImage comments regarding array shape.
Remove docs, these are moved to github pages.
Added basic readme.
Basic SubTP handler module for Django, allowing callback registration, defining post_init, post_save, and post_delete listeners, and basic data normalization. Still some issues to work out, but the basics are there.
changed Gemfile to use postgres instead of sqlite3
Add additional tests for mergesort and count, to verify not only that they run without crashing,  but that their output is correct.
Fix bug that would cause memory corruption when recycling reads (pulling from wrong end of queue).
Pass some parameters by const reference instead of pointers for cleaner code.
Add Boost compile version to version information.
Local realignment: Modify the way that insert size is calculated to match GATK in more cases.
Remove many debug printouts.
add direnv to commonshrc
add SHELLRC variables
version 0.1.3
Merge branch 'master' of https://github.com/adjohnston/RubberBand
changed convention of assets dir name
added labels to mappings, changed to use flatter data layout for data files
segona part projecte 2
Update administrator/templates/index.html
Adding extra type checks on the pipe and datamanager test (like we have on auth tests)
Making schemes shared.

By making the schemes shared a newly cloned repository can be build from the command line using xcodebuild. If the schemes are not shared the following error message will be displayed:
There are no schemes in workspace "AeroGear-iOS".
Merge pull request #2 from danbev/shared-schemes

Making schemes shared.
fixed flow again :-)
updated the Changes page.
Cambio de Background
Allow attachments to be sent with an email. Currently relies on snapshot version of groovy-wslite plugin.
test interface for sandboxes
readme updated and simulation mode
Version bump to 0.0.1
Regenerate gemspec for version 0.0.1
Migrate from prior Git repository

An issue with the prior Git repository has forced a complete migration
of the current codebase into a new repository.
Use latest PHPExiftool API
Add better exception message
substitute `TimelinesBuffer` with `TwitterEntitiesBuffer`
Hidden dictionaries & definitions

git-svn-id: http://voronet.francu.com/repos/DEX@676 8d550267-2627-4c68-899f-85492a8dd5ca
slightly modify exploit sample one
SimpleWindowedGame example added (active rendering)
The milestone report and source code
dashboard
dasboard
- minor fixes
 - prevent updating vote with the same value
 - add create and last update fields
update the test datapack
Safety Enhancements!
DB enhancements
cpufreq: cpufreq_fantasy: update to 3.3
Include liquibase-hibernate and logglylog4j as part of our opensource
stack.
A custom ant task for us to help with liquibase changelog merging.
Added the ability to have HTML content or images with custom style or class settings for each.
Added editable width/height settings
Only remove messages from cartype processing queue if they have been processed
Add constructor and static methods for converting and adding noise to an array
Finish sparse distributed memory
add unit tests
Changed to get composer.json from my repo with phpspec-composer.php fix. Will point to that until the fix is merged into master
add files for making a cpan module
.gitignore: add ignore files from ignore.txt
README.md: add doumentation from generated README
add clone, bugfix for selector (ae)
Conflict B5
Merge branch 'master' of git@github.com:andreiolaru-ro/testme.git

Conflicts:
	hello.txt
Generate valid github urls in project factory
Add non-disclosure statement
Initial port of demoinfo2
Finished problem 74 and 112. Tried 113.
live paypal account
notices and cart not found error fix
Adding CircularBuffer.cs
modifications effectuées en espérant que ça fonctionne ^^
Changing README
  * Added README.md
  * Deleting README.rdoc
animated skeleton finished
dalvik: Fix compile failures with -DNDEBUG and gcc >= 4.6

With -DNDEBUG and -DLOG_NDEBUG, assert() and friends are defined to
nothing - causing variables that are used only in the context of assert
or logging to be defined, but not used, resulting in a build failure
if -Werror is enabled.

Change-Id: Iae18e0274ec2f11f95f918b75006be7cf375a8c0
Signed-off-by: Bernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org>
added ground command
added another site to the shorteners list
Generate proper spec for namespaced cell
Merge pull request #19 from gertas/master

Generate proper spec for namespaced cell
modificacoes no projeto scheme

ultima aula
Skript - Styles importieren per Mittelklick
Remove duplicated metadata.
Rename appropriately.
Rename appropriately according to the main toc.
Update the draft and publish articles.
Preparatory work for the future exercises.
Start emacs server by default
Ruby : add rhtml to auto-mode-alist, enable linum-mode, add align-to-* functions
enable disbabled functions
Some description
Correct plugin(for IDEA 11)
Cleaning House
Added Header Logo and url_exists
Fix BUG related with popping up MessageBox :-) (popped on "Firmware data" tab after visiting of "Diagnostics" tab)
Add Application Icon.
Update webbrowser/Form1.cs
added base folders and index.html page
Standardize a few layouts, and add Password Confirmation instead of writing Password again.
First jasmine test, and some refactoring.

First functional jasmine test, refactoring "source_id" to "issue_id"
Add file_line v1.0
Removing the /journal/ piece of the permalink. It's not needed.
Don't necessarily need to capture /legacy/journal/.
Combining the first two regex rules.
THE POWER. Three regexes become ONE.
Awwww, my dancetracker. :(
Throw archives into THE REGEX™.
Updating destroy()
Uses original message field names instead.
Message class properties are part of the prototype.

There are times when the message class information is needed, but only has an
instance of the message, for example, when writing a nested message - like
geometry_msgs/Twist - to a buffer.
Calculates byte sizes for fields.
Can publish messages with (only) primitives!

To test:
roscore
rostopic echo /hello_world
./node_modules/.bin/mocha --timeout 5000 example/how_to.js

This should print out 'hello world!' in the terminal with rostopic echo.
adding support for chat in-game
Fixed some jsdoc links
Some comments on example implementation
using ckeditor_source.js instead of ckeditor.js
Update to selenium client jar v2. Remove client v1 dep from extended-selenium. v2 jar contains v1.
Set jsse system property to false for Java 7 to work around proxy problem
Merge pull request #33 from bcrochet/sel2

Sel2
Update notes for submitted changes

* Improvement on error msg for invalid product/tag combos. See bug 821287
Update notes for submitted changes

* Fix typo, DistoTree to DistroTree
Table rename migration
added script to extract confused records
updated stats.py
updated getconfusedrecords.py
Basic state management and an API to get the external URL from client code
fixe to issue293
fixe to issue293
Merge branch 'master' of git://github.com/MarkUsProject/Markus
Revert changes to master
Fix for issue 748 - When exporting svn_export_command, fix issue with multple submission being returned in the file as well as add test case
Fix for issue 748 - Fix way of searching for current submission
Merge branch 'master' of git://github.com/MarkUsProject/Markus
Test
Merge branch 'master' of git://github.com/MarkUsProject/Markus
Merge branch 'master' of git://github.com/MarkUsProject/Markus
Fixed the sorting of assignments displayed in the drop down, by name.
Merge branch 'master' into issue811
updated routes.rb
Merge pull request #821 from Fudge21/issue811

Closes #811
Merge pull request #825 from lejaokri/724

724
Merge pull request #787 from mikeing2001/issue-748

Fix for issue 748
Fix bind setup script.
PHP object members are referenced oddly
AMI now has basic toolbar
implemented php templates and twitter bootstrap css/js
Added elapsedTime parameter for timers
Toggle between views and toggle interactions.

Fixed interaction toggling for real. I had forgotten to set the __visiblity
setting in one case. Allow the ability to switch between views correctly. I had
to remove the old drawing and then create the new one.
Loading and winning screens
Questions will now keep track of when they were created and answered at. Included the updated database schema file.
Added missing check when saving question answers in the database for submitQuestions
setup bootstrap, added User and Rating models & controllers
big commit, all changes so far. sorry
Merge branch 'master' of github.com:boblannon/bumbletweet
fill in css layout
Added List of Hiring Companies to the homepage, and also add " logo  varchar(50)" field on employers table.
Merge remote-tracking branch 'origin/master'
Change el-get-sources to a normal variable
Bootstrap el-get dynamically

el-get is now no longer a submodule but is automatically downloaded if
missing.
Clean up use-package submodule
Fix formatting of comment
パスを書き換えた
User is redirected back to projects page if they try going to a project that doesn't exist
added roundedCorners mixin
ahh markup
add flask startup description
Merge remote-tracking branch 'makefu/master'
Merge pull request #206 from brooksryba/master

Updated the Navigation bar
Fixed syntax error in the Gumball state machine. Updated Controls
with a potentiometer class. Fixed bug in Controls calling undefined
objects in config.
renamed identifier (fit to Arrays.sort-terms), new variable 'cuts'
Fixed problems caused by index folder renaming
Misc changes

- Moved index folder name to config file preference
- Fix thumnailing bug
- Made entire file tile clickable, instead of just the top
- Used CSS to vertically center thumnails/icons
- Cropped file icons, since extra negative space is no longer needed
Disabled admin accounts for now
increased size before scroll kicks in
Fix github issue #25

Prevent decorate unavailable data
modified go bat file to set aside enough memory to run
Made changes per grading.  made sure all li tags have ul or ol as parent and added id to select tag "category'
[#1381] move comment in Cue API tests above function definitions
Fix RVM prompt reload issue.
Add api-core as dependency for nyc-webapp. OBANYC-1602
Adding dBm calculation

and testing that out.

We hit a bizarre snag: the RSSI pin is giving us a stream of zeros, even
though we can see the RSSI LED light up! We also added LED blinking on
both the Lilypad and Fio to show us when pings are transmitted/received
- and they light up correctly. We *also* set ATRP FF, so that there's no
potential timing issue with reading the pin.

The result? Still getting a stream of zeros. We're going to try out API
mode next as a workaround, since you can directly read RSSI from the API
frame...keep posted!
Merge remote branch 'origin/master'
Fixes #1624. Fix grouping for `CPNumberFormatter`.
Refs #1624. Fix grouping separator support.

`perMillSymbol` was incorrectly used as the grouping separator.
Merge branch 'master' of github.com:cappuccino/cappuccino
Use global spelling files
5

Added option to delete FileTrek folder in AppData->Local instead of
forcing it
Updated WIDO Project; Added drillingwell.org; Added JAMPme Project
Added check to see if database connection failed
simulate may model as seperate file #5
Merge branch 'prosecutor' of github.com:cboettig/earlywarning into prosecutor
fix for incorrect variable being used
Fix titlebar color issue for nigra theme.
Merge branch 'shared'
update readmeS and PKGBUILD to v0.6.2
minors changes in readmeS
Merge branch 'shared'
make comments in build
Merge branch 'shared'
remove percent from regex
Merge in separate plugin for coverage-column for JaCoCo
Avoid a possible NullPointerExecption which hid another problem for me
CeylonModuleLoader: do not load JDK packages
Change log udpdate release

Becomes valid if cc56e6a20660741a3edeaa64f18c19b0b27e8dee is merged also to release branch
Merge pull request #2246 from Lineflyer/release

Change log update release
New version 12-12-12
Visited TB fix #2244
Merge branch 'release'

Conflicts:
	main/res/values/strings.xml
	main/src/cgeo/geocaching/enumerations/LogType.java
Fix #1672: save circles visibility in map state
add mgen
added inventory script
Create BinaryTreeLevelOrderTraversal_II.cpp
min of damping in KarplusStrong clamped to 0 in callback"
Update README.md

calculate the distance of window location between each screenshot
* Completed actions with left button
* game shows if player has won or lost
add 'target' to sublime folder excludes
clean up cosmetic
fix path for window systems
Better debugging, make sure undofile exists before changing permissions
forgot to add link in docs
Merge pull request #779 from MoOx/stable

Add "css" keywords on the Compass Sprite helpers doc.
Round px values in rhythm() function of vertical_rhythm partial.

Also simplify code for vertical_rhythm's leader and trailer mixins.

Alternate to the pull-request in #778
Add ability to append stuffs after font urls
Update outdated doc
Add tests about the new ability to append stuffs on font urls
Merge branch 'stable' of https://github.com/chriseppstein/compass into font-eot
Add one more test to make sure a more complex query param is handled
Merge pull request #776 from JohnAlbin/vert-rhythm-codestyle-1

Fix code style in vertical_rhythm's apply-side-rhythm-border().
Merge pull request #777 from JohnAlbin/vert-rhythm-codestyle-2

Simplify code in vertical_rhythm's adjust-leading-to() using rhythm() function
Merge pull request #782 from MoOx/stable

Add ability to append stuffs after font urls
Merge pull request #778 from JohnAlbin/vert-rhythm-codestyle-3

Rename $leader variable in vertical_rhythm's leader() and trailer() mixins
Add anthony to the gem authors list.
Add support for packager to build one-click installers
Merge branch 'stable'

Conflicts:
	VERSION.yml
	doc-src/Gemfile.lock
bug fixes for multi-lingual Lucene analyzers
change vim font size
Merge branch 'master' of github.com:chrismcbride/dotfiles
Closes #2. Using pg_search
Closes #2. Using pg_search
therubyracer
Heroku not on a new enough postgres for unaccent
Add support for postgres 8.3 since heroku isn't on 9.x yet for search associated_against
MonoDevelop was being wonky, so I pushed stuff to pull it onto my Windows machine to test in Visual Studio. My hard-coded tests work. Now to implement a file reading process to input partially completed Sudokus.
Added splash screen and help menu. Missing help pop-up.
Added splash screen with how to play.
Merge branch 'master' of https://github.com/chsanfor/FinalProject
- Constructors for mat3
- Abstraction compromised, I repeat Abstraction compromised with conversion operators. Over
- mat3 impl done
algumas pequenas alteracoes no codigo
Added comment_count method to News
Added top commented news
Updates for menu
Merge branch 'dev' of github.com:cismet/cismap-commons into dev
Merge branch 'dev' of github.com:cismet/cismap-commons into dev
minor jalopy changes
Merge branch 'dev' of github.com:cismet/cismap-commons into dev
Testing omniauth-github
Added omniauth-github.
change to green background
refactor main background
refactor, add logout, fix for opera mini and ie
add date, new separator style
fix separator background
Install devise , add a user, devise items
more configuration notes
added weibo
fix merge + add weibo
Added BootstrapFilter class in order to load Bootstrap component on specific actions
Merge pull request #194 from robregonm/master

Added BootstrapFilter class in order to load Bootstrap component on specific actions
Se corrije formato de fecha para cookie
Se cambia formato de fecha para cookie
Merge branch 'master' of https://github.com/clicker360/ebfmex-pub
concatenate all javascript files
fixed a bug in README.md
Revert "Cherry-pick to 42f8e58e. Adapt file to architecture."

This reverts commit 9e550dae2201fbb8dd4fe4eb714ffc35e5a7f052.
Removed payment when order is paid.
Updated TODO.
improved style for font in label.
Improved flow for checkout:
Made message process better.
Updated documentation
Added api call to get all events for a user
issue #1306 add comments to CCParticleExamples.js
Merge pull request #341 from dingpinglv/iss1306_addcomments

issue #1306 add comments to CCParticleExamples.js
kictpov.md
Merge pull request #1 from kictpov/patch-1

kictpov.md
added section_2012-06-27
Small refactorings to reduce the amount of code.
Moved out some date logic.
Working on date range validator.
added phpstorm folder to gitignore
added basic level
Pick MM
disable some joystick drivers
added cache control headers to index.php
check
bludsg
Errors table and error message if there's a new weather description string
Installing pg gem
CSS Form Data Lulu
Merge branch 'master' of github.com:crewpuk/Lulu-delivery
Remove garuntee from camp signup form
archiveBuilder.py

added the epigraph fix
Fix a typo in my previous commit
mv egl_api.c to egl_api_custom.c
the scene file parsing has been done
Update luatablestack/luatablecrawler.cpp
[BUGFIX] use proper CSS3 selectors
KeyChain + redirectBack
Autocomplete places
Improve Model generator to bypass empty array in conditions
Merge branch 'master' of github.com:daohoangson/DevHelper
fix bug uninstaller
chmod
Tab, Shift+Tab to indent/unindent in CodeMirror
Fix bug for .gitignore in xf-new-addon script
Fix bug missing inline filter for list template
Fixed bug using reserved word for table alias
Fixed bug setting default for BLOB/TEXT fields
Added: Remove inactive add-ons from add-ons list in AdminCP, make it easier to develop many add-ons on the same code base
Fixed #140 by sending the authentication message after the socket is opened.