labofsahil/github-event-dataset-2012 huggingface dataset:
Tom - adding tools for minifying css
Tom - adding separate file for colour defs so that it can be shared
Tom - adding page template for news/blogs
Tom - adding template for pages with image on the right
Tom - setting up some basic templates for doing style testing
Tom - updating the backup script to use gzip compression
Tom - adding name based virtual host config for apache vhosts
Tom - adding JS based scrolling images to front page scroller template
Tom - general updates
Adding ec2 deployments, new scripts and a bunch of improvements.
req add
Fix Reverse error when removing data layer
Delete layer with a shared style
fix broken maps search and other views

this fixes what appears to be the victim of some renaming effort
Merge pull request #277 from ischneider/fix-maps-search

Fix maps search
Merge pull request #247 from drwelby/master

Fixes for errors when removing data layers
Merge branch 'master' of git://github.com/GeoNode/geonode into md_csw
Gemfile additions.
Gemfile change.
Procfile
Changes
Changes
Statuses update, styling update.
Lots of changes.
Merge branch 'master' of https://github.com/tommaxwell/treebook
remove bunny and bump deps
Merge branch 'master' of github.com:travis-ci/travis-ci

Conflicts:
	Gemfile.lock
force using syck until locale files are fixed
stop syncing users on signin, instead have a sync action that we can POST to
cannot use "end" in thrift definition, so fixing and switching to first+length
Update factory_girl_rails dependency.
Documentation until multigrid grid regions
pages with widgets instead of properties
adding state toggle and double tap to sync
tweaked double tap behavior
version bump, clear log statements
Merge branch 'release/1.1'

* release/1.1:
  version bump, clear log statements
  tweaked double tap behavior
  adding state toggle and double tap to sync
Random tweaks, fixed blacklist module.
add partial template
Initial commit
Merge https://github.com/tulsluper/bcounters
remove option screen from all minimal launchers (use --screen instead)
Use enum items instead of integer values in ColorGradation switch #93
Set engine=php with Template annotation
Casting Rails-style booleans to true/false
small changes from FTP server
Added uiTabs directive

Added uiTabs directive that add twitter bootstrap style tabs for each
direct child of decorated element.
Support for passing arbitrary additional headers to BND
Merge pull request #1 from mpilquist/additionalHeaders

Support for passing arbitrary additional headers to BND
trap
Merge branch 'master' of github.com:tyranid-org/tyranid
sorted included javascript files by importance.
Validations new form design
usage: table
added pass for llvm_PragmaHicudaInfo(Tree implementation)
[FIX] No need to make CGHicudaMDBuilder a friend of CodeGenFunction.
[FIX] Move openacc tests under proper directory
Improved the REPL's handling of tasks.
css textarea fixed
Cleaned up checkstyle config file.
JD for SE
s@s new jd and extend deadline to 5 sept
added imperio as official printing sponsor
Added dependancy upon clj-stacktrace. This is needed by swank-clojure
Changed all namespace usage to be consitent.

All production code uses (require ... :as ...).
All test code mostly uses (require ....) instead
Removed a few require/use statements which were not actually needed.
I am declaring that the walking skeleton is complete
updating todo list - breaking down a mmf to work on next
temporary checkin of a text file full of drinks
Improving employee profile page
Add helper for setting a raw post body
animation for the objects scaling added
menu animation fixed
use of animation changed. tweens added
Merge pull request #33 from alexei-yasko/master

work on issue #16
improve animations
Move RecursiveFileGenerator from IO to IO\File
Some stuff is internal usage only
Add php Doc
Adding details to index: issue-3
Start porting to lua/löve
Add coordinate display in löve port
Implement dragging in löve port
Some Improvements for RegistarAction
Add static pages controller
Static pages undone
Adding all dependencies to package
GUI changes from yesterday
Moved date/time coe to a more general utils module
alleks updates
Working facebook register
Fixes encoding reading in CFF fonts
Start of the stat utilities.
Warn on opentype fonts.
Merge pull request #2451 from brendandahl/opentype-warn

Warn on opentype fonts.
Merge pull request #2450 from waddlesplash/master

Add German keyboard "+"-zoom
Merge pull request #2449 from brendandahl/statsrecord

Start of the stat utilities.
Bump the version to 0.7.
Merge pull request #2453 from brendandahl/v0.7

Bump the version to 0.7.
Merge pull request #2448 from yurydelendik/issue-2386

Fixes encoding in CFF fonts
Add reset of zoom level using CTRL + [Numpad 0] on Swedish keyboard
Merge pull request #2459 from Snuffleupagus/numpad_zoom_reset

Add reset of zoom level using CTRL + [Numpad 0] on Swedish keyboard
Horizontal scrolling using the left/right arrow keys - version 4
Merge pull request #2461 from Snuffleupagus/horizontal_scrolling

Add horizontal scrolling of documents using the left/right arrow keys
Fix cff private dictionary key.
Fix margin on toolbar button separator to avoid changing height on hover, causing jittering
Merge pull request #2467 from danieljohansson/master

 Fix margin on toolbar button separator
Support Filespec dictionary in annotations
Merge pull request #2466 from saebekassebil/filespec

Support filespec dictionary in annotations
Merge pull request #2465 from brendandahl/fix-expansion-factor

Fix cff private dictionary key.
Fix migration for upgraded profiles.
Fix test codes in konoha.string
Merge pull request #5 from leejonggun/work

Fix test codes in konoha.string
check konoha.string & konoha.regexp & dscript.subproc tests
Merge pull request #20 from leejonggun/work

check konoha.string & konoha.regexp & dscript.subproc tests
use a trie instead of defaultdict for the vocab  (cont'd)
Added cutscene system. It is working well. 
A bit more feature needs to be added.
Display the standby unit
- InputTimer added
- Next-unit-selection is added
- Refactorred
Fatal error: Package 'com.woltlab.wcf.like' is required by 'Message Sidebar', but is neither installed nor shipped.
Missed a module name used as alias
Merge branch 'iso-module'
Add travis integration with node 0.9
又支持Firefox啦 ^-^
添加Chrome 安装方法
initial commit
readme fix
updated for fractal acc
cleanup, logger changes
removal of worthless contributor info, use the github ver instead
update to prevent js bug
Merge branch 'master' of github.com:wearefractal/npm-boilerplate
fixed install formatting in README
fix for 2012
fix for 2012
fix package.json
update with travis-ci
sample test
native module gitignore
native module npmignore
clean line endings + add mocha opts
rewrite - 0.0.3
Updated core Clojure dependency to 1.3.0
Added ragtime.sql.files subproject
better error reporting webpack/webpack#40
Updating links to additional pages to .html not .xhtml.
Updating FIA to only insert rows after the year specified in the script.
Re-building Windows executable with psycopg2.
Use  shortcut
Removed footer from Transactions screen and added it to ActionBar instead
Fix God
Big E notation
Printing debug message
Merge branch 'master' of github.com:thinchat/thin_faye
have the image sequence deal with cv::Mat
tweak layout of coding page
add preview label for index page
update readme
add project road map
don't add uploads page to history when not logged in (bug 39347)

otherwise clicking back will take you to the uploads page which redirects
you to the login page so you get stuck on the login page
Merge pull request #131 from jdlrobson/history

don't add uploads page to history when not logged in (bug 39347)
fix c define macro matche
Make threadsafe, and increase indentation to four for presentation slides
Fixed recipe number
Added unit test
add plugin- taglist
Some pptx and some fin diff changes
afdgbsv
It was only 3 lines
Merge branch 'master' of github.com:wmatern/summer_LANL

Conflicts:
	Fin_Diff_Advection_V4/main_script.m
Simpler RMS.. uses less CPU.
Insert/Edit interface rewritten.
dcp_inspect: Fix _listed_ package sizes/packages total
목록 제목 변수를 공통으로 사용
a big change. Now added a new signal channel from any greenlet in the tornado IOloop to signal master to work on reconfiguration or deployment. Long polling is also activated when in application page and would create a dialog when a reconfiguration or deployment is in process.
uncomment blocking for refresh button in discovery
reduce INITIALIZATION_TIMEOUT from 30 seconds to 15 seconds
comment our wukong property set message filter for now (since we don't have group leader election and group synchronization yet)
Merge branch 'develop' of github.com:wukong-m2m/NanoKong into develop
添加日志目录和日志文件重建功能
Interface fixes for Phoenix

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71525 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
Merge pull request #2200 from xavier114fch/zh-TW

Update zh-TW find panel translation
The modules are no longer declared in comments, but are wrapped by comments. The files are ES6-compatible. Shepherd is on its way to polyfill Harmony:modules
Updated README.md for the new branch
Update README.md
Reduces file size by implementing flavors.
Build process updated accordingly
Watches the flavor files
Fixed file location issue in server flavour
Exposes the API explicitly in server-side tests
Internal variable renaming to cleaner code
Adds a new build target for the optimizer
Created the optimizer script (shears.js) + fixes in the browser flavour.
Enhanced the optimizer so all the passed js code is minified
add admin to login_form
move_layout_actions
layout_actions
remove newreclic_rpm
update bootstrap-helper
setup rvm capistrano
better erros
update bootstrap
replace in file
remove multiline
add common method to application controller
CHANGE Log update
version bump
Header Fixed

The header no longer scrolls when the page is resized.
Support variadic versions of commands: SADD, HDEL, SREM, ZREM, ZADD, L/RPUSH
use Calibri for Windows
Add Stock out detail
Google の章 全体見直し
ルーティングスイッチの章 スパニングツリーの部分修正、不要な図を削除
some formatting fixes on acts_edit
Gitignore
Initial source
delete function and admin auto approve
Se sube imagen de la liga.
Merge branch 'bookTransitions' of https://github.com/ysports/ysports-web.git into bookTransitions
Se suben validaciones de campos de alta de usuarios y se quitan
librerias.
Error al subir nombre de campo de image, corregido.
Add 'one_wire_read_bit' and 'one_wire_write_bit' function.
Add 'one_wire_send_rom_command' function.
Change one_wire_init function to macro.
Fix typo in function name and remove unnecessary includes in one_wire.h.
Add new variable type 'romecode'.
Add function 'one_wire_copy_romcode'.
Add global variables: 'numbers_of_one_wire_devices' and 'one_wire_flags'.
Add function 'search_one_wire_devices'.
Add functions: 'one_wire_search_first' and 'one_wire_search_next'.
Change the command name. Now it will be the same as in the DS18B20
datasheet.
Add makefile.
Fix problem that is searched mistaken-word
(progn (end-of-line) (point)) -> (point-at-eol)
hm-mistaken-word-memory-limit: 5 -> 3
Attach ignoring regexp
Revert "demo"

This reverts commit bf81ada892f50d7dfec589b9d012d9a440ec2ee0.
added index to zipcode table
tweaks to presentation of task progress
update clang ebuild
added support for undo CommandSequential
got my md5sums list \o/, threw it in scm
Modification of the parsing regular expressions to handle both hh:mm:ss and hh:mm timestamp format in IRC log files
fixed up the list view , layed out items better.

need to rework name space away from kanso-tasks to bl3dr-viewer
drop ambdec
ready for test of GNOME build
修改到最新的draft13
Overhauled LoginActivity and Preference Keys

Signed-off-by: zubietaroberto <zubieta.roberto.e@gmail.com>
Minor GalleryActivity cleanup

Signed-off-by: zubietaroberto <zubieta.roberto.e@gmail.com>
Removed old api (Joooid)

Signed-off-by: zubietaroberto <zubieta.roberto.e@gmail.com>
Guice'd Authenticator

Signed-off-by: zubietaroberto <zubieta.roberto.e@gmail.com>
Maven-ized

Signed-off-by: zubietaroberto <zubieta.roberto.e@gmail.com>
Refactor megals.
First ideas about editing
creating jekyll folder structure
[Gandi] Secure cookies

- .gandi.net
- www.gandi.net
[Weatherzone] Fix again
[Rackspace] Clean

Sigh.
Working on converting PersonDetails to ContactDetails
Fixed excessive precision issue. Need to think if there's a bitter way than .Div to do this.
Fix dynamic builds by explicitly listing all parts of the code that are used.
update
Querying for product totals by subcategory could be much faster
little bit of optimization for the controller.
little bit of optimization for the controller.
Update upload/system/engine/controller.php
minor change
Merge branch 'master' of https://github.com/opencart/opencart
added a warning message for backup and restore when no tables are selected for backup.
navbar alpha settings ported from ics

credit:Roman

Change-Id: I3aa373c1e1da02f358042f7bf2da161d4fc5fbbb
adjust navbar logic

Change-Id: I4ce315ca7138f731ae072fc9a99a3ca6c968b739
Signed-off-by: Roman Birg <romanbirg@gmail.com>
Merge "adjust navbar logic" into jb
Core:Scripts: Scripted Ruby Sanctum
Adding fb code python files
FIX: Die Playlist ist eher eine 'm3u' als eine 'pls'
added env check test and restored comment
remove hardcoded stages, closes #2

Signed-off-by: Chris Boertien <chris@aktionlab.com>
fix callback execution if both, success and failure, callbacks defined
Merge branch 'master' of github.com:Alerion/jQuery-Utils
Workout_logs controller able import data from json file.
Workout_log model allows mass assignment to "created_at" and "updated_at".
Application layout with flash messages.
Routes file with routes which allow import data from file 'json' to database and vice versa.
Database yaml file changes 'postgresql' adapter to 'mysql2'.
Workout_logs 'index' file with form to import data from 'json' file to database.
Gemfile with gems 'mysql2' and 'json'.
finished lab 08
RM error folders
added tests for routing. have 3 pages, signin, signup, home
not needed
Added large feed hold/resume buttons
Added Share Action

Cleaned up the detail view action bar, and added the share action.
Atarashii! can now share, through Android's AMAZING sharing intents, to
any available app on the device. Also caught a NPE caused in
DetailView's onPause when rotating while the share interface is up. Oh
and the share icon resources.
Recount Fixed.. Still wondering how this wasn't reported.. Everyone uses Recount?
Added settings which control the tags
Added tag feature to frontend
CHanged ReadR to mark-read, and added GoToR for actual going.
update index.yaml
Merge branch 'bean' into develop
updated to version 1.87 for development towards next release
fixed CME when disabling while having stored inventories
Preparations for fixing this layer mess (also increased resolution and removed annoying sound again)
Update javascript formatting
Now only update the image, not the whole span inner html
Now performs action on star click
Ratings now work
added cpu stat modules for sunos
added CNAME to point to arrayjs.com
Update about the API usage

Update about the API usage and how to get the full history over time for an IP address.
cpufreq: added msm_cpufreq_attr
I/O Scheduler: added BFQ
I/O Scheduler: added BFQ
I/O Scheduler: added BFQ
I/O Scheduler: added BFQ
pmem: added PMEM_CHACHE_FLUSH ioctl
pmem: fixed PMEM_CHACHE_FLUSH ioctl
cpufreq: added lagfree governor
cpufreq: added lagfree governor
cpufreq: added CPU_FREQ_MIN_TICKS and CPU_FREQ_SAMPLING_LATENCY_MULTIPLIER configs.
Added Function::inverse() to base class.
Added functionality to VectorizedFunction for eventual Jacobian computation support.  Miscellaneous prettifying of the Function class code.
Removed Function::jacobian() declaration.
Added "thorough" mode to IncompressibleFormulationsTests, so that when not in thorough mode it'll run faster (more than 3x).  Turned thorough mode off during construction in DPGTests.
Initial implementation for the images management.
Allow ENV["FEATURES"] to contain a CSV list of features to run
force user to select org
dunno

Signed-off-by: Lucas Arnstrom <LucasArnstrom@gmail.com>
Merge branches 'dev' and 'dev' of https://github.com/BaiduFE/Tangram2 into dev
[change]提交一个功能超级强大的 baidu.id(object|id[, command]) 接口，给 baidu.type 添加第二个参数
Merge pull request #97 from ChineseDron/dev

Dev
Merge branch 'dev' of https://github.com/BaiduFE/Tangram2 into dev
[Change]升级 baidu.event接口
Merge pull request #99 from huangfangrong/dev

[change]提交一个功能超级强大的 baidu.id(object|id[, command]) 接口，给 baidu.type 添加第二个...
Merge pull request #100 from huangfangrong/dev

Dev
[Change]修改baidu.event的鼠标键值 ：1 === left; 2 === middle; 3 === right
Merge pull request #101 from huangfangrong/dev

[Change]修改baidu.event的鼠标键值 ：1 === left; 2 === middle; 3 === right
Merge branch 'dev' of https://github.com/BaiduFE/Tangram2 into dev
[Test] baidu.dom.on测试用例提交
[TestCase] on, off, one测试用例提交
Merge pull request #102 from linlingyu/dev

Dev baidu.dom.on测试用例提交
by dron
travisci needs this
Created browse page as well updated readme.
Fix conflic in lastest merge
version 0.0.7-dev starts
Tst frmwk working on most recent version of code.

TODO:
 1. Implement most recent improvements of the testing framework.
	(at that point the code will break)
 2. Remove as few instr features as possible until another working
	version is obtained.
 3. Start adding the features & debug until a working version is
	obtained again.
Fix logic for seeing if user is registered
Put members inside their function
@MichaelStache

Signed-off-by: Dominik Pich <Dominik@pich.info>
ebuild for git master
Use Ruby 1.8.7-style hashrockets in Rakefile
Debug everywhere!
better fatpack header
Unos cambios que quedaron fuera del merge
Use PHP_FE_END if available.
Merge pull request #1 from jedisct1/master

Migration
Added Doxramos Gossip Text Script
fix for "the floor emits a pulse of energy"

Signed-off-by: caelaislinn <cael_aislinn@yahoo.com.au>
artifact machinery now uses power

Signed-off-by: caelaislinn <cael_aislinn@yahoo.com.au>
Final parts of ZAS.  Works like a charm now.
Merge pull request #1384 from SkyMarshal/BugFixes

Final parts of ZAS.  Works like a charm now.
Sanity for the "give" command, changelog.
Merge pull request #1385 from SkyMarshal/BugFixes

Sanity for the "give" command, changelog.
Merge pull request #1383 from Drieden/master

Prevented genetics from scanning headless people
Merge branch 'master' of https://github.com/Baystation12/Baystation12
talking crystal can be heard with ghost ears

Signed-off-by: caelaislinn <cael_aislinn@yahoo.com.au>
Merge pull request #1386 from caelaislinn/master

anomaly tweaks and changes
added acid_act() proc, works similarly to proc on luna code, fixed some anomaly bugs

Signed-off-by: caelaislinn <cael_aislinn@yahoo.com.au>
Merge pull request #1387 from caelaislinn/master

additional anomaly tweaks / fixes
Fixed compilation error and moved acid_act()
this should fix the power harvester bug

Signed-off-by: caelaislinn <cael_aislinn@yahoo.com.au>
fixes and tweaks for the harvester

Signed-off-by: caelaislinn <cael_aislinn@yahoo.com.au>
revert admins.txt

Signed-off-by: caelaislinn <cael_aislinn@yahoo.com.au>
more tweaks and fixes

Signed-off-by: caelaislinn <cael_aislinn@yahoo.com.au>
fix for never closing bug

Signed-off-by: caelaislinn <cael_aislinn@yahoo.com.au>
artifacts have a disable message

Signed-off-by: caelaislinn <cael_aislinn@yahoo.com.au>
anomlies now have an activated and non-activated sprite

Signed-off-by: caelaislinn <cael_aislinn@yahoo.com.au>
library resources view added
fix some dumb key names

these keys are good for finding bugs but not much else
Visibility declarations and cleanup for CI_DB_postgre_forge
Some small improvements to CI_DB_interbase_result
Fix form_input() associative array example to match actual return
Merge pull request #1186 from tiyowan/develop

Fix form_input() associative array example to match actual return
Update, Part 3 - TC rev (new BASE): https://github.com/TrinityCore/TrinityCore/commit/936c62ef4cfe85b04f689d08696a29a792815c2a
Merged serveral important changes after BASE rev
ENH: Adding better plotting for clusters, colormap
ENH: 5-10% speedup
Fixing sloppy comment
FIX: Silly print
basic file dir
Fix empty chunks not sending biome properly and causing client side issues. Fixes BUKKIT-2396
Fix Future task waiting logic. Fixes BUKKIT-2408

Previously, the timeout would erroneously get converted to milliseconds
twice. The second conversion was removed.

Spurious wakeups were not handled properly, and would instead throw a
TimeoutException even if the waited time was not reached..
Fix BUKKIT-2419: PlayerAbilities not being updated on teleport/respawn

Minecraft resets abilities based on what it knows client side, when someone dies and is in "survival," by default they should be in "survival." However, we allow modification of the PlayerAbilities, so we send this update out to the client.

Oh and, the format of the commit is like this to see if it looks any good. :)
Fix crash from console-commands throwing exception. Fixes BUKKIT-2479

When 1.3.1 was released, a try-catch block was removed from the tick
loop that called the method in NMS to handle commands. This restores a
try-catch to prevent the console from crashing the server.
Add information about async tasks to CrashReports. Addresses BUKKIT-2491

Async tasks are notorious for causing CMEs and corrupted data when
accessing the API. This change makes a linked list to track recent tasks
that may no longer be running. It is accessed via the toString method on
the scheduler. This behavior is not guaranteed, but it is accessible as
such currently.

Although toString is located in the scheduler, its contract does not
guarantee an accurate or up to date call when accessed from a second
thread.
Change local jline checks to not use String literals. Fixes BUKKIT-2455.

Refactoring dependencies 'changes' the string literal in the code. This
commit changes the literal to instead use a char[] to initialize a new
String. On a bytecode level, there will not exist a String literal for these
two values; the shade plugin will no longer refactor them.

Refactoring jline also changes the other String literals we use for
notifying jline of the current state. To insure that our local code reflects
the inner logic in jline, the key value was changed to the static final
variable located in TerminalFactory. Likewise, UnsupportedTerminal uses the
explicit class name (as reflection is used later with the value that has
been set).
Bulk pending cleanup.
[Bleeding] Add 'per-tick.autosave' setting for bukkit.yml (in ticks,
0=off). Adds BUKKIT-2507
Reverted changes to chunk saving behaviour.
[feature] added gain scheduling
NBXlite: Fixed sky color in 1.2
NBXlite: Use custom decorator
NBXlite: Fixed decorating
NBXlite: Show right biome in F3
NBXlite: Removed unused class
Released NBXlite r50
Modified temp ban conditions.

Signed-off-by: Exultant <insane.au@gmail.com>
add parent child relationship rs
add parent child relationship rs
petite correction sur la requete de recuperation des modules achieve
.gitigniore pour la bdd.php premier commit écrasé
SIGINT signal and make-up
fdaafsdfsd

sadfasdfasdf
i.MX: mxc_ipuv3_fb: add ipuv3_fb_shutdown() routine to stop IPU frame buffer

Signed-off-by: Eric Nelson <eric.nelson@boundarydevices.com>
Tested-by: Fabio Estevam <fabio.estevam@freescale.com>
i.MX: shut down video before launch of O/S

Signed-off-by: Eric Nelson <eric.nelson@boundarydevices.com>
User is removed from online when disconnecting
Online users and account page is now merged
New gitignore for Project Manager
Merge pull request #151 from DavidWyand-GG/gitignore-ProjectManager

New gitignore for Project Manager
Remove unused PoC's.
Make the direct fs variant the default.
Apply the no-store cache-control header.
Make the filename unique.
Remove commented out debug code.
Accept integers and floats.
Log the correct IP.

Take into account proxy's and caching layers by using the
'x-forwarded-for' header.
World documentation
Merge branch 'master' of https://github.com/HALTGames/ICT207Game
Call tips for member functons
Added dot completion support for import statements
Add alsoftrc
add timestamp to packet file name
add neighbor cell info in threeG module
work on dir code
Merge branch 'master' of github.com:HerobrinesArmy/ChaOS

Conflicts:
	chaos_theory/Kernel/Main/main.10c
some bugfixes
Merge branch 'master' of github.com:HerobrinesArmy/ChaOS
Filesystem fixes. It works!
Merge branch 'master' of github.com:HerobrinesArmy/ChaOS
prettier output and updated the roadmap.
Lidt test :-)
Moving <html> regex into Creative_Commons::_parseRdfHtml method/function
implement custom pagination renderer for bootstrap
Remove listen and namevhost statements from the main apache config file if we are going to use this
small updates
Merge pull request #1 from IonutC/ionut/cookiegal

small updates
Add table for write-up 7
Teleport class looks more boss
fucking aaron
Server now keeps player's inventory up to date when he picks up an item.
added non interactive npc ai patterns
Checkpoint working on trading.
Merge branch 'master' of https://github.com/Jeaye/DarkRedemption
Adding functionality to equipment state
Merge branch 'Stephen_Working'
sry steven
item function to get item cost
Still working on trading.
Merge branch 'master' of https://github.com/Jeaye/DarkRedemption
Yet more work on trading.
fun fun
Merge branch 'master' of https://github.com/Jeaye/DarkRedemption

Conflicts:
	src/server/server.cpp
Working more on trading.
Merge branch 'master' of https://github.com/Jeaye/DarkRedemption
Updated trading to limit pending lengths and disable accepted bids on a new placement.
more trade system stuff
Merge branch 'master' of https://github.com/Jeaye/DarkRedemption

Conflicts:
	src/server/server.cpp
Added context menu to player.
almost there
Added a signup form
Finished user signup.
Gemfile.lock
Merge branch 'sign-up'
Removed unnecassary export formats and fixed misspeling
未完成的任务

Signed-off-by: AB <www.wpj@163.com>
Empezando Menu principal
1.updated getToDoDish.php
2.added cleanTable.php & latestStatistics.php
actualizado hasta Slider
Logout

logout button & logout fuctionaliteit
Mapping aangepast

Mapping aangepast naar "extends"-idee. AirMarshal mapping gebruikt
StaffMapping doordat AirMarshal Staff extend.
Add Collator#sort!.
Add LocalizedArray#sort and #sort!.
removed chrome-specific stuff from this branch
js param issues "fixed"
fix exams/grading
Merge remote-tracking branch 'snowsunny/master'
added title to address
Update SQL/SQL.txt
Added `Later I will be merged to master`
Revert "Updated README"

This reverts commit b6b367c3461a72f4ce9471b94ce19623b0e6a5e6.
FIX #17: If you compile manually with java 5 and maven2 you should have a valid client for this scenario
Fixed attributes hash init
Stop trying to load new posts once the server returns there are no more
Add cachingsync to cache models locally
Only initialize main view when on that route. Otherwise each page load means 50+ posts rendered
Not needed as the post should never change while someone is viewing
全APIの返却値修正

検索条件のdefault値を返却
Read Me now on English
fix: remove socket session from child processes in cluster on disconnect
Merge pull request #1061 from shripadk/master

Fix: Remove socket session from child processes on disconnect
drag-n-drop file to folder with ajax post query and callback (noe empty). Loading files by Drag-n-drop to files area
Merge branch 'develop' of github.com:Leemo/kohana-wysiwyg into develop
Signed-off-by: Leprechaunz <leprechaunxx@gmail.com>
Setup by Boilerpipe Revision: r183
Edit the domain building string so that paths we create are correct, add in the array that'll hold changed files that we'll use later to edit the @imports.
Finalize Parse/replace vars code. Start on parse/replace imports.
Edit the examples for some more edge case ideas I have.
Edits related parsing for imports.
Potentially finish parse imports. First few test runs.
Fixed space at top of manifest file
Link to parent's events.
Parent can view fresh events of his children.
Tests for scope 'fresh_events' added.
index_for_parent for event controller test added.
New test added.
index journal for parent added (drop down menu, route, and method in controller + view).
Dropdown menu to choose subject in parent journal added,
curriculums_for_pupil improved
Show lesson's dates in journal table.
Show pupil attendance in parent journal.
Show pupil's estimations.
Show average estimation and number of visited lessons.
Suche nach Name ermoeglichen
ImageBrowser class created
ImageBrowser class created
Switch images with 'a' and 'd' keys
Switch navigation to paging (Partly done).
Fix Imagebrowser
About Menu added.
About menu added (part 2)
sistema apresentado uma vez para o professor
backup db dir and backup file
added the playback state
Tweak formatting
Remove two lines that were throwing off the console logging format
gestion de la base de données
Ticket #2808: build failure on FreeBSD 6.

sys/param.h needs to be included before sys/mount.h on FreeBSD 6,
otherwise compiling fails with undefined identifier NGROUPS.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
Merge branch '2808_freebsd6_build_failure' into 4.8.1-stable

* 2808_freebsd6_build_failure:
  Ticket #2808: build failure on FreeBSD 6.
Rename syntax_rule to edit_syntax_rule_t.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
(edit_get_syntax_color): return color directly.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
(get_first_editor_line): minor refactoring.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
Many editor functions: take editor as constant object.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
xbmc: update to xbmc-1677554

Signed-off-by: Stephan Raue <stephan@openelec.tv>
ffmpeg: update upstream patches

Signed-off-by: Stephan Raue <stephan@openelec.tv>
hdhomerun: addon redesign (binary files in OpenELEC image, addon starts driver)
dvb-firmware: update to dvb-firmware-2d230f6 this closes #1361
Merge pull request #1407 from vpeter4/hdhomerun

hdhomerun: addon redesign (binary files in OpenELEC image, addon starts ...
vboxguest: update to vboxguest-4.2.4
xf86-video-virtualbox: update to xf86-video-virtualbox-4.2.4
open-vm-tools: update to open-vm-tools-9.2.0-799703
xf86-video-vmware: build depend on 'xorg-server'
xf86-video-vmware: add patch to compile with xorg 1.13.0
Merge remote-tracking branch 'upstream/master'
Features. Part 2.
s/cyanogenmod.com/cyanogenmod.org

Change-Id: I40d838d39c25dc41e0c3ff22469909b7243b33a2
Allow omnom without param if set up

Change-Id: Id0c053dd1098228d5e4d74cfe9bf68a06f687937
omnom: eat: push md5 file for zip verification

Works on certain recoveries which perform zip file verification
(namely TWRP, not sure about CWM).

Change-Id: I63248d6f59ed853eccabf41bad831ac486cbcff1
Merge branch 'jellybean' into MiniCM10
Merge pull request #4 from MissAllSunday/develop

Develop
Merge branch 'master' of git@github.com:MissAllSunday/Breeze.git into develop
lots of users to load...

Signed-off-by: Suki <missallsunday@simplemachines.org>
load lots of users

Signed-off-by: Suki <missallsunday@simplemachines.org>
Build the status link

Signed-off-by: Suki <missallsunday@simplemachines.org>
Revert "Replace dlattach with dlavatar when dealing with avatars"

This reverts commit 4f2dbf1b37eff7be7a40507820258c8c84e998e0.

Signed-off-by: Suki <suki@missallsunday.com>
Revert c3e959bc7a2c7db28d961d4a1058c4d14d9513d7

Signed-off-by: Suki <suki@missallsunday.com>
Add executable mode for some scripts
fix to healAll method in EntityTrainer
Golbat & Drowzee re-added 
Fixed Kukuna!
Fixed Magneton! Also, fixed Drowzee's nose
Merge pull request #125 from GodOfWar526/master

Added Drowzee + Golbat. Fixed Kukuna + Magneton
document requireBeforeRun
Added 'package' field
สร้าง HelloWorld.java
เพิ่ม programming is fun
Original Source Code version 0.23
xbmc: update to xbmc-25bb46a

Signed-off-by: Stephan Raue <stephan@openelec.tv>
build problem with mass commenting out of debug
Merged API

Conflicts:
	web/api.php
removed tabbed navigation, completed stations and connections documentation, added API objects section
some more doc refactoring
restyling of stationboard example
Added TOC
Fixed font-family of autocomplete
Allow passing date/time
whitespace
extra space
documentation for dateTime variable
Added license
Added README
Separated date and time in Connection Query
changed file url
added both xmlWriter.java and the output-file ~400 mb
working om xml html and parser
nothing new, same shit
more same
Test anders..
added simple class Connection
Added empty Connections and ConnectionsLoader classes
added enum RoadType
private final
RoadType constructor
working on Connections
added getConenctions
Connection comparable
moved and declared package
added resize + fixed floor()
added more methods
merge sort
binsearch
Connections seems ready for first use
found some bugs to fix
Set current class for panel-links on initial setup
add AFOAuthClient to compile
ardour, bind, bogofilter, clamtk, dropbox, exo, kernel-custom, kid3, libproxy, libtalloc, libtasn1, libtdb, lilv, serd, sord, sratom, suil, thunar, wesnoth
Avance PHP
isOkay?3
Adding more exceptions that can be thrown by the registry helper
Fine tuning behaviour of registry helper
Adding/correcting tests
added easter eggs and updated help
prototype version for presentation
removed note

Signed-off-by: emericask8ur <sk8tj@yahoo.com>
Started chapter 6: auth system
Made a basic User model (including secure passwords)
Started sigup
Add SSL in production
Fixes global variables.
Refactor : Move sha1,sha256 from NSData(AES) -> NSData(CryptoHash)
NSData+AES : cryptOperation now takes an optional initialisation vector

If the vector is not supplied, now uses NULL which has the same effect
 as creating a zero filled vector, but is probably a bit more
 efficient.

Also reordered the parameter validation so if it fails, it fails faster...

And fixed up some comments (mostly pragma marks)

Comment fixup in NSData+AES
Add tests to git

This also includes some experiemental classes - they'll either go
away, or get folded into the main codebase at somepoint.
Add test for NSData:cryptWithSalt
Some maintenance changes to test Makefile
created Priority enumeration to help describe - well - priorities...
Add new progress gif.
Add bendy transforms in the stub data.
changed the First Time Login for the Client Info page a little
Changed CC NBTTagCompound return to table.
Added search input to orderer GUI
Changed version
Merge remote-tracking branch 'remotes/origin/master' into BC2
ChassiPipe check sink first before inventory space.
Dont remove animation on completion
Adds ReadmillLibraryItemId as a typedefed NSUInteger
Merge commit 'b4b51eacf7597903f63544db0a46ac9b6d43df58'

Conflicts:
	Classes/Framework/UI/ReadmillSpinner.m
pending new version
PlayIdle function
Fixed inverting of red and yellow markings on click.
Fixes I believe?
Added missing default value for $defaults
SCEDC catalogs SCSN and SCEC formats 201212191600
change of adding algorithm

the program is now using struct to store the binary number and adding
algorithm is optimized and without the need of third string allocation
Adventure Time.
Removed error information from notification.
Merge remote-tracking branch 'origin'
Started on loading universal settings from xml and popups are handled better.
Started adding popup menues and linking them to the program.
Addes races (max stats) to the game, now I just need to connect it to the characters and gui
Доделываю теги
- Set multiline in neobundle/search source.
corrected typo in explanation
heading bar
Added a TODO to the InputHandler

The keystrokes stack up and are all executed (try spamming
up-left-up-left-up-left a lot of times, then keep playing...)
Removing "executeStack" from the callback-determination logic (see
yepnope.js issue #107)
Merge pull request #108 from jamesstephenson/master

Removing "executeStack" from the callback-determination logic
2.9.0 with updated apps(Holo and SuperSU) pending gallery check
Removed ZeAppleBoffin, added Aleaumin.
commented php file, added additional info to mobile register
added bootstrap to nightwish detail
Aniamtion class updates. fixed reverse and auto play
Even more messaging cleanup
now loops between map 1 and 2, only need to collect 1 crystal
Added missing Minecraft 1.2.4 blocks. Fixes SPOUTPLUGIN-67
Updated README.md with various changes and updates.
Remove @scene from echo constructor.
Whitespace
Switches: entirely working?
Missing comma
Missing comma
Remove some debug messages
9 screens default 5
Removed all old properties of applet (2)
Updated redis version in setup.py requires
Upped version to 0.9.2
added note about closing exhibitor registration Friday, June 1.
updated over view descriptions and what's new
Adding selection of tissue to "forward" circos.
Changing so we don't read from session variables after the top of the form is written
Making everything so it should work the same on compbio and kenny
Repositionnements divers, suite et fin. Closes #42
added pause menu, GameScreen, transitions

*removed some debugging printlns
*added item quantity drawing
*made CastleLoading go to the GameScreen
*put hud in one class
*made Press enter on title screen pulsate
*debug element hidden by default, F3 to toggle
*manually implement a FadeIn transition for GameScreen since the real
transitions call render() before enter() which causes NPE
Changing the name of the post created in features
Use true fullscreen in X/EGL.
Remove redundant call to gl_set_viewport.
Reinit textures if pixel format changes in GL.
(Wii) Makefile typo - fix CFLAGS typo and remove CXXFLAGS (RetroArch
is C - there is no C++ code being compiled in for Wii or PS3)
Fix build if FFmpeg is not compiled in.
fix TODO; use my mkdirp wrapper
Base TestCase
Make chapter marks thinner.
did width markers equal to 2 pixels.
Show chapter marks is optional.
Fix: VSFilter (auto-loading version) wasn't loading on Windows 7.

Ensure that the RDP DShow Redirection Filter doesn't interfere in the graph building process because of its special 0xFFFFFFFF merit. The renderer selected in MPC-HC was given a so high merit that filters like VSFilter couldn't load anymore.

Thanks to Lord for the fruitful discussion about that issue.
VSFilter: Don't pretend the video input pin accepts all connections.

This should speed up a bit the DirectShow graph building.

Thanks to clsid.
Try to use DNew everywhere for consistency.
VSFilter: Reduce the filter overhead.

Avoiding a useless copy when possible.
fix the move after center
Done (xcept 20 and 21)
Actually use the cache_buster parameter value

... rather than wiping all caches despite that value ...
xcode wanted to 'perform recommended changes'
Bump version
Refactor
Send raw
Bump
Feedback ao cadastrar e-mail.
create user added to cluster
login cookie overloaded with external driver
delete article content fix
added mask for article add

added CacheBuilder for Categories
removed style

Signed-off-by: NurPech <nurpech@nurpech.de>
added dashboard support

Signed-off-by: NurPech <nurpech@nurpech.de>
removed local changes to test bug #417311
added beamed Mentu - GVC Mentu Enforcer (temp name)
added MVas & MVasUp beam weapons
equipment model descriptions in navbar dropdowns are now processed by markdown #283
lolz the cart has been broken in Firefox for a few weeks, guys; this fixes it
Merge branch 'development' of github.com:YaleSTC/reservations into development
moved view as into footer
tweaks to view as in footer
rx_1.1.0_20120918_17:17"
Widget is now resizeable horizontally, also redesigned a bit.

Rewrote DefaultExceptionHandler's logging to not require a context. Exceptions.txt storage moved to internal.
add zeega files
CleanUp
More CleanUP, Max Loot/Revive Distance Coded

"gw2.lua" now have:
wt_global_information.MaxLootDistance = 1200
wt_global_information.MaxReviveDistance = 800
-- Both are now used by respective functions in "wt_core_state_idle.lua"
More CleanUP & Re-did Downed state

Downed state should be working a lot better now.
new Text() creation moved inside for loop
Make the game count the player in.
Loop on bad registration
Erlang formula patches make_preload, addressing #14291.

To work around a build failure of the form:
  form size 1413 greater than size 1237 of module at utils/make_preload line 175

We change make_preload to use bytes::length rather than length.
After evaluating whether this affects OS X builds more generally,
the patch may be submitted upstream to Erlang.
This is

So good.
Organize and extend CasperJS tests
Add missing bootstrap-modal.js
some minor help text changes
new header file structure to make it work on ios
Debugging Session
added Icon and gitignore
Update README.md

Moved the todo into the issues.
Lesson 1.1: more argument parsing; introducing os and flag packages

A small little update.

-       if len(flag.Arg(0)) == 0 {
+       if len(flag.Args()) == 0 {

Above, you see me make a subtle behavior change in how I test for command
line arguments. flag.Args() contains the non-flag command line arguments,
and testing its length is different than testing whether we have any
arguments at all. This type of check seems more logical to me.

 22         for _, arg := range flag.Args() {

Above, you see how we loop over the non-flag command line arguments which
are passed in flag.Args(). Since I don't really care about the positional
values of the arguments, you see me using the idiomatic 'blank identifier'
in the loop.

The remainder of this commit isn't super interesting. The new functions
introduced by the inclusion of the 'os' package have normal looking APIs.

 23                 ifp, err := os.Open(arg)
 24                 if err != nil {

We see here that we just take the multiple return values in go functions
for granted, getting back a file pointer in the success case and an error
value in the error path. This is much more elegant than the C idiom:

9243     if (!(ifp = fopen (ifname, "rb"))) {

The above is such idiomatic C that us old crusty guys might wonder "how
else would you do it?" but taking a step back, we see it's pretty gnarly.

	a) we do variable assignment using the '=' operator inside of
	an outer boolean test. How many zillions of bugs are out there
	due to people screwing up an '=' vs '==' in an if clause?

	b) if we have not memorized the return type of fopen(3), we must
	assume that it is "zero-ish on failure". This is one of the worst
	parts of C, where sometimes returning 0 means success and other
	times, returning 0 means failure. Even the standard library is
	inconsistent, meaning it is impossible to know for certain how to
	test for error condition without looking at a reference.

	c) and anyway, fopen(3) returns NULL in an error condition, which
	most C programmers never think twice about, but do note that NULL
	merits an *entire* section in the C FAQ:
		http://c-faq.com/null/index.html

	And amusingly:
		http://c-faq.com/null/machexamp.html

Ok, I guess that was more interesting than I originally supposed.

Other items of note:

 25                         log.Fatal(err)

The above does call os.Exit(1), as you might imagine.

 27                 buf := make([]byte, 1)
 28                 ifp.Read(buf)

The above two lines are just filler here, and me starting to play around
with actually reading from the file. They can be ignored for now.
Add .swp files to .gitignore
grammer FTW
Command pattern support.
Correctly update subject on blur of payment field
Account for empty or zero values in payment field
Add content and footer sections
Remove bootstrap gem which caused problems during precompile
Add bootstrap files to replace gem
Update asset requires and imports
Convert styles to object-oriented style
$.fn.fadetrain: avoid rewrap using .first()
more documentation
generated documentation
fixing compiler wanrings
Versão inicial do mestre.
MEDIUM / Temporary fixed name-based shadowing for properties
MEDIUM / Fixed duplication issue
MEDIUM / Support abstract OntologyProperty (and no more only Object OR
Datatype property)
LOW / Add scrollbar to list widget
MEDIUM / Add new ontologies
LOW / Moved test classes to src/dev/java
LOW / Removed import
MERGE of locales
Merge branch '1.4.5' into 1.5

Conflicts:
	flexodesktop/GUI/flexo/src/test/java/org/openflexo/components/widget/FIBOntologyBrowserEDITOR.java
	flexodesktop/GUI/flexo/src/test/java/org/openflexo/components/widget/FIBOntologyEditorEDITOR.java
	flexodesktop/model/flexoutils/src/main/resources/Localized/Dutch.dict
	flexodesktop/model/flexoutils/src/main/resources/Localized/English.dict
	flexodesktop/model/flexoutils/src/main/resources/Localized/French.dict
added screen shots to doc
Fixed irstv/gdms-topology#8.
Updated the pom.xml to the latest jgrapht-sna.
Can only add listing if landlord
take advantage of using dzil
log outside of eval
add README for github
let dzil handle versions
add .gitignore
fix reference to $VERSION
fix checking options parsing
update Changes
don't try testing synopsis
add shareButton
done with everything except E.C.
landing page template, models
Добавлена поддержка неограниченного кол-ва языков для полей name и description
Creado módulo de banners en admin.
Syntax highlighting for shell files

This is somewhat imperfect but working syntax highlighting for shell.
Much better than editing monochromatic text...
Review mode now understands optional time arguments

Also, PYCONBOT_CHANNEL and PYCONBOT_NICK environment variables now work
as sensible defaults, for your virtualenv pleasure.
Added r.js build file and fixed things breaking during uglification.
Add script to add local Git repositories.
Undo escape time to stop lag in vim.
A basic bashrc
bang bang to sudo write a file
Finalised the release date

Signed-off-by: Gergely Nagy <algernon@balabit.hu>
Bump symbol versions

Since we had an ABI bump, maintaining old symbol versions is pointless
unless we'd maintain the SONAME too.

Signed-off-by: Gergely Nagy <algernon@balabit.hu>
the bug of bad content encoding is now cleanly solved, the encoding was set two times, one time because of cppcmsskel controller code, and one time with the context().locale() call, the second time it was uncorrectly set to 'us-ascii' because we were giving an incorrect locale, instead we were giving a language code, fr, en etc. instead of en_US.UTF-8 etc.
AS7-5078 cli if-else control flow: and/or/parentheses testcase for if conditions
Make cachedir if it doesn't exist
Support ';' correctly in URL
Remove unused vestiges of Cucumber
Remove configuration of unused fixtures
Small logic error in identifier determination.
Metaprogrammed in all the stats and stat mod calculations
More changes
More changes
The final version of the paper
Added self_and_children, all_children and self_and_all_children methods and test for them.
Refactor all_children method
Removed the all_children and self_and_all_children methods - I don't think we need them
Added rvmrc to gitignore
Re-enabling RSS URL, bumping version to 0.4.4-isotoma21-ampledata1.
Merge branch 'release/0.4.4-isotoma21-ampledata1'
netfilter: add wireless.subsignal.orh to walled garden
By Boy: add l10n_update module
s/--directory/--dir/g
Moving readonly chart to column layout
Work on #43 - working on the Game Jam event listings
Work on #10 - the site error pages
Fix for #66 - need for a initial challenge migration
Pull in from master - fix conflicts
If I could kill now I would
Adding background images to prize page sub-headers
Adding background image to mast heads
Removing extraneous whitespace from images
Adding side header boxes to rules/resources/judges
Can really remove this, now that it's back again

(No, not Shady, but still, tell a friend.)
Merge pull request #71 from andrewhayward/design-tweaks

Design tweaks
Fix for issues #67 and #68.
Work on #10 - the site error pages
Merge pull request #70 from rossbruniges/error-pages

Work on #10 - the site error pages
Merge in upstream
Merge in/fix from master
Merge pull request #58 from rossbruniges/events

Work on #43 - working on the Game Jam event listings
Merge pull request #72 from andrewhayward/optional-fields

Fix for issues #67 and #68.
Fix bug #74 - not assuming that all entries will have a category, as right now it's an optional field
Merge pull request #75 from rossbruniges/fix-single-page

Fix bug #74 - not assuming that all entries will have a category
Несколько вспомогательных скриптов
Hard Log now also writes in the Timestamp
Added collision with borders
Activated periodic synchronization
Fixed a movement bug
try catches to throw error
Test main class to test messaging
Fixed the bug in all cases except when delayed redefinition is used
Test…works?
CoffeeCompile shortcut.
Tabs for less.
TS-1599: set OpenSSL allocator with CRYPTO_set_mem_functions
hannover page added
Adding workbench