labofsahil/github-event-dataset-2012 huggingface dataset:
Removed .gitignore because we won't see a mixed Git/Mercurial repo in the near future and I'm trying to keep the repo clean
New battlefield.js with use of internal API system
New battlefield.js with use of internal API system
Completed layout structure.
Added loogo
Added custom stylesheet.
add some partials including footer.
Various stuff.
Added a users controller and layout link tests.
+ добавил обработку дней рождения и должностей

Signed-off-by: Sergey S. Betke <sergey.s.betke@yandex.ru>
Added screen configuration file
updated so arrows do work in insert mode
Run 10 delayed workers
Cleanup tox.ini.
Refactor single model view rendering.
Add more vim bundles and set up twilight colorscheme.
Add git bins to PATH, disable oh-my-zsh autoupdate
Added python musicplayer file, sample csv file, and created basic structure.
updated readme
Initial revision
Merge branch 'master' of github.com:shawnchan/sales-test
added DataManager test to main
addBirds function implemented
mm/99 added
Updated Shush settings
gtkwave waveform cleanup
symbolgen
Update README.md

Updated some format issue on README
first commit bruse20120927.txt
Setting up travis-ci support.
dts: Fix deteciting layout of all channels from XLL extension.
DTS importer: Fix getting the last sample delta.
Update xbmc-get-orig-source script.
Have script optionally remove components not needed for Linux and components
which can be provided as a system library.
Add libtinyxml-dev to build depends.
Minimize last entry of changelog and update for upload to Debian.
Add basic options to pass to dpkg-source.
Place patches used for Debian packaging in debian directory.
These patches are applied directly to orig source rather than at
build time.
Add modifications to strip down orig source even further.
Fixup issue with script not deleting binary files.
Update changelog to uploaded version of Debian package.
Change way packages are generated.
Packages upload to the distros need different configurations then packages
uploaded to the PPA.
No longer need lsb-release as a build depends, so drop it.
Disable afp support as XBMC cannot use latest afp library.
Update changelog.
Remove linking of afpclient.
Disable crystalhd on all platforms except i386 and amd64.
Disable building of xbmc for architectures other than amd64 and i386.
Reenable powerpc, ppc64, and armel. (Closes: #668316)
Prepare for new upload.
Enable building on armhf.
Fixup generation of source packages.
Don't track debian/{control,rules}. They are autogenerated per source package.
create a gem for motion-hpple
rename folders
correct path to static library
update README on usage with gem
Draw shadow with lines
tmpl family iteration fix
new bookmarklet for viewing formatted source
Merge branch 'master' of github.com:skratchdot/domFormat

Conflicts:
	README.md
removed rtems - didnt provide insight into POSIX
Templated views.
page 320
Merge pull request #20 from slavcopost/master

fix container width when scroll hide
removed extra closing div
Merge pull request #22 from slavcopost/master

reset last commit
Fix bug (mention of Caltech) in license.
renamed READEMD.md
nytt
ny
ny
Tweaks, method changes.
Initial commit
added manifest
added the icon
moving the plugin code into src/chrome
renamed the manifest file
added popus and content scripts
message passing may be the only solution
saving wokr
added content security
fixed the security issue. figuring out the messaging part
fixed
fixed conflict
added flatpage stores.
[fix|views]cancel button on student address modal
[views|notes]show template added
[fix] primary button disapear after student address edit
Merge branch 'master' of https://github.com/martakostova/GAKUEngine
Merge remote-tracking branch 'tapalilov/master'
small follow up to refactoring
clarify skill choices
rewrite test with mocha, cache commits and showRefs with filters
mv to test
update to forge-parent 18, which includes updates for most plugins in pluginManagement
Refactor parameters method in SchemaValidationTestCase.
error in earlier coomit has been fixed
CC-3791: Media Monitor crash when there are media files with non-ascii name in watched folder

-indent error
-fix silly mistake after refactoring

again
- fixed formatting
CC-4640: Automatically jump to current song when loading the Now Playing page.

-done
second attempt at travis config
guest_delete feature implemented
Merge branch 'develop'
remove destroy command (implemented in delete)
Revert "socket programs"

This reverts commit daea6673a2fd2202c37ad577a7ccfbd802c08447.
do not use at the moment
Added a little color and formatting to QuestionAnswer

	modified:   QuestionAnswer.sty
Making pdf now depends on styles

	modified:   Makefile
beginning of sidepanel layout
Changed BASE_PATH for project page
Rename MaxValue to MaxTermValue
Merge pull request #4 from stefan-t-pls/master

na gut, weil heute Freitag is oder so
Add spaces in config.yml file
Correct varible name in single model search
Merge
Add a full_title helper
Add a full_title helper 2
Finish layout and routes
Adding Tag package
Fixes to SAXS15 converter.
now tracking progress using file name progress_report.txt
update on the 10/14/2012
removed not necessary code
Remove try-catch sentence
Octopress init
Site updated at 2012-07-31 05:15:10 UTC
Site updated at 2012-07-31 05:26:02 UTC
No strong, no empty rows
show forms
pending users sidebar link
Dynamic sidebar
Merge branch 'deployment' into matching
bump devise, remove deprecated options
entry for test env in Facebook oauth config
Merge branch 'matching' into deployment
Upgrade to asynchbase 1.3.2.

Change-Id: I2c677fbb7a4da2c9d129c9ee56082a05c5088cb9
Upgrade to Netty 3.5.2.

Change-Id: I2723644bd9193aac6430445744ed78e4da773e0a
Function to process checkboxes
Adding Business Layer
6.4 修改提交
6.4 修改提交
upgrade socket.io to 9.10
discovered bug in accmBodyLocal
merged: still bug in accmBodyLocally
Fix small status comparison bug.
changed the matter date to use jquery datepicker
profile changes.
Merge branch 'gary'
Created intro text of the Twig Reference
Added functions section
Added filter section
Created tags section
Added 'almost core' bundles
Added missing dot in property path assembly.
Adding link to how to render templates
Adding link to @ParamConverter
Changed uses of we in security cookbooks
Removed space around dot operator.
[Book/installation] Fixed "image file not readable" warning
Added clarification on routes ending in optional params
Fixing indentation
Adding double backticks around blog for formatting
[#1873] Making note about optional paramters slightly shorter
Merge pull request #1885 from dreipunktnull/fix_missing_dot_in_property_path

Added missing dot in property path assembly.
Merge pull request #1888 from richardmiller/adding_link_to_rendering_templates

Adding link to how to render templates
[#1888] Slight tweak
Merge pull request #1889 from richardmiller/adding_paramconverter_link

Adding link to @ParamConverter
[#1889] Tweaking language, formatting
the values in the listboxes start at 0, not at 1
Merge pull request #1419 from Burgov/datetime-options

the values in the time listboxes start at 0, not at 1
delete slim convert
GS105 has no end cmd
adapter json, relation links to resources.
q2.43. review
Изменены подчеркивания в ссылках. У кнопки Why? убрана обводка. Добавлен светло-серый фон (#ECECEC). Увеличено расстояние между меню и слайдером.
局部调整

* 编写README，同时试验安装过程
* 补充遗漏的配置信息
* 删除多余的文件
translate ngx_http_mp4_module
Update xml/cn/docs/http/ngx_http_mp4_module.xml

update
Update xml/cn/docs/http/ngx_http_mp4_module.xml

修改标点符号
Update xml/cn/docs/http/ngx_http_mp4_module.xml
Merge pull request #29 from jazeltq/master

translated the ngx_http_mp4_module
InfoBarGenerics: function naming cosmetics

zapToNumber did not actually zap to a number,
rename the function to 'zapToService' and
create a new 'zapToNumber' which actually zaps
to a number.

Also, cleanup some double negative logic
Merge remote-tracking branch 'openpli/master' into last
test show icons on spark7162
Merge branch 'testing' of github.com:technic/amiko-e2-pli into testing
fix lv.po
Honor HEROKU_HOST.
Support multiple keys in AUTHORIZED_KEYS.
Le module Base devient Core
script find and prints the PID of the provided app
separation of code and brushing up
removed printing of server ping rather floody in console
Update api_grubhub/tf.grubhub.php

Update GH id's
Update schema2ldif
regenerated ldif schemas
Merge pull request #1 from ptomulik/master

Eliminated empty lines from output
Merge pull request #877 from thiagofm/master

History.txt for the new gem release
We have a breaking change, so bumping to 0.7.0
Bump version to 0.7.0
added an override to allow fog configuration per uploader

Added an override to allow to configure the uploader specific
configurations, e.g. S3 bucket or S3 account per uploader instance in
addition to the general configuration from the initializers
Let's get Travis happy again
Fixed grammatical error in README.
Merge pull request #883 from ryanricard/master

Grammatical fix to README
Merge pull request #878 from dei79/per-uploader-config-squashed

added an override to allow fog configuration per uploader
Update README.md

Minor updates to the README:
- MiniMagick's repository has been moved to minimagic/minimagick
- Active Record Validations weren't properly handling the apostrophe in couldn't
Merge pull request #890 from mattmenefee/master

Slight updates to the README
Revert "changed after_destroy with after_commit ... :on => :destroy"

This reverts commit 5e28cca309789497d1ed78741960b5cec960ee1c.
New gem release for a bug fix
Add alias to start/replace gitk and git gui

Other instances of "wish" are killed beforehand, so there'll be only one
instance of git gui and gitk respectively on the git workspace.
Make zshrc smarter about Mac OS X
Start cleaning up the puppet module
Specify 'location' hardware requirement for Google Play
Replace hard-coded entry number limit by variable
Source code cosmetics
Add another bug
First attempt to handle multiple parameters organised in structure. Wrapper method re-engineered, because of special needs for attach/detach threads.  So far it works just with one parameter.
StringUtils class is ok
[#26] Added "Mocks Aren't Stubs"
Make splice(2) non-blocking; also catch EINTR

Signed-off-by: Austin Seipp <mad.one@gmail.com>
Switch back to portable implementation by default

It has better performance right now.

Signed-off-by: Austin Seipp <mad.one@gmail.com>
Shufflebutton added.
- lfs_button.jpg (First try, can be better)
- #shufflebutton implemetet, on hover
- index html - not ready yet need a link as trigger for the button!
Shufflebutton now works properly.
Merge branch 'shufflebutton'
Download plugins from dev.bukkit.org instead of plugins.crafter.fr
12-11-2012 2:17 PM
Added package.json for mexec; Added routes file for access to users
Merge branch 'dev' of github.com:timdrichards/streams into dev
api: Migrating views for user creating and database drop to CBV
Merge branch 'master' of github.com:timeredbull/mysqlapi
api: using app object to get configs
removed unused env vars and updating readme
removed access and secret keys from schema.sql
removing user and bucket creation from api

Now, swiftapi has only the responsibility of returning swift's endpoint
url
returning swift host on bind action
Completely reworked HTML, CSS.  Minor updates to JS.  Added 'ribbon' image for CTA.
Changes to LVG homepage
use nameplate name for adding points
Added comments to the home class
setting up database interface with heroku
fixed bugs, and spacing.
model stores packets instead of payload bytes
Merge branch 'master' into experiment
buffers packets instead of payload bytes, view handles creating of images from bytes
cleaning up dependency handling
Still finishing up
refactoring continued
fixed quick error
refactored toggle
fixed mass's checkstyle
Signed-off-by: Rex Ying <zy26@duke.edu>
Merge branch 'master' of https://github.com/tonyyan518/Springies into 1

Conflicts:
	bin/Main.class
	bin/data/environment.xsp
	bin/environment/CenterMass.class
	bin/environment/GlobalForce.class
	bin/environment/Gravity.class
	bin/environment/Viscosity.class
	bin/environment/WallRepulsion.class
	bin/physicalObject/Bar.class
	bin/physicalObject/FixedMass.class
	bin/physicalObject/Mass.class
	bin/physicalObject/Muscle.class
	bin/physicalObject/PhysicalObject.class
	bin/physicalObject/Spring.class
	bin/simulator/Canvas$1.class
	bin/simulator/Canvas$2.class
	bin/simulator/Canvas$3.class
	bin/simulator/Canvas$4.class
	bin/simulator/Canvas.class
	bin/simulator/Factory.class
	bin/simulator/Simulation.class
	bin/simulator/Vector.class
	src/physicalObject/Mass.java
	src/simulator/Canvas.java
	src/simulator/Simulation.java
Final Revision
Adding in roboguice.
dhgakfdsa
Export finished.
Add documentation to /repos

This documents what @drogus mentioned here:
https://github.com/travis-ci/travis-ci/issues/503#issuecomment-10447864
Merge pull request #20 from henrikhodne/add-documentation-to-repos

Add documentation to /repos
Fixed I18n handlebars helpers to update when locale changes

Via the console, you can Travis.set('locale', 'ja') and all the labels
will properly update. This should work on User#updateLocale as well but
I am having a devil of a time testing it locally as I cannot sign in.
Fixed User#update_locale to call Travis#updateLocale on locale change
Completed dynamic I18n intetegration.

travis-web starts in English. When the user logs in, it switches to
their locale, when they logout, it goes back to english.
Removed unsupported locales from profile.

This should be written to populate from the I18n.translations hash but
for now, I am just getting rid of the ones that do not exist.
Updated profile view to support auto-updating locale selection
Connected flash outlet for profile
updated links to GitHub hooks
Merge pull request #78 from randym/i18n

Updates and Fixes for Profile and UI to properly handle locale switching
Merge pull request #79 from mrshu/master

Updated links to GitHub hooks page
Update locales
issue events on user:signed_in and user:synced
Merge branch 'master' of github.com:travis-ci/travis-web
initial rem commit
added week 1 ex 3
Update data naming for autocomplete. Backwards compatible for overrides of _renderItem.  Partial fix for #7810
Accordion: Removed mouseover demo. We shouldn't demo bad UX choices.
Datepicker: Fix a bad assertion - actual result is valid.
Update to QUnit 1.3. Replace usage of same with deepEqual and equals with equal.
Update QUnit to latest, reverting the bad reset 'patch'
Tests: Cleaned up simulate. Still more work to do.
Update data naming for Accordion. Partial fix for #7810
Slider: Whitespace cleanup
Update data naming for Slider. Partial fix for #7810
Tabs: Whitespace cleanup
Update data naming for Tabs. Partial fix for #7810
Update data naming for Tooltip. Partial fix for #7810
Merge branch 'master' into data-naming
Update data naming for Effects. Partial fix for #7810
Update data naming for Widget, including backwards compability. Updated tests and added one for the custom expression. Partial fix for #7810
Widget: Rename widgetBaseClass to widgetFullName. Deprecates widgetBaseClass, to be removed later. Fixes #8154
Autocomplete: Add removal TODOs for #7810
Update Widget data naming/usage. Remove unnecessary fallbacks, update .removeData to use full name.
Remove both widgetName and widgetFullName data
Merge branch 'data-naming'
remove 'config' from component base. closes #48
Initial pass at custom shell.
Initial use of wrappers for geometries.
Geometry base class and coordinates array.
Set up prototype chain.
Unsandboxing require.
Additional geometry methods.
Linestring constructor.
Wrapper methods.
Testing the wrap factory.
Always get parent scope.
Add config property.
Polygon constructor.
Initial collection handling.
Avoiding unwanted unwrap.
Allow for multiple inheritance.
Multipart geoms.
Allow setting module path.
Longer name for collection.
Adding json getter.
Use sandboxed modules again.
TestEight without method
bugfix (reverse-merged from commit 1ffb867fc32cdfecd03389e19d14de2e324174da)
update logs for: 2012-04-07
Minor fix to all pets
asked #travis to --enable-calendar (antares_ will test and enable if it works)
2dbuffer fix
FC
Merge branch 'master' into gh-pages
Automatically updated index.html and feed.rss
add basic source tree
Merge remote-tracking branch 'origin/Football-StarterKit-stable1'
Elastic Transition example
transition end has been fixed
Football StarterKit readme has been added
snap to angle has been added to Elastic Transition example
Merge remote-tracking branch 'origin/master' into Football-StarterKit-stable1
opauth/opauth as dependency
Fixed: zero quality scores in ViewSam2 and SliceView (appeared only for
reads with no read features)
Fixed: "No real operator (M|I|D|N) in CIGAR" in restored BAMs
Fixed: read groups missing from header
#1 Update for Ubuntu
first release
First release
Updated Traces tab to auto scroll down when user is already scrolled down
Merge pull request #71 from LordQuackstar/GUImaster

Allow GUI Traces to Autoscroll when at bottom
Update CHANGELOG
tidy CHANGELOG
s/AC3/AC-3/g
s/H264/H.264/g
fix failing tests
mencoder: use -mc 0 for LPCM remuxing
mencoder: disable DTS and LPCM remuxing if tsmuxer engine is unavailable
Merge remote-tracking branch 'upstream/master' into cling-synchro
Optimized contacts
Update PATH
Fixing vcsh mr lib (GIT_PROTOCOL)
Specifying controller actions for default controller is made possible to ease our permission definitons.
Change default Lucene search to return most recent docments matching query
Refactored importxls, exportcsv and truncate actions
User creation

Creating User in Table and as Database Login
converting to a class :)
Forking almost done (not tested)
No longer crapping on the global Ruby namespace. Chromedriver log file gitignored (not sure how to redirect it to the right spot). Start now accepts -d option rather than automatically daemonizing. Using daemons to build out the log file rather than writing it by hand.
add a new Init to class ParticleSystem
Cadastro de Preferências - Referência - bd

salvando no bd as preferencias de funcionarios com referencia
Added the SWT label
using parameters in commands
[fix] Lint all the files.
I don't know why but noone noticed that nothing was linted anymore.
This commit fixes the jshint task to lint again.
[lint] Make jshint happy.
Merge pull request #223 from Dignifiedquire/fix-jshint

[fix] Lint all the files.
reg + bd
Added read-vlos-eventlog
added longer description
Add power saving state DEEP IDLE version 2.

Conflicts:

	drivers/misc/Makefile
Describe recollection.utils app in ecosystem document.
mapping building and runtime
Pause and clear roxie queue and hthor queue

This fix adds a drop down menu with several queue management
functions for roxie and hthor queue. I also cleaned the
index.xslt.

Signed-off-by: Kevin Wang <kevin.wang@lexisnexis.com>
""
Merge branch 'master' of github.com:wastedearth/dotfiles
""
Merge branch 'master' of github.com:wastedearth/dotfiles
added tags in formview using tag-it
fix in backups
Merge branch 'shf_rename' of github.com:webnotes/wnframework into shf_rename
adjusted some dimension dependent settings in annotation view
Adding textsplit.lua
第三章补充完整
roughly finish login and register
changed bust for releases
changed back to jstl from freemarker
visitors sign in
user publishes a new topic
Add snappy compression into WiredTiger mapkeeper implementation.
Update Makefile to support newer version of boost.
Setting proper permissions in disk scripts
Remove old NCAR login name
Remove busted 'deflogin' command on Mac platforms
New font in Emacs
properly handle amperstands when HTML escaping

escapeExpression, when given a string like "&gt;", was simply returning
"&gt;", not escaping the amperstand. This is incorrect, and makes it
impossible to have Handlebars properly escape a
string like "Escaped, <b> looks like: &lt;b&gt;"

If the intention of the user is to not escape these characters, then
{{{}}} or {{&}} should be used
Merge pull request #198 from codekitchen/master

properly handle ampersands when HTML escaping
modified first post
	modified:   _posts/2012-03-12-hello-world.md
add composer.json
ignore vendor directory
ignore *.lock file
Merge pull request #1 from xcezx/feature-composer

Feature composer
[xianjing] refact
park failed if no available slots
unpark failed
parking
basic parking requirement
typo + iter workarround + tests

bad practice : there where no tests for the issue
fixe typo
hack on a workarroud for iter( ) way : very slow but working
Most recent versions. My hd/partitions are getting shaky.
Compresses size of skinned TF2 models.
Added social network buttons (as far as possible with XHTML).
logy s timestamp
added session class; added tests; removed unused files
XWIKI-6804: Alternative to sendMessageFromTemplate that receives a map of parameters instead of a VelocityContext
* Add clirr exclude because the method was included in 4.2 and the platform build is failing for a too long time..
Updates to POCO classes to support Code First modeling

Completed restructuring and testing of polling processes
Fixed stats view.
Google C++ Coding Style
love
Merge pull request #4 from yandongCoder2/master

get it
add err-page.t
add expires.t
add bypass.t
add the directive of 'tcache_no_cache'
add bypass.t
add gzip.t
add methods.t
add static.t
Additional fix for (BNC #765445)

- No error reported to stdout even while writing /etc/named.conf without having
  bind package installed.
Merge pull request #9 from kobliha/master

Additional-fix-for-BNC-765445
Yay testing.
Update to Scintilla-3.2.3 from HG 4309:85ed8066ea9c
Update Service/FacebookService.php

Replace _constructa by __construct
add a trajectory data in data/
metapost for better rendering
Add inSortedOrder
Added blueprint css
Removed default rails page, added routes
Finished layout and routes
api_wrapper_16
Initial hebrew stuff

body { direction: rtl; }
Naive date format
Some basic string translations
Fixed missing ncurses dependency on vim
setting build number as the key instead of the date
Updated filter coeff display and made poles stable for FIR design
add, composition
missing gui.css
[Fix] outputter/buff/into, winnr() is not pointed to the source buffer when split
functionality for adding multiple links to new download added
Adminfelület létrehozva.
rollback, plugin._handles already support destructor
增加mtp及.gitignore
Basic framework. No whitelist manipulation yet.
Core: --list-plugins option.
Core: added --safe-mode switch.
Ajout tests
modif memoire
Correction suite
Correction suite 2
Test updated
patch addrinfo
sup malloc ip
supp fichier compil
Correction response_key
Correction strdup
huge bug on adress ..
Merge pull request #7 from rapidoo/master

mem leak fix
Correction division puissance
edit epub file name
Removed bug with protyping classes
added hiros links
Creating JCrossWay by pressing on tool bar button has been implemented
Auto position has been implemented to JCrossWayCreateDialog. JCrossWayCreateDialog has been aligned.
Auto position has been implemented to JCrossWayDialog.
Bug with  attaching road end and road start to same crossWay has been fixed
Fixing pawn issue, couldn't find the correct board
Making the pieces on the board more visible
Unit tests for the game class
Some (broken) Game unit tests
Runnning app
make autopanning work better
Requirements detailed
Default args!
Nearly finished routing... committing before I lose it all.
Begin frame Design.

Signed-off-by: Julien <Julien@Guylene-PC.home>
Made citation generators use getField methods
Merge branch 'master' of github.com:ArghyV/Paistettu-kana
delete citations.ser after integration tests
Merge branch 'delseraftertests'
First changes for new spline system
Fix multi-folder part.I
Removed toArray in OneToMany getters
Reduce logging noise
Improve MeteorService annotation allowing definition of AtmosphereInterceptor
Re-add the proper accessor
rename run to build-patch.sh, and update script
JSON-database added, Logging questions to console
Commands is now called Questions
Question and Unanswered-databases added
Notes (NOT WORKING-ONLY NOTES) added for papersize and anagrams exersice
1.0.4 版本

修改文档change log
1.0.4 版本

修改nodejs版本，支持载入一个页面作为模板
Merge pull request #15 from wangxiao/master

修改nodejs版本
fixed an error with redirection to prescription.new
Merge branch 'master' of https://github.com/BaobabHealthTrust/OPD
simplistic use of goto overlay instead of opening file by absolute path
Now does a nil check prior to merging
Offline capability extended.
Updated BG color on header
updated the documentation for ip,phone,and address
moved highlighting hyperlinks to the right place in prefs (general)
some NSTextView related code for enabling / disabling automatic link detection

If the user turned off highlighting of hyperlinks, NSTextView should of
course NOT detect and mark hyperlinks entered by the user. The enable /
disable hyperlinks code should be pretty complete and flawless with
this addition.
Add vip info.php
Added a tempalte for league statistics.
Updated main with mocking information for the new template.
Final Commit

Finishing up the details.
Agregada una carpeta dev para hacer pruebas mas tranquilo :)
product visiblility added
image changed to jpeg
Workspace CodeBlocks

Project voor windows (codeblocks)
CS-15646: HA takes long time to migrate VMs to another KVM host if there are multiple storage pools.
Getting rid of the sleep, wait suring HA. This is a similar behavior to Xenserver. Changes by Edison.

Reviewed-By: Devdeep
CS-15311: cloudstack 3.0 UI - Add Zone Wizard - add physical network step - no isolation method dropdown if network type is Basic.
bug 14447: Fix incorrect label on select network offering of VM wizard
CS-15388: Fix labels

Labels for CPU/Mem (as found in compute offering window) are missing
the required values for CPU and RAM

Original patch by: Pranav Saxena <pranav.saxena@citrix.com>
reviewed-by: Brian Federle <brian.federle@citrix.com>
Github shows commented out markdown. :(
Merge pull request #44 from CodeandoMexico/ui-landing

Adds header to app.
Merge with functional comments, and some JS interactions on that

Conflicts:

	app/views/projects/show.html.erb
update user skills from github
get avatar from github
Merge pull request #46 from CodeandoMexico/github_info

Github info. Just pending a small detail about a nil skill.
Fix for assets/compas on Heroku
View and redirect to sign up path

Conflicts:
	app/controllers/authentications_controller.rb
	app/helpers/projects_helper.rb
Merge pull request #49 from CodeandoMexico/view_login

View and redirect to sign up path
Adds home banner
the camera overlay now shows the last taken image in the album on start
Updated rudi with score and fixed shooting issue
added: pages tree including reordering
added: option to disable commenting
added: notification on page edit to the owner if a non onwer edits the
page
child browser working
remove app-old
streamline login and direct to home
browser login working
Fix task sort drop down
Merge branch 'master' of https://github.com/CruGlobal/mpdx-mobile
Removed employeemodel.js
Merge branch 'master' of https://github.com/CruGlobal/mpdx-mobile
add config file
tasks sync active
contact read started
add fall back error function
sync order done
Added version to argumentparser and updated the options
Use SNAPSHOTs of Cyborg
Fixed issues of foreign key mapping on journal
Add unload method in order to clear cache
Start adding queries for specific events
Grobkonzept - Work in Progress
update to 29.2
แก้ๆเยอะๆ
multithreading with progress bar big fixes
show filename when only one buffer is opened
Add more (untested) rolls
Added more images for animation on daredevil
matrix with tension algorithm
Chg: Min Java
travis now compile
solved conflict with timo
conflict with somebody funny fixed
Beastiary renamed to "Actor Editor"

Beastiary is down the line a bit.
use bitmaps for tiles; basic synchronization (should be revisited)
trees: old solution + tests by structure all OK
Modified DrawRepeatingImage to use already existing images instead of a new image to increase speed.
Fix multiple menu issues
Ettrion Island001 heightmap v3

As Title.
Wired ReadAllEventsBackward into the StorageReader.
Multi-stream support components integrated.  (first fromStreams([]) projection running)
Merge branch 'dev' of github.com:EventStore/EventStore into dev
Merge branch 'dev' of github.com:EventStore/EventStore into dev
massdownloader v1.0
Merge branch 'master' of github.com:Evilcry/PythonScripts
Edit e Delet
Added some basic MVC plumbing classes.
Added requirements installer
FS-4128
sometimes compiler warnings are annoying
tcp too yo
FS-4453 --resolve this will now cause up to a 20 second timeout waiting for the response and the call will be blocking
vs2010 reswig
fix build
fix my contact info as i havent had that email address in years
Copyright date update.
gsmopen: gsmlib compile on windows, made a solution (vc++ makefile) for it
FS-4122 --resolve this fixes the issue and eliminates the delay unless you configure it to have some
Rollinball, Flag
Merge branch 'master' of https://github.com/Frotty/InWcSchneeball
KillStreaks & Deaths
fixed: headertext 不是 programming in lisp
Caching Game State 2 to reduce cpu usage
11章 p53 [green] testFrancMultiplication()の削除
Add :insert_defaults option to insert default values into data when specified in the schema
Add AIF pxe type - refs #1620
Fix class to input parameter naming

Patch from ohadlevy

Signed-off-by: Olivier Favre <olivier@yakaz.com>
fixes #1645 - Show host's MAC address in host details

Signed-off-by: Florian Koch <florian.koch1981@googlemail.com>
Fix privacy leaks in stats, facts, and dashboard - Refs #1582
Refactor my_hosts and my_facts scopes to include auth checks
[composer.json] Fixing homepage
- ResearchPhase TeXlipse project
+ ResearchPhase .pdf, .tex's and pictures
!* fresh start
! Clean up + twitter lib
+ twitter stub
DataMatrix now works
Add head() and tail() for DataVec's
Calculate the SVD of a DataMatrix using imputation
Demo of DataMatrix SVD usage
update dependencies in POM
Split keys between Characters and System.
Updates to relevant documentation for the latest release. fieldset is no longer included as a section by default.
App A looking pretty stylish
CTA and logos added
tests: fixed one of the seg faults in tests (caused by pygame)
app: improved splash screen but breaks unit tests
app: trying to add a showSplash=True arg to app to get around test crashes

but it still doesn't seem to help!!
DOCS: added info about non-slip timing and updated various
TESTS: fix to find the input files for testing compatibility
BF: app now stops checking for updates after one attempt fixes #138

also attemped to fix #37 (disable auto-update for linux) but needs testing
BF: Fixed linux warn-only update checking ( #37 )
ENH: attempting to bring back 'feature-splashScreen' (now not using nosetest)

Conflicts:
	psychopy/app/psychopyApp.py

	psychopy/tests/test_app/__init__.py
ENH: fix to AdvancedSplashscreen for debug=true and for intervening dialogs
BF: psychopy.gamma.getGammaRamp() under linux is now scaled 0:1 as in the documentation

Window.close() is now reverting gamma to orig value (we should really do this on __del__() )
tests do now call win.close() so that gamma isn't left in weird state
BF: clash between new splashscreen and compatibility msg on winXP
Merge pull request #156 from RSharman/master

BF: clash between new splashscreen and compatibility msg on winXP
ENH: expName should be set from the filename in builder but also manually from settings
ENH: added facility to show readme files on loading builder experiments
BF: synthesized sounds were not being created with a duration in Builder scripts
BF: settings - save log file; handle no save file; closes #150
BF: self.params['interpolate'] --> add .val
Merge remote-tracking branch 'jeremy/master'
BF: fixed error new non-slip timing. Closes #159

was calling routineClock instead of routineTimer
ENH: TrialHandlers now automatically include an 'order' datatype to track order of presentations

https://groups.google.com/d/topic/psychopy-users/tlxJ_djCDeI/discussion
Coding convention - work in progress
added bootstrap css to index home page
Ajout de fonction d'initialisation de chargement avec Dico pour la classe Programme et Evenement
Added new getTiddlerList() method to wiki
Simplify unhyphenating CSS properties
Start updating the browser prefix stuff

The old way led to code that was too long and unreadable.
Smooth scrolling for the sideways storyview
Everything is working as it should
Set up condition selector to automatically set values based on an existing event if one is passed via intent.
Mise en place des cameras pour le terrain
Move over alphas updates to 1.3jemp2. Confirmed stable.
Mainly snippet updates.
Snippets now shows any errors that are present rather than saying they aren't valid.
Snippets can now have variables stored in an ini file that will be automatically loaded before the snippet's index.php file is executed.
The Logo snippet has been updated to have settings for showing an image, some text, both or neither.
The Yetii class now checks if the current version is less than the remote version, not not equal.
Add some faq.
Update GitHub Oauth token for dev
Add useful gems
Font Awesome 404

Fixed font awesome paths from /font to /assets for framework. Removed
the word Penguin. from the home page.
Arranged files
Updated Readme
Merge branch 'release/0.5.0' into develop
Added new application and initial test designed to reproduce the issue.
Make sure that spaces and tabs aren't mixed for indentation.
Be stricter about the way we assign models to an application.
Add slumber_ex_shop to the list of packages to install.
Try to be much stricter about which applications get which models. This fixes
a problem where models were associated with applications that made use of
them, rather than just the one that defined them.
Merge branch 'feature/issue-2' into develop
Bumped version number.
Merge branch 'release/0.5.1'
Merge branch 'release/0.5.1' into develop
Fixed a problem where forwarded authentication could lead to an infinite
recursion error.
Bumped version number.
Merge branch 'release/0.5.2'
Gemfile.lock needed in git heroku
adding rspec tests. the object cache is working
updated, added beginnings of flame tower
リストのルーティングを定義
Stripped everything but the workflow creator out of the block editor when the user has no workflows.
fixed a bug whereby the evaluator allowed users to access and evaluate all variables in existence, not just those for the current model.
Merge branch 'master' of github.com:Kurt-von-Laven/lembic
working on formatting workflows
Merge branch 'master' of github.com:Kurt-von-Laven/lembic
workflow formatting mostly there
add the customer and supplier manager function
refactoring LTouchPad
modify directory structure
add LController(Android)
Add Google C++ Style Guide vim config.
Setup indentation scripts.
Dev Changing controller URLs to allow for IIS compatibility
Merge remote-tracking branch 'origin/master'
Fixed issue #6071: Notices if using mssql and changing/importing survey
Dev: Review url parameters for language in survey listing
Dev: 934754b8b0f2fecc34079ac746f7f9be30188c3b children
Fixed Issue : Remotecontrol errors in export_statistics
Dev: Fixed corrupted file name in generate_statistics
Dev: Sorted statistics questions output in remotecontrol
Dev: Fixed question categories that did not produce proper stats
Dev: Converted sql queries to Yii cdb in remotecontrol export_statistics
Merge pull request #58 from trougakoss/Yii

Fixed issue: Remotecontrol errors in export_statistics
The address field value was still being set when leaving the advanced search. I ad to add a test to see if the view was hidden before setting the address.
Added an empty md file for the first report
Cleanup the KeyCodes file
Add basic plane to loading screen

- Added a basic plane to the loading screen with a rocky texture
Add Level.js

Level.js, a basic level definition.
fix: moved stream reading into constructor
no redirect to list on put request
fixed artifact by interpolating fog with sky; renamed some variables in sky.hlsl
Add switch to select gpu
Implemented window resize functionality as described in #30.
Merge pull request #64 from akoeplinger/feature-resize-on-all-window-borders-final

Implemented window resize functionality as described in #30.
Using PlayerLoginEvent instead of PlayerPreLoginEvent to fix a warning.
preparation for the showing of selected (in the left tree) pages
Merge branch 'master' of github.com:moravianlibrary/MEditor into development
Merge branch 'master' of github.com:moravianlibrary/MEditor into development

Conflicts:
	editor-creation/src/main/java/cz/mzk/editor/client/presenter/CreateStructurePresenter.java
Merge branch 'master' of github.com:moravianlibrary/MEditor into development
showing of selected tree-structure-pages is working now
updating and redo/undo is working
synchronizing of a selection, refactoring
deleting is working
refactoring, store/load is working, bug fixed
i18n, bug fixed
v1.2 - Efficiency update, uses less system resources
Revert "decrease heap size" to resolve out of memory fc

This reverts commit 77158c7a867f70f8e52f806e2d6055a6a20f1fc5.
use stock PhoneInterfaceManager.smali

Change-Id: I4147f1e38aeeca72a5efc5ef658178889ae72ed7
20120925

Ported ball class (C_Ball) from previous version.  Application is now in
landscape orientation and has functional ball logic.
Modify starter scripts
change
change
change
change
Merge branch 'master' of https://github.com/MinskLab2012/Module-6
solution sketch was edited
CSV parser and test for taxonomy data importing works with this new
parser. Also abstract classes for parser and inserter implementations
Resolved MGCP stack issue.It reused same buffer for all messages
Separated Reading from wire and mgcp parsing for mgcp client
added configuration option to set number of threads for parsing messages
Updated thread sleep time for reading thread in mgcp client
Optimized mgcp parsing
resolved mgcp parsing errors
prepared 3.0.0.FINAL Release
Einfach mal so
Korjauksia ja uusi filu yhteys.php
Updated logic to detect multisite.
Detailanpassungen in Controlausrichtung
Background threading support
remove extra logging
Copyright tweaks
Added background task support
Merge pull request #3 from RallyUp/master

Background thread support for URLRequest & response processing, integrated UIBackgroundTask support as well.
applied setTimeout fix to signalR problem;
sripts and lambdas are loaded separately, templates are inline
Trying to get rid of ~ files..
worked on job management
Version 0.3.0

- Another code refactoring
- Added CpuPei module patching for old BIOSes
Version 5.2.4.18
commenting system now writes comments, displaying them is another story
Renamed old prototype spec test and started getting it running
added 'organizations' property
Now displays list of organizations that the user is a member of
Added a comment to follow up on scary feature
Corrected misspelling
Now has SortedArrayProxy in ember.js framework from oldfartdevelop/ember.js project
Now uses SortedArrayProxy instead of ArrayProxy so as to hide the sorting methods that were in TermsController
Merge pull request #33 from oldfartdeveloper/sortedarray

Moved sorting functionality out of YJ.termsController into Em.SortedArrayProxy
Compiled production assets.  Added gems for heroku deployment.
Merge branch 'develop' into authentication
ghostscript : bump version to 9.06, add patches from ubuntu
cups : add upstream patches
add new package : epson-inkjet-printer-escpr
add new package : nss-mdns
busybox : add lpadmin & netdev to /etc/group
cups : update build & install scripts
ijs, poppler, qpdf : fix PKG_SECTION
refresh defconfigs
Fixing bug in equals
[PLAT-2615] Recognise the housekeeping operation
[FRJ-122] FudgeMsg is not serializable. Serialize to/from byte[] using the associated context before passing to Java serialization.
Better JMX instrumentation for record chunkers.
Fixed BloombergDataUtils (numerous bugs) and wrote test.
GS-10226
Add few more dependencies to pom.xml

git-svn-id: svn://pc-lab14/SVN/xap/trunk/openspaces@118385 eb64e737-3616-4df0-8941-5ee2ae88103d
Added link to list of feature descriptions
improved parsing youtube url
formdata instead of formelement object
added full youtube url feature (creating video , templating video)
File utility

I've added a little piece of code that help located program ressources.
Added option to create directory on directory upload
Adding previews to intents debugger
Make the Share extension support the latest version of the data payload
Fixing Makefile to build share extension
Making twitter work with the new best practices for share
Fixing the issue with sharing not working
better regex
raise not found if cannot decode the key
Oprava zoomovacího tlačítka
OpenLayers 2.12
Merge branch 'master' of https://github.com/RHoK-November-2012/zelenamapa
Adding the PEG and PEGGED grammars as examples.
Checkpoint commit for showing "explore" section in the menu
Merge branch 'develop' into org_project_cms_integration
Merge branch 'develop' into org_project_cms_integration

Conflicts:
	templates/base.html
s/Explore the Atlas/Explore/gc
Added skeleton for organization and project list views.
Reverse organization and project reverse view urls instead of
hard-coding them.
Only highlight top-level selected navigation items.
Highlight top-level tab if child is selected.
Add projects and organizations to menu
Added blocks for multiple columns to base template and for region above
columns (useful for breadcrumbs).
Skeleton for organizations list template
Style navigation submenu
Make left/right margins consistent for top-level content.
Styled subnavigation menu
Checkpoint commit for organization/project browsing pages
Factored common layout into a 2-column base template.
Use two-column layout for project listing
Use two-column layout for organization detail.
Use two column template for project detail.
Added background color to subnav child elements
Use trailing_slash() when defining StoryResource URLs
Merge branch 'hotfix-issue_215' into develop
Lookup section thumbnail views by section cid

Closes #210

Section thumbnails weren't being stored in this._thumbnailViews when
the section was copied from the template.  That's because
this._thumbnailViews was being keyed by section.id, which isn't set
for the template sections because they weren't yet saved.  This fix
uses section.cid as the key for this._thumbnailViews when the section has
not yet been saved.
Merge branch 'hotfix-issue_210' into develop
Add '^' to beginning of URL patterns

Closes #234

Without the leading '^', paths like
/stories/workshop-11-why-do-we-tell-stories/viewer/ were matching the
story detail pattern ('stories/(?P<slug>[0-9a-z-]+)/$') instead of
the viewer one ('stories/(?P<slug>[0-9a-z-]+)/viewer/$).
Merge branch 'hotfix-issue_234' into develop
Re-delegate events on render

Closes #228

The story builder view's element is removed from the DOM when you switch
to any of the other workflow steps.  This causes the event bindings to be
lost.  So, we need to explicitly call delegateEvents().  In the long run
it might be better to just hide the view elements instead of removing them
from the DOM with the call to empty() in AppView.
Merge branch 'hotfix-issue_228' into develop
Avoid console.log/console.debug issues

Closes issue #230

Some browsers don't have a window.console object.  IE9 has a
window.console object, but no debug method.  I used HTML5
Boilerplate's code (in plugins.js) to help with this along with
an extra snippet to pass calls to console.debug to console.log
when console.debug doesn't exist.
Merge branch 'master' into develop
Merge branch 'develop' into comments
s/Save/Save Changes/ and make string translatable.
Fixing lava shooter to kill as well.
Removing mobile terrain from halfFallback mode.
Bug 1352
Merge branch 'master' of github.com:PlayOnLinux/POL-POM-4
Merged upstream from liquidslider
Merged upstream from Codeigniter
[doc] add warning notice at top of documentation
Move animation
Updated xfc file
makerecoveries.sh: Fix up some error reporting. Have errors return a non-zero return value for scriptage.

Change-Id: I944338b684fbaaf0cf9e991e5f370c3889e75649
Merge remote-tracking branch 'cyan/ics' into allwinner
Added logging for icecast connect/disconnect
I would add more, but I'm not sure how the code works in all places
Больше фиксов "я", отображение спрайтов, прочее.

Фиксы "я" в консолях, в шепоте, у попугая, в мемо; починил отображение
отрубленных голов; починил отображение лежачего скафандра атмосферников;
убрал алиумов из рандомной ротации; починил координаты планеты клоунов;
поправил карту. Мог что-то забыть упомянуть, указания на баги
приветствуются.
add --status, make accounting work
Correct bounty conditional
Add alternate sewer exit
Rebake sewer with fixed exit
Add alternate mermaid exit
adminUsers
debugging FS and scanning
Added clear: both style to column flow block regions
Working with no macro
working detector messenger
minor changes - getting on the same page
better listing of categories
added uninplemented function
changed window framework to swing
Major refactoring of delivery_reports.py
Add samples without samplerunmetrics to sample mapping
More refactoring of delivery_notes. Add failed samples
Merge branch 'feature/project-status-use-projectsamplelist' into develop
Add pct_target_bases_10x to customcap application qc
Merge pull request #122 from percyfal/develop

Develop - refactor delivery report structure, including failed samples to project report
updated fastq_screen report glob
Merge pull request #126 from b97pla/develop

updated fastq_screen report glob
Merge pull request #127 from SciLifeLab/develop

Develop - merge into master
add some ne tests
Merge branch 'master' of github.com:SeanHogan/webscale-db
comment out old btree tests
read/write state added to dbm
Added an option to disable the prefix because it kept someone awake at night
Level Completely lain out and updated
Add default actions to hitting retun in these boxes
Fix debugging message
changed some column names
Gestion des multiples to, cc et bcc. Pas encore fonctionnel.
Merge branch 'master' of github.com:Sigmanet15/asi-labo01
add a new functionality at the functional annotation . The user can now see the previous annotation before proceed.

add getOperationTaxonomy function

change style of dhtmlgrid tables (specify concrete width of columns etc...)

Add some tests to vendorManager class
Some gems blacklist certain versions, this must be converted to conflicts= in the PKGBUILD since DEPENDS doesn't support '!='
Request URI bug fixed in patch for FileStore class to cope with error on marshaling IO object somewhere in HTTParty::Response.request
readded something i removed by mistake
learn user tastes
score article with a naive Bayes++ model
parameters for the pg likelihood
Done. Should add character/column detail and evidence in the near future but so far it works.
Restored and output is now XML Special Chars escaped.
Only test left.
Allow implicit braces in class definitions
Add more tests for implicit braces
added suppression system. just use #!SUPPRESS name_of_rule on the line you want suppressed.

Conflicts:

	src/coffeelint.coffee
commit build products because it seemed like the cool thing to do.
Merge branch 'master' of https://github.com/leostera/coffeelint

Conflicts:
	bin/coffeelint
made changes and wrote tests, tests dont pass yet.

Conflicts:

	lib/coffeelint.js
	src/coffeelint.coffee
block enable/disable is working, but the cyclomatic complexity tests are breaking.
Merge branch 'master' of https://github.com/clutchski/coffeelint into suppression
all tests pass, but cyclomatic complexity is 14.
Merge branch 'suppression'

Conflicts:
	lib/coffeelint.js
	src/coffeelint.coffee
Bounds rm from abstractEntity added to movingEntity
moving dart-warrior to its own repo
Agregar Hospital y Cuentas
Static library
Shared library
Updated gitignore
Minor changes
Preload ALL the textures?! (Plus a TODO note.)
Auth failure toast check
- Bit tidying up. Waiting for good client for testing
Changed student to include member MyPastCourses
- Fixed stacking issue with auto-pickup
first commit of feature (perms commented out)
restructured (run-time and memory)