labofsahil/github-event-dataset-2012 huggingface dataset:
pravverzija rahlo spremenjenega CSSa. Nekak morm pogruntat kako vse to lepo narest.
Merge branch 'master' of https://github.com/BorisMarn/PiplMesh
Modificacion gemfile
Linked database and server code
Commented Shopwatch Class
Commented ShopWatch Class File
Database now sets up correctly both when none existed before, and when
it needs to load an existing database.
Merge branch 'Brad'
Many, many changes.
Removed the return from the middle of a method. (MATT :P)
Removed the hack that was screwing up my iterator (Matt :P)
Changed a handful of variable names to something more insightful
Added comments throughout most files
Cleaned up some indentation and formatting
Updated version to 0.5
Fixed incorrect Bukkit API use, updated to version 1.0
Updated database to use HashMap, added ignore for the user "Shop" to
prevent admin shops from being logged.
Added the Merchant class. Restructured how transactions are stored.
Saving new Shop File
Made World.refreshChunk() refresh the chunk, thanks zerg960! Fixes BUKKIT-1014
[Bleeding] Help index now identifies itself as "Help: Index" rather than "Help: null"
Improved coding effiency of 'slugify.go'!
Added test case for slugify!
exclude testIfOnePixelIsFound
kicked useless tutorial code for paintroid
initial commit

Change-Id: I575e6444c374c6c13ac16569841072175ba70fa8
second change to readme.

Change-Id: Icf9eed2d54fddaf539273da2d4648163e7a68e14
small changes to both js and PHP files.

Change-Id: I3aec99c92f17831347ebf68f70c3c91d7d955490
Merge pull request #1 from zydecode/master

got stuff to commit to main branch.
進入delay
mumma
+c override
Anti-highlight implementation, check the new config.yml for details.
Thank you @dequis
remove whitespace + change variable name
don't render new action
zsnes patch to fix freeze when resuming
Day 6

I finnaly figured it out. damn circular dependency...
the resource cache system works wonders. thank god for GCC :D
Fix: fnFilterAll was a bit dodgy - 10670.
Adición del archivo .travis.yml
Convert tabs to 2 spaces

- Use UNIX `expand hammer.sh -t2 > hammer.sh` to automatically
  convert tabs into two spaces
Add indents for uniform control-flow indentation

- Place indentation for if/else blocks
- Place indentation for function blocks
Fix unusual sed command spacing and comment

- The literal newline character has no affect on the sed command
  used here.
- The comment above the sed command is no longer neccessary when
  the command spans only one line.
Fix if/then spacing for uniformity

- The rest of the script uses "if [ --- ] ; then" style.
- Replace "if [ ... ] \n then" with the used style.
Remove trailing whitespace

- Use vim command :%s/\s\+$// to automatically trim EOL whitespace
- EOL whitespace is considered a poor coding style as it can
  on rare occassions cause difficult-to-debug issues and is rarely
  if ever needed for good reason.
...
In the future versions, I will solve the problem with out of memory on big image lists, and posters list will be much bigger then now (>20). To prevent old versions from crash, I limit max posters to 13.
delete ajax pagination
增加背景
Merge branch 'master' of https://github.com/DemoGames/GameDemo into Jack

Conflicts:
	Classes/BattleScene.h
Add Auth
Merge schema
Merging with old changes
Changing APP_ID and APP_SECRET
Add Sign in and Sign out to homepage
Complete sign in and sign up pages.
Merging with repo
input afegit
Merge branch 'master' of github.com:Dirbaio/Durum-Lare

Conflicts:
	Durum-Lare/Durum-Lare.pro.user
Merge branch 'master' of github.com:Dirbaio/Durum-Lare
Cleanup and logic
0.3.0 - 25/03/2012
Managed to make a simple static call to Johann's API. Will need to refactor and create builders to render the JSON into Android layouts
Add missing dependencies
Merge branch 'master' of https://github.com/BlueBrain/Buildyard
use MAX_FLOAT = 1.1e+38
finish window ,working on control block
Completed program tksutils/true
Completed program tksutil/false
Fixed licensing info.
Changed dependency info.
tabindex -1 instead of 0
Documentation change on thumbnails wp-admin -> settings -> media before adding comics.
You should go to settings -> permalinks and click save
0.3 alpha 2
Clean country/country_spec
Link Exam to ExamScores
WIP : Started Preference model
Create Guardian model, spec/model, migration
Link Profile to Guardian
Link User to Guardian
Link Guardian to Contact
Link Addresses to Guardians
Fix mistake in connections
Schema changed
Created guardian_factory
Fix preferences migration
Remove owner and owner_id from Preference
Set defaul locale to "EN"
[spec/models] Unmark pending test in address_spec
[spec/controllers] Unmark all pending controller tests
[controllers] Add destroy method with no flash msg for ajax requests
Remove link b/w Course and Syllabus
Link ClassGroups with Students, clean models/specs
[spec/models] Clean pending validation tests
Waarschuwing bij geen URL toevoegen WMS en WMTS (#145)

Hiermee is issue 145 gefixed
Added missed checks for potatoes and carrots.
ColladaIntensity
SQLite interface usuable, uniform getData written by merging local db and network access
Reorganization and first backtester implementation
lol
binaryjs
Fixed menu elements to show correctly

Almost everything now uses the newly implemented ResolutionManager
class. This eases out the element placement on the screen.
add constructor
initial commit
commit .settings
add BullWhip
Merge remote-tracking branch 'phungit/master'
Initial checkin of files, directly copied from the English Wiktionary.
removing the delete credentials and cleaning up the location services not working dialog
Implementing 'You are Here' and correcting some error handling down low in inrix.2.5.js
Attempting to speed up the refresh after changing current location
UI cleanup, aligning and removing lines
Whitespace formatting
Whitespace/formatting cleanup
Fixing issue where we hide the current address
Add the GridMon program.  Work in progress.
Add DirectStandings.EffectiveStanding()
UNTESTED!!!!  Added the following methods to DirectEve for POS module access: OpenCorpHangarArray, OpenStructure, OpenStructureCharges, OpenStructureCargo, OpenStrontiumBay.
Fix POS access functions
Add functions for creating a DirectContainer object for a CHA.  UNTESTED!!!
Updated directeve for Crucible 1.5
Added DirectEve for .net 3.5
Some rather hackish changes to gridmon, mostly formatting to what is relivent.
Updated directeve withmodal window support

Conflicts:

	DirectEve/DirectEve.dll
GUI for GridMon
Update Questor.Modules/Traveler.cs
Update Traveler/Module/Traveler.cs
Merge pull request #122 from iamplayer4/master

Fix to Traveler.cs in mainbranch.  Nobody should be using the master branch and I'm likely going to delete it and rename experimental.  However, I'll pull this request in for now.
CSMA pause length logging, log format fixes
reachability and CCA based on power, not distance
Revert "Rollback"

This reverts commit 6df69270a879430df90cdff44f569a883d70e404.
Revert "Revert "Registrierung mit cURL""

This reverts commit d1e3731bcb1c2e11e9046f0b2cfd1ba77ed174fb.
cURL Registrierung

Update
fix loading configurator for both Aurora and Aurora.Server on first running
10
11
12
13
allowfullscrenn fix for webkit
Fixes missing period.
Allow the user to specify whether to show the list of browsers.
Allow a custom message to be displayed based on what browser/os, etc. is detected, via an optional callback.
Passes JSLint
Version bump.
Make the instructions a bit less useless
Fixed broken collection test.
Jasmine v 1.2.0 added to repo for local tests.
Moved events into Truss, moved extend tests into truss tests.
Update scripts/useragents.js

Add detecting code for QIHU 360 safe browser.
redeployed
Merge branch 'master' into hover
Popravil licence header.
Fix label value table in iPad
Update links to source code
Implement "Manager" package related changes.

Closes #156.
[Entity][CheeseRepository] Fixed  typos
Merge pull request #1 from pborreli/patch-1

[Entity][CheeseRepository] Fixed typos
2 and 3 mostly done
Apply Custom naming of tabs pointing at LT data / The system SHOULD parse out "Views" from the word export / Larvol users SHOULD see a BLAlag
Abbott HCV CR did not show any news on  saturday Oct 27 & Sunday Oct 28th
The online appendix is displaying IR values instead of CIR values for products with PIR values adjusted
Босс фреймы слева
Revert "Some improvements."
Still working on new data model
Removed temp tester.
Fatigue
#74 - Prospect Delay
Split EventListener into smaller classes for handling different kinds of events.
general.py: fix for HashableSlice comparison (fixes bug with component indexing)
general: Component - fixes for complete-component shortcut
don't use with empty meshes
don't use for subd components (including SubdUV)
use ffd1LatticeShape.pt[*], not .pt[*][*][*]
Changed Virgin Mobile (US) domain to .com
x11-wm/enlightenment: Readd files/patch-configure
x11-wm/enlightenment: Remove --disable-bluez-option
audio/libmpdclient: Commited to main repo
Merge branch 'master' of https://github.com/MagikBSD/mgk_ports
No longer creating custom ThreadLocal instance as it may cause memory leaks
ticket:1

initial data with admin in separate file
Added mManageMaterial to specify whether a BaseObject3D will reload its
materials automatically or not. If many objects share the same material
then having each reload their material will cause lengthy and
unnecessary shader compiles. With this, one can avoid the redundant
compiles and simple re-assign the material to each affected object in
onSurfaceCreated().
Merge pull request #281 from jgooderham/master

material management flag
update bundler if there a new changes before running vizr
Update Edge/Edge.h

Ändrade så att man konstruerar med Edge(från-nod, till-nod)
Merge remote-tracking branch 'upstream/master'
Node.h
Merge remote-tracking branch 'upstream/master'
Fixade krossreferensproblemet.
Node uppdaterad enligt nya Set-standarden
Merge remote-tracking branch 'origin/master'
Korrektur av Makefiles
Liten fix
Merge pull request #20 from DavidLarsson/master

Fixade krossreferensproblemet.
Added CBBigInt fixes. Alpha 4 release.
fixed nasty bug
forgot something
fixed included references to MonoMac
Renamed Guid Properties, removed RectangleStringRepresentation, fixed TileSet deserialization
fixed more bugs, implemented the displaying of the map in HarvestMono
Added Configuration Managers for future implementation of correct Position calculation in Tile/TileSet Classes
forgot to commit this...
added a region
changed startup item and removed unused whiteline
implemented correct drawing of the TiledMap in HarvestMono closes #8
Rendering von TiledMap ausgelagert
oh hi, i implemented layer support! :D
fixed a bug that prevented the loading of existing maps
added ToString methods and updated tiledmaprenderer to work with newer monogame versions
moved maaaany files and implemented first version of eventing
simplified the eventhandling
changed the display of Layers and Events to show the name, not the Guid of the element
added number validation
added more input validations
fixed the tileWidth/tileHeight problem for now (also changed MapControl to always display the grid)
ants can now move, and default random map.
Added framework for sound management
Added a readme for ...?
Merge branch 'master' of github.com:MikeMayer/dotfiles
js test utils verplaatsen naar lib/
more shifting
legenda control voor de WMS laag

Toevoegen van een legenda control en wat dingen over het venster
verplaatst
Add missing config entries.
added distr folder
added check for type in JSON file
Fix pointer to parent pom.
this is it, finally found the BUG
Merge branch 'develop' of github.com:NIF-au/TissueStack into develop
added test label file
cli
Merge branch 'master' of https://github.com/NaZo0304/node_game

Conflicts:
	client/webroot/js/vendor/backbone.socket.js
sockets
Merge branch 'master' of https://github.com/NaZo0304/node_game
Student can see own progress.
small side case oversight
No more watery cows
Merge pull request #12 from stevommmm/master

Turn broken ice into air
cleaning up with empty programs and NGGD programs

delete several programs and Never-Gonna-Get-Done programs. random
cleaning up in plantfarm and getitems.
add table to content
pep8
pep8
Switch the homepage of the lab (and its dependencies) to haml
Switch all the lab to haml
Fix a display issue in firefox (in the footer)
Switch 'search' to haml
Switch the blog's templatetags to haml
Start to switch the blog to haml (homepage, templatetags, list)
Tweak request filtering to allow specific file extensions for ~/packages
and ~/api/vX/package paths
Work Item: #519
Modifying binding in ContactOwnersViewModel
fixed error where empty dependency set wasn't incuded in flattened deps; fixed error where an empty target fx was using the default target fx instead of remaining empty when flattened
No more depends on core_global.hpp.
Upgrade control
Revert change to insert method
fixed missing function ()
Fix issues with a test.
Merge pull request #58 from karlguillotte/master

[minor] Fix a RequireJS module definition
bundleRequireJs: Emit an error if multiple Knockout.js templates share the same name.
Hidden nav menu and added copy.
get Eventdata from Server, and pass value to eventMapView.
Update setup.sh

script update
Merge pull request #1 from codec-abc/patch-1

Update setup.sh
Attributs modèle parsés correctement
Mise en place du traitement de flevel et dlevel
Transition#select and #selectAll
Transition#transition (and backlinks)
Change `checkLoadURIStr`(Removed in Firefox 17) to `checkLoadURIStrWithPrincipal`
Fix indent & add spaces
Jobbiga sak
Merge branch 'master' of git@github.com:Pranz/jesper.edwin.git
this option was twice
overhauled sidebar registration and display, new sitewide sidebar
添加OpenERP 即将推出的第 7 版的功能和新的编程框架介绍.pdf
Change uliweb.po
Merge remote-tracking branch 'upstream/master'
翻译
翻译
翻译
Merge pull request #14 from meteormatt/master

新增少量翻译
fixed typos
added random password
Absolute path to icon
entitymanager useless
The list of layers will now be sorted properly
Points can no longer be added outside the area of interest.
The add server url box will be pre-populated with "http://"
not generic
added some convenience methods
revised the screen cropping, added createAt
containing returns primary screen if not in any, added newRegion, newLocation as relative to screen
Поправил снипет с комментарием к файлу bls
Use a more flexible date picker
20120824-2120

UPDATED
+ index.css
+ scripts/bootstrap.js
+ scripts/loader.js
+ scripts/game.js
+ scripts/screens.js

ADDED
+ images/test-01.png
+ images/test-02.png
+ scripts/images.js
removed ruby dotfiles
new sublime2 settings
set projects directory
global gitignore of sublime projects/workspaces
removed unused bin goodies
removed unused loot
/my/ osx settings
avfilter: correct memcpy size avfilter_copy_buf_props()

Does not make a difference in this case since sizeof(uint8_t*) ==
sizeof(uint8_t**). Fixes CID703814.
http: use av_strlcpy instead of strcpy() without size checks

Fixes CID700730.
g722enc: fix size argument in memset

Fixes CID700725.
rtspdec: use av_strlcpy for writing into fixed size buffer

Fixes CID231347.
swscale: Do not make ff_ symbols globally visible.
fate: Refactor setting of environment variables for groups of tests
build: sanitize linking of tools and test programs

This makes sure proper linker arguments are used for the tools and
test programs when shared libraries are enabled.  The tools are
linked using the usual -l flag while for test programs the full
name of the static library is used.

Signed-off-by: Mans Rullgard <mans@mansr.com>
svq1: K&R formatting cosmetics
parseutils-test: do not print numerical error codes

The error codes differ between systems so printing the value makes
the fate test fail on some systems.

Signed-off-by: Mans Rullgard <mans@mansr.com>
svq1: Drop a bunch of useless parentheses
arm: call arm-specific rv34dsp init functions under if (ARCH_ARM)

Assign NEON specific function pointers after runtime check via
av_get_cpu_flags().

Signed-off-by: Janne Grunau <janne-libav@jannau.net>
a64multienc: change mc_frame_counter to unsigned

GCC cannot proof that c->mc_frame_counter is always >- 0, changing the
type from int to unsigned fixes following warning:

libavcodec/a64multienc.c: In function ‘a64multi_encode_frame’:
libavcodec/a64multienc.c:342:17: warning: ‘buf’ may be used uninitialized in this function[-Wuninitialized]

Signed-off-by: Janne Grunau <janne-libav@jannau.net>
vc1dec: Use correct spelling of "opposite"

Signed-off-by: Diego Biurrun <diego@biurrun.de>
mpegtsenc: set muxing type notification to verbose
avio: introduce avio_closep
segment: support applehttp style list
vc1dec: Set chroma reference field from REFFIELD for 1REF field pictures

Interlaced field pictures can have one or two reference pictures, signaled
by NUMREF syntax element. For single reference pictures, reference picture
is determined by REFFIELD syntax element.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
vc1dec: Invoke edge emulation regardless of MV precision for 1-MV chroma

This is required due to the way VC-1 handles chroma pull-back which may end
up causing negative chroma MV for zero luma MV. Edge emulation needs to be
invoked in such cases.

This only affects vertical component of chroma motion vector.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
vc1dec: Set opposite to the correct value for 1REF field pictures

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Double motion vector range for HPEL interlaced picture in proper place

The existing code is not in the right place and it should cover both
interlaced frame and field pictures.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
README: fix Markdown syntax
added logout and delete account to member, added Sessions
Merge branch 'master' of https://github.com/asocha/picnit into asocha-master

Conflicts:
	api/member.php
Quickfix for action listener errors
Merge pull request #70 from bdupree/master

Quickfix for action listeners
editor testing
Merge pull request #212 from bdupree/master

editor testing
Merge branch 'master' into openstack-os-build
Add group editting to the bulk edit page.
Merge branch 'master' into openstack-os-build
Merge pull request #785 from galthaus/pull-req-master-7b7f35119a

Add group editting to the bulk edit page [2/5]
Merge pull request #787 from galthaus/pull-req-openstack-os-build-d61fc6f7c5

Add group editting to the bulk edit page [4/5]
Merge branch 'master' into openstack-os-build
Fix typo in interface speed comparison
Merge branch 'master' into openstack-os-build
Merge pull request #791 from galthaus/pull-req-openstack-os-build-07b009da95

Fix typo in 1G speed detection [4/5]
Merge remote-tracking branch 'personal/openstack-os-build' into openstack-os-build
Version 5.9

v5.9 -- Added Topaz Support
sx commit
PlantUML and enchanced python highlight
Added nerdcommenter and JS plugin
Fixed some styling and display issues
Added new variables: segment_N_category_url_title & last_segment_category_url_title

These help identify if a segment is a category or not. So
{segment_N_category_url_title} or {last_segment_category_url_title}
will only parse if they are. See: https://gist.github.com/3824429
Property issues inside the random class
bump papita
add post url for logging webhooks
dont need to add custom scripts to hubot-scripts.json
log out the payload from the webhook
add specific papertrail structure
having all.coffee in here was silly and unnecessary
build a dawg url and post into the test room
spam the app notifications to all rooms
Item entities cannot be picked up within the first half-second of spawning
Refactored block placement
inicio do layout novo (2.0)
Added main Rakefile and updated Vim's.
Release 0.31.2
Advertise development of new version
Drop needless log.
created accurate enpoint for assigning stories
Fixed all block ids and disabled acheivments/ enderblock
Первая html версия странички contest
Отредактировал ширину textarea до 100%
Поправил верстку логотипа
probably works?
probably works?
probably works?
reshaping objects
ROBIN: Fix a couple of bugs in handleOpcode()
Rework all IDL files and correct all changes
README.rst: Update to latest information.
Add a rule to hide cnbeta adv.
Added development mode updates notifier.  You will now be notified on latest devbuilds as well.
Beacon thing for Sheep and Wolf. CowardLevel now change according to environment. Ferocity still random
- fixed memory overflows leading to system reset
- added clean eeprom to EEany dbinit() function
- check_timer() loop interval increased to 5 seconds
Removed recaptcha gem, in favor of pluginless solution.
Give up adding Facebook like & send buttons due to Content Security Policy
Merge branch 'facebook-like' into develop
Merge branch 'develop'
added missing `logging` package descriptor
new context for 403
Búsqueda por título
Merge branch 'master' of git@github.com:TierraAdentro/mapu.git
Added block list menu from More main menu, adds predefined item so far,
not actually read by the blocker yet.
Added birthday experiemnts to tester and student info to CodeCamp & CodeCampTester
Created/tested constructor, add, multiply, and upperTriangular methods
dotdeb has moved to squeeze
Core/Azjol-Nerub: Apply some possible mechanic

* this should work, but it doesn't, most likely react state need some improving
attempt to work on minified version
Updating the instructions to include the UI changes
Update for Grid changes

Signed-off-by: Walker Crouse <walkercrouse@hotmail.com>
Listen to inventories regardless of open state

Signed-off-by: Walker Crouse <walkercrouse@hotmail.com>
Changes output of command 'killall' to reflect quantity of entities removed, addresses VANILLA-176

Signed-off-by: megagamer410 <megagamer410@gmail.com>
Merge pull request #323 from megagamer410/master

VANILLA-176 Fix
Fixed chunk load failure.  Something is broken with the direction part of teleport to transform though
Probably a more efficient way to do this
Reduced ping timeout by 50% again
Sends 4 pings per timeout period (one ping every 7.5 seconds)
Added ping to player list message and fixed bug with removing player from the player list on log out
Fixed meta issue with BasicEntityMobProtocol, added testing spawnmob.
Signed-off-by: Chris Sanders <zidane@outlook.com>
Revert "Fixed meta issue with BasicEntityMobProtocol, added testing spawnmob."

This reverts commit 2c058bbb533640c9b0f36a44e20049a0dc7500c1.

Did not mean to commit this...
Signed-off-by: Chris Sanders <zidane@outlook.com>
Fixed meta issue with BasicMobEntityProtocol, added test spawnmob (only
spawns an enderman right now).
Signed-off-by: Chris Sanders <zidane@outlook.com>
Enderdragons no longer break clients when spawning (it is required to send
meta 16 on spawn which is the boss health bar...thanks a lot Mojang).
Signed-off-by: Chris Sanders <zidane@outlook.com>
Fixed EntitySpawnVehicle to do more than fireballs, added more to the
spawnmob command (so you can spawn other mobs, not ideal but works for
now). Fixed support for smooth falling blocks that work past sand and
gravel (any VanillaBlockMaterial should work). Go ahead and try it out
with ;).
Signed-off-by: Chris Sanders <zidane@outlook.com>
NPCs are back.
Signed-off-by: Chris Sanders <zidane@outlook.com>
Cleanup component branch

Signed-off-by: Walker Crouse <walkercrouse@hotmail.com>
Put PlayerInventory in the data map

Signed-off-by: Walker Crouse <walkercrouse@hotmail.com>
Update windows correctly

Signed-off-by: Walker Crouse <walkercrouse@hotmail.com>
Try to add to quickbar first when adding materials

Signed-off-by: Walker Crouse <walkercrouse@hotmail.com>
Added dependency to Window of Human class
Improved the /obj command

Signed-off-by: Aleksi Sapon <QcTechs@gmail.com>
Improved rotatable objects (full rotation)

Signed-off-by: Aleksi Sapon <QcTechs@gmail.com>
Merge pull request #8 from VeoPVM/master

Link in footer
Merge remote-tracking branch 'upstream/master'
Merge pull request #9 from VeoPVM/master

CPU Warning
Merge remote-tracking branch 'upstream/master'
Removed Fusion Strike link from Footer
Merge remote-tracking branch 'upstream/master'
Fixed spelling mistake
adding jsf, xhtml and js files that authenticates and gets code from facebook
adding .metadata to ignore list
update NEWS
update new account routes for central updates
Merge branch 'release/staging' of github.com:Vizzuality/cartodb into release/staging
字符串转化到分已经完成
Update Collect.
Fixed hyperspeed bug.  Also now show default wall until image is loaded.
disabled tests for broken travis environments
Added dist. mana.
Added some preprocessor directives
Update ScanChannelsBDA.log
Planeettojen grafiikat skaalaa oikein
added feature with user profile fields
Merge remote-tracking branch 'origin/master'
Adding backbone router cc @CreepGin @aaroncox
SQLite dialect: fix parsing of SQL sub-selects

git-svn-id: https://svn.osgeo.org/gdal/trunk/gdal@24848 f0d54148-0727-0410-94bb-9a71ac55c965
Inside the model
Merge pull request #3 from abarry/develop

Inside the model
mapfill
Merge pull request #72 from abhinavc/master

new question
[cron-git-commit] @ 19.50
Removed all \insertQR from template

Any and all \insertQR should be inserted only by the web-service during
the intial tagging process
Merge branch 'master' of git://github.com/Genshin/GAKUEngine
[spec/requests]class group semester editting
Annotate models
admin/contact_types views and controller
[spec/requests] course group crud spec
[spec/requests] admin/contact_types_spec
Merge branch 'master' of git://github.com/martakostova/GAKUEngine

Conflicts:
	app/views/course_groups/show.html.slim
[xls export/WIP] exporting exams grading in xls
Merge branch 'master' of https://github.com/Genshin/GAKUEngine
Merge branch 'master' of https://github.com/kalkov/GAKUEngine
Merge branch 'master' of https://github.com/absolu7/GAKUEngine
[presets/wip] adding/update presets, create preset if prest is missingq
Merge branch 'master' of https://github.com/tapalilov/GAKUEngine
[controller] fix students
changed controller to support new follow joint trajectors action
Added base l setup files, libraries, etc.
removed api.py from app.yaml
updated files for section 2
Merge pull request #229 from adamarla/master

Layout change to roster.tex
Merge pull request #230 from adamarla/master

style change
Merge pull request #231 from adamarla/master

fixed layout in the header
[cron-git-commit] @ 17.45
 Changed to prove type question
Merge pull request #232 from abhinavc/master

Question edited 
Merge pull request #233 from adamarla/master

suggestion question
[cron-git-commit] @ 10.21
[cron-git-commit] @ 21.50
new questions
Merge pull request #234 from abhinavc/master

new question
[cron-git-commit] @ 22.38
- included files so that teachers and schools directory of front-desk may
be included as part of the bank directory structure
 alternate solution added
Merge pull request #235 from abhinavc/master

alternate solution 1-h5i-glztp
 Added \ang where necessary
 underbraces added
Merge pull request #236 from abhinavc/master

1-h5i-qlztp enhanced
Improved/simplied even further
Merge pull request #237 from abhinavc/master

Improved solution for 1-h5i-glztp
Add some thoughts on Chain.
Renamed Shader 'wrap' to 'fromId' (ref #32)
Renamed Program 'wrap' to 'fromId' (ref #32)
Sorted Shader::fromId method (ref #32)
Sorted Shader::log method (ref #32)
Sorted Shader::compiled method (ref #32)
Sorted Shader::type method (ref #32)
Sorted Program::fromId method (ref #32)
[CS] Remove old autotest stuff
[CS] Add rb-fsenvent for more efficient Guard
[CS] Clean up client specs
[CS] Guard only supports RSpec 2
[DOC] Travis build notifications in Adhearsion IRC
[DOC] Fix build status icon
[DOC] Gemcutter -> Rubygems
[DOC] Remove old TODO
[CS] Whitespace sweep
Empty cookie.txt so you dont forget it...
Do not send additional newcontent=
Curl-POSTFIELDS-Rewrite: Login
Curl-POSTFIELDS-Rewrite: Profile status update
CURL automatically urlencode's contents when passing as array - bad idea to do it twice...
snapshot before switching over to calculating all LTL sub-expressions at once per state
Implemented the third major revision of the LTL model checker. This time I reshuffled the application of the different analysis steps such that the entire LTL formula is evaluated every time when visting a state in the fixpoint algorithm. This results in a major speedup and "improved correctness". make check reports that verifier1 & 2 disagree in a number of cases, however counterexamples and the new verifier2 do agree.
finished aa set3 homework
Payment button atop list
Impoved #26
Improved #26
Cleaning
Update the todo list...
TreeView: cleanup...
Show Shortcut Arrows In The TreeView...
OpenshiftM initial commit
Merge branch 'master' of github.com:afsilva/OpenshiftM
Made setting parameters from the command-line with --set work.
fixed leading blank line in output
Removed extra param in dict
Fix downloading on Akamai when ABC provides streaming servers in auth XML
Merge remote-tracking branch 'origin/upstream'
khuno.vim
Initial commit for binifadet
Actually we supprts rubypython 0.6.1 and it's more preferred due to 64bit fixes.
Minor tweaks
Updates NERDTree
Merge branch 'master' of wm:~/.dotfiles
Fix get_rusage function by changing ffi_lib() call in LibC module

I do not know why this works.
added Readmie
Stage 2 conversion to modern Objective-C.

Stage 2: Removed all the @sythesize. Added some more literals that weren't picked up by the migrator.
Fix alembic migration history
fix link for deleted files
state before full change
added jquery and script js
relocate all assets to public folder and create controller for user
partial for signup
Only process questions and answers that meet a minimum score.
Automatic import of local services and local interactions. First pass at tests for Rake tasks
Make the supporting page information more eye-catching.
speeches#index is no longer used so removing it
news_articles#index is no longer used so removing
Switch to using chronological order for sorting
added core-16 mixin

as per
http://alphagov.github.com/design/gov.uk.typography/transport.html
Fix Attorney General's Office slug

The slug was erroneously generated by transforming an apostrophe into a
hyphen. This removes the erroneous hyphenation.

https://www.pivotaltracker.com/story/show/40198451
Stop other styles effecting Specialist design
Make test names less ambiguous and easier to read.

I found the phrase "admin preview" to be very confusing given the
existence of a preview environment and its relevance in some tests.

The distinction between "preview" and "public preview" was lost on me
initially. I believe the intention of these tests is to distinguish
between the internal and public hostnames for a given environment.

I've also re-worded the english in the test names a little with the
intention of making them more readable.
removing old grid classes
carbon: restore clipping rect on RestoreDC, save/restore Window and Viewport offsets

git-svn-id: http://svn.freepascal.org/svn/lazarus/trunk@38548 4005530d-fff6-0310-9dd1-cebe43e6787f
TAChart: Add Marks.Arrow property

git-svn-id: http://svn.freepascal.org/svn/lazarus/trunk@38502 4005530d-fff6-0310-9dd1-cebe43e6787f
TAChart: Copy BaseLength in TChartArrow.Assign

git-svn-id: http://svn.freepascal.org/svn/lazarus/trunk@38503 4005530d-fff6-0310-9dd1-cebe43e6787f
TAChart: Notify chart when changing Series.Marks.Arrow

git-svn-id: http://svn.freepascal.org/svn/lazarus/trunk@38504 4005530d-fff6-0310-9dd1-cebe43e6787f
TAChart: Add mark arrows to "label" demo

git-svn-id: http://svn.freepascal.org/svn/lazarus/trunk@38505 4005530d-fff6-0310-9dd1-cebe43e6787f
support of OFPP_ALL and OFPQ_ALL in stats
うまくappnedできねーーー
fixed bugs 1 to 8
Setting deployment target to 10.6
adding license file
Adding demo movie
Adding movie to README
Added git config.
Added new oh-my-zsh plugins.
Correct typo
Merge pull request #799 from andrewgaul/unregister-provider

Correct typo
configure .gitattributes to not convert shell scripts to CRLF on Windows
decrufted metadataapi
Merge pull request #800 from dkoper/cc5dc55bb06829b53c0c29f3730cff47be1a20d9

added the file to all places with shell scripts
Configure duplicates plugin to ignore .gitattributes
Merge pull request #801 from richardcloudsoft/duplicate-gitattributes-error

Configure duplicates plugin to ignore .gitattributes
Added test descriptions and dependencies to basic Nova live tests
issue 830: keypair
review addressed
Merge pull request #804 from andreaturli/master

issue 830: added keypairs test
Merge pull request #797 from grkvlt/openstack-test-descriptions

OpenStack test descriptions
nslookup on CentOS 6.2 doesn't set error code when failing, so grep expected output instead
Merge pull request #806 from dkoper/master

adding grep to confirm expected nslookup output
Issue 1075:switch to use jetty for java install/web service tests
issue 830: fixed VAppTemplateApiLiveTest.deleteVAppTemplate
Merge pull request #807 from andreaturli/master

issue 830: fixed VAppTemplateApiLiveTest
default region endpoint for rackspace legacy apis
Update parsing of Status in CloudStack Template

The CloudStack Template status field is generally presented as human
readable text. This commit extends the enum fromValue() to understand
the known status strings in CloudStack 3.0.4.
azure management base implementation
complemento no portfolio
Updating styles
Making comment delete button nicer
fix name of recipe/package.
Minor refactor of extension methods
Moved word_count() from mp to mp_doc.
Fix infinite loop in replace command
Keep instance signletons on process to share between different rebus modules.
If modules are not compatible, warn and create own instance.
Merge pull request #6 from anodejs/yosefd1

Keep instance signletons on process to share between different rebus modules
New README

Since we're merging Hiro 2 to master we need a new README that
reflects coding style changes and so on.

I've also renamed file to plain README because Markdown doesn't
seem to understand new lines and long lines are not very readable
in plain text.
* Created new update service which can be used to update the CMS by pushing tag or commit changes
* This commit includes update agent that pushes updates to registered CMS installation.
* Bug fix
* Bug fix
* Update tool can now accept target parameters
Merge branch 'ServiceInvocator' into Deployable

Conflicts:
	build/privileges/Privileges.xml
	build/resources/privileges.sql
added wizcorp styles
Fix enable callback missing on iOS/Mobile Web.

Fix enable callback missing on iOS/Mobile Web. Fix README to reflect
the change.
Add sample app for com.appcelerator.drawer widget

Add sample app for com.appcelerator.drawer widget
Update binary release revision -- 2012.08.03
rewrote + html
uff
uff
Readme fix link
fixed a bug in resources/model.py
Merge branch 'master' of https://github.com/armet/django-armet
álteracoes do ensino superior
tets
Merge branch 'master' of github.com:artursitarski/wiki
Updated the "Column Control Example" Slide
Fixed a couple heading tags and added bullets to last 2 slides
Merge branch 'master' of git://github.com/josephmatthews/CQMeetup

Conflicts:
	meetup.html
add a bunch of old files
more random files
modified:   ../../.vimrc
	lpthw_notes.py
Brand new template compiling technology. Ultra fast and effective.
First bunch of virtual templates
Oxygen_Object_ has no ancestor.
Controllers revenge!
Finally fixed terrible bug. Revealed that we should use ReflectionClass/Method instead of method_exists inside autoloaders (or autoloaders will crash even if class being examined is already loaded).
Live test cases for new templating/asset-pipline mechanism
accidential merge
Implement random sampling of articles
Ported over 0.76 requirements :D

ScriptRequirement needs its parseArgs() refined with new aH methods.
Helper function for terseness
Updated test to check for 200 status on non-error route
Add random_walk function.
removed unnecessary files and clean routes.rb
Added cancel and validation functions
Rebuild cache for server v3.0874
Built on 2012-12-02
Add links to the different lists to the user profile page
Logo and faviocn
added validation for showtime model
less verbal bash prompt + additional PATH
Updated repeat priorities
Fix invalid error

This fixes https://github.com/krestenkrab/hanoidb/issues/12
where an old file descriptor is used when storing
2i (transact data) causes the tx log to roll.
Output errors to stderr rather than stdout
FAQ 2.2: it's now one year we run on M-Lab

No need to keep legacy sentences around that mention
the old clients.
Creating skeleton maven/spring project
Envy up no longer auto provisions when not defined in the Envyfile
fixing runtime extended cucumber tests under Origin
Merge pull request #508 from abhgupta/abhgupta-dev

Merged by openshift-bot
Merge branch 'master' of https://github.com/openshift/crankcase
EZP-154: fixed a routing parameter / constraint mismatch
3.7: enable emmc on bonelt

Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
added xilinx library
Deleted Cherry Py
Update case of less @imports to match files.

Updating reset.less, variables.less, mixins.less and gfx.less to match
the case of the files on disk. This fixes a build problem using lessc on
Ubuntu.
finish user area
test
Merge branch 'master' of github.com:benohara/dotphiles
Added bullshit hacks for ATV
Added ability to remove image by tapping x. 
- Converted tabs to spaces.
Removed rogue letter d from nuget.targets which was preventing proj load in VS.
Merge pull request #1969 from bergerkiller/optimize

Fixed entities not dying/synching
Made lighting a tick stage task

Signed-off-by: Irmo van den Berge <bergerkiller@gmail.com>
Initialize rspec environment.
Add rspec to development dependencies.
Add gemfile including guard.
Start a Guardfile.
Add guard-yard, redcarpet and linux inotify gems.
Add guard-yard config.
Add yard development dependency.
Yard command line opts.
Add yard and rspec tasks to the rakefile.
0.2.1 a - Encoding UTF-8
duplicate cancelEdit function removed.
Assertion added.
Hospital/Doctor/Patient fields are required on Case
Replace Title with ID in Client Batch Add
Better context handling
expose ar_add in Patient context
Merge branch 'health' of github.com:bikalabs/Bika-LIMS into health
new design by elizabeth
newer design by elizabeth
Divided the program into functions, fixing remaining bugs about bad working after inserting coordinates. Now the problem is that the coordinate will not be drawn and the program will exit without doing any bucle
The bug remains... Tried to use pointers to fix the problem... Still there is something wrong. Looking for a solution
Added some models for initial application state
Added filter for compiled
fixes for issues #215 #216 #204
cambios backend
adding more metadata to publishing models
Merge branch 'master' of github.com:bmaranville/pyrecs
had to fix the collector to make the test pass.

moved the subpocess to it's own function
also removed the os.access check with a try/except block
working test for the varnish collector
Merge pull request #110 from mzupan/varnish_add_test

Varnish add test
Merge remote-tracking branch 'upstream/master'
added automagic versioning
cleanup dch code
fixed dch distrubtion
close version file in setup.py
updated manifest to include version.txt
Merge pull request #160 from bcakipp/master

Automatically Set Version based on git tag information
Add in a postfix-stats collector
Doc updates
Force port to be an int
Catch an error when run before a email has been sent
Catch an error when run before a email has been sent take 2
Collect the currently configured hostname_method for stats
added user sbin directories to path
added symbolic shit
Pass next to first step of sequences in other modules
Spread improved error handling love. Fix google example
minor fixes
Merge pull request #6 from isobolev/master

minor fixes
rename project to something more sensible
Codigo de ativacao de Galerias
Fixed stream when it broke with #128
Fixed stream when it broke with #128
Change rendering of arc colors to be similar to coloring by insert_size (filtered as well).

git-svn-id: https://igv.googlecode.com/svn/trunk@2235 17392f64-ead8-4cea-ae29-09b3ab513800
Updated SeekableServiceStream to use new range servlet -- this is a backup class for when range-byte requests fail.
Enabled use of "SeekableServiceStream" for BAM files.  Allows loading of BAMs hosted at the Broad for clients who cannot do range-byte requests.
Initial changes for xome view.  Work in progress
Merge remote-tracking branch 'origin/master'
add argo
Merge branch 'master' of github.com:brobertson/Cariboo
Added local storage engine and fixed some bugs
Adding LevelGridSquare
Moving the y-value calculation out of the forloop

Only need to generate this once...
Return a Polygon object for drawing
Build array of all LevelGridSquares
Draw LevelGrid instead of old calculations
adds functional test for model ContestEntry create_recorded_scores_for_judge method
android: Don't use the default ESP proposal as it includes unsupported algorithms
android: Fixed "Configure" button in Android VPN dialog
android: Increase compile warnings
android: Added NetworkManager class which allows to retrieve a local IP address
android: Determine source address dynamically
android: Register NetworkManager as BroadcastReceiver and relay events via JNI
android: Trigger roam events in case connectivity changes
Setter for src and destination address of ipsec_sa_t added
IPsec SA manager implements update_sa()
Use pointers for lookups in IPsec SA manager
android: Support for IPsec SA update added
android: Bypass/protect previously bypassed sockets if connectivity changes
Log IP addresses for discarded inbound IPsec packets
android: Use 0.0.0.0/0 as local traffic selector

This is helpful if the responder also wants to tunnel e.g. multicast
packages.
Added a new alert that is raised if peer does not respond to initial IKE message
android: Handle unreachable peers via alert
refactored PA-TNC message handling by IMVs
no need to include pa_tnc_msg.h
Resolve hosts by DNS name in separate threads so we can cancel them

getaddrinfo(3) may block a long time so proper termination of the daemon may
block if DNS servers are not reachable.

getaddrinfo(3) is an optional cancellation point in posix threads so it
might still block a shutdown but at least on Android (with the signal based
pthread_cancel implementation) it works, on Linux starter will kill charon
anyway after a while.
android: Use keyingtries=%forever and dpd|closeaction=restart

We also ignore the CHILD_SA_DOWN event.

This should allow us to keep the connection up as long as the user does
not manually disconnect.
Readme : corrections d'orthographe et de formulations
add level default list

Signed-off-by: oohju <zhaoyujia007@gmail.com>
lyp add star
2012-07-06
TOS/PP updates to only show TOS/PP where needed.

Show the BrowserID and RP TOS/PP at the correct time with the correct text.

* BID TOS/PP is only displayed to new users.
* RP TOS/PP is only displayed to new users, or users who have not been to a site before.

Details:
* Bring over rp_info.js from another branch. Module charged with displaying RP related info.
* In authenticate, add_email, and pick_email controllers, trigger message to update "next" button text to be correct for the particular screen.
* To dom-jquery, add hide and show functions.

Call controllers that need to display the TOS/PP info with siteTOSPP parameter.  This reduces the amount of data that needs to be passed around.

issue #1240
Clean up after the rebase.
Do some resizing for when there is a photo, an RP name/logo, and a TOS/PP.
TOS/PP rebase with dev, cleanup

* Rename tosURL/privacyURL to termsOfService and privacyPolicy universally.
* Clean up styles as Skinny suggests.
* Remove dead code from pick_email.js

issue #1240
fixed variable redefinition; tidied up some syntax
Prevent the "unknown path" console message from being displayed on the "/tos", "/privacy", and "/about" pages.

issue #1518
Cleanup TOS/PP for the 90% case.

* Reduce the number of places where the TOS/PP agreements are shown.
* Commenting the holes in coverage for required_email.
Remove the extra console.log message.
remove dead, untested code - retrieveTemporaryKeypair and storeTemporaryKeypair are referenced nowhere, have no tests, and were introduced in sept 8th 2011.  they should be removed.
Merge pull request #1759 from mozilla/remove_dead_storage_functions

remove dead, untested code - retrieveTemporaryKeypair and storeTemporary...

r+ - This code hasn't been used in a long long time.  Thanks for the cleanup!
Initial steps to deprecate requiredEmail.

* include.js and dialog.js both throw a "requiredEmail has been deprecated" exception.
* remove tests for dialog.js that check requiredEmail.

issue #1760
Instead of a hard failure if requiredEmail is specified, try to log a message to the console.

issue #1760
in the communication iframe, initialize ALL local storage values immediately at startup to fix IE8 localStorage sync problems.  issue #1637
Only allow siteLogo's to be served from https RPs.

issue #1761
Merge pull request #1763 from mozilla/issue_1761_http_logo

Only allow siteLogo's to be served from https RPs.
add interaction_data to setDefaultValues() for completeness
Merge pull request #1762 from mozilla/issue1637

in the communication iframe, initialize ALL local storage values immedia...

This is a nice solution to a terrible browser bug.  r+

close #1637
Fix the flashes that occur when verifying an email address.

* Only show info once the account has been verified.
* Unify the styles for the "has this address already been registered" error.
* Remove all the dead code that was left over from issue #1000 merge.

issue #1734
Fix the failing test.
Merge pull request #1765 from mozilla/issue_1734_verification_screen_flash

Fix the flashes that occur when verifying an email address.
Fixed up static analysis warnings for javascript
Treatment Excerpt Formatting
Zrobiony loginForm
local_settings.py file added to settings.py
Add CategoryTree widget to UI
Ajout interface sextant V5
git commit 'm !!
Adjust presentation and fix bugs for first version
[#HEMERA-2859] setting version to 'fox'
Adding functionality to reorder menu items by passing an associative array of slugs. Is used after the install process.

Signed-off-by: Ben Corlett <bencorlett@me.com>
Updating models to translate tinyint values (1/0) into boolean values. This is nicer on the JSON.

Signed-off-by: Ben Corlett <bencorlett@me.com>
Merge branch 'develop' of github.com:cartalyst/platform into develop
Updating Nesty.

Signed-off-by: Ben Corlett <bencorlett@me.com>
Fixing potential bug with fetching extensions by ID.

Signed-off-by: Ben Corlett <bencorlett@me.com>
Updating Nesty.

Signed-off-by: Ben Corlett <bencorlett@me.com>
Completely refactoring the entire Menu API and fixing a plethora of bugs.

Signed-off-by: Ben Corlett <bencorlett@me.com>
Fixing a couple of bugs.

Signed-off-by: Ben Corlett <bencorlett@me.com>
Files cleaning

Removed unnecessary  spaces and unnecessary comments
Changed if(): to if(){
fixed @DYNPROXY-171

We would fail if we had a method with an argument being a generic parameter with struct constraint
DebuggerDisplay for References
Created a new click router file that takes packets from eth0 rather than an infinite source
Added paint elements to the router for marking packet priority
Quiet (benign) sigaltstack warning from valgrind
Make Verbosity header clickable
bugfix
log cost string
ABM and liquid overload skip
Increase automatic suspect guess timeframe
switch codes over to manager code, set up the database
fix prof base salary to 2009
latex changes
Merge branch 'master' of https://github.com/cgroll/dot_emacs.d
Fix zend-developer-tools package name
fixed sms support in view
Status Updates
-Status older than 30 days gets deleted, possibly make this configurable in the future
-Write some tests to make sure we're only blowing away old statuses
real name gets returned in the i2b2 PM response
Added show failed tests only filter.
30組
30組OK
little modify
Merge branch 'master' of github.com:cherrot/govProject
杨勇太笨了
fixed dir creation
[=] mardi 13 mars 2012 (o) 19:01
MB-7147 Preempt the flusher for a high priorty vb snapshot task

If a high priority vbucket snapshot task is waiting in the
dispatcher queue, we should preempt the flusher and execute the
snapshot task in order to avoid requeueing dirty items that
belong to the vbuckets that require the execution of the snapshot
task.

Change-Id: I38f3d1e6e891679e591a3e6ab595e79c5aa0b7d3
use extension globals for retriving global JMP_BUF value
Watts and amps inout for devices
Finished test for InclusiveUnaryConstraint
Add icon

first test