labofsahil/github-event-dataset-2012 huggingface dataset:
Load the SyntaxHighlighter independent from `TL_MOOTOOLS` in case jQuery is selected
File and page pickers now work correctly
+ ‘Codes/Assert-Demo/Assert-Demo/’
+ ‘Codes/Assert-Demo/Assert-Demo/Makefile’
+ ‘Codes/Assert-Demo/Assert-Demo/min’
+ ‘Codes/Assert-Demo/Assert-Demo/min.C’
+ ‘Codes/Assert-Demo/Assert-Demo/min.o’
- ‘Project5/project-five-related-files/’
Switch to wrapped commonjs module format
optimized lru cache
add pathogen plugin to manage the plugins of vim
Redefine size of instructions
Template resources should default to the carbon cookbook unless otherwise notified
spaces
Merge branch 'release/0.5.6'
fixed智能勾选默认继承uncheck bug

Signed-off-by: lyhistory <lyhistory@gmail.com>
Removed YUIConf dir
first cut at monsters
removing my bat
Add biweekly class support.
added a connection wrapper
Thu Jun 14 13:00:02 MDT 2012
Thu Jun 14 15:00:01 MDT 2012
Thu Jun 14 16:00:02 MDT 2012
added powerups and inheritance
refactor para tomar intervalos, 2 fixme nuevs
fixed spike detection + full sorting big matrix
getting the similarity matrix
empty classes for the new task manager feature
adding copyright to the new files
task manager have many bugs but its getting there
test編集 'date'
[minor] removes npmignore
cross_val fixed
Added some more readme images, Closes #61 and #62
Merge remote-tracking branch 'upstream/master'
dwcd
ee
Fixed delete item segfault;
Fixed ports & labels reopen
Added widgets to robot elements
xtmux: fix scroll region checks signedness

When scrolling up more than an entire page, the redraw check was broken, leading to over-scrolling
Bug en Notas Trimestrales de Disciplina
2.7 release docs
added a number of explicit dependencies to doctest to build when everything is hidden
Added `(^?!)` from issue #107.
add README.md into spec file
ENYO-1279: change inOrigin test to treat an empty port value for window.location as port 80, avoids using XDomainRequest object to do local-origin requests breaking sync requests

ENYO-DCO-1.0-Signed-Off-By: Ben Combee (ben.combee@palm.com)
Merge pull request #155 from enyojs/ENYO-1279-unwiredben

ENYO-1279: change inOrigin test to treat an empty port value for window....

Reviewed-By: Mark Bessey (mbessey@palm.com)
Sppress the hold and release events of the confirm control, so hold and release are ignored when swiped.
Merge branch 'enyo-730' of https://github.com/enyojs/onyx into enyo-730
Fixed ERRAI-407: Creating an @EventHandler without appropriate method arguments causes ArrayIndexOutOfBoundsException
Fixed ERRAI-408: Creating an @EventHandler with invalid data-field results in NullPointerException

This also fixes the NPE in case a non-existing native event source was specified.
fixed variable without var :o
added POD source for man pages, the current plan is to maintain them in POD and use pod2man to generate the the man page formatting. win.
Site updated at 2012-09-11 03:22:43 UTC
servlet dependencies cleanup work
ECMS-4326: Display feedback message popup when deleting from Trash folder
ECMS-3399 remove incorrectly committed file
WIKI-140 The name of the draft place is displayed as path
initial commit

Signed-off-by: Karel Tuma <karel.tuma@gmail.com>
redundant

Signed-off-by: Karel Tuma <karel.tuma@gmail.com>
Fix docs of date filter
Add docs for date_modify
merged branch Seldaek/date_modify (PR #757)

Commits
-------

ae85586 Add docs for date_modify
0366cf6 Fix docs of date filter

Discussion
----------

Date modify filter

This is probably possible via `date(foo)|modify('-1day')|format()`, but it's non obvious and a dedicated filter might be a bit more prominent.

---------------------------------------------------------------------------

by fabpot at 2012-06-22T07:01:32Z

Just a quick thought: As it modifies the date, it should probably be a function, not a filter.

---------------------------------------------------------------------------

by stof at 2012-06-22T07:24:52Z

@fabpot Aren't filters meant to transform the value ?
tweaked previous commit
Refactored Area
Update object property references to work with Closure.
fix chttrans
dbus-watcher should be a daemon
added script for measuring the # of overlapping terms between query and mate doc
soon message added
Rudimentary inference for first-class structs
Better pretty-printing of kinds and types (adds parens where necessary). Algebraic datatypes & inference. Fixed subtyping bug (w/ universal quantifier scoping).
Added parsing for datatypes and cases, and annotations for cases
Added some testing code (option and list datatypes, and impl's of MONAD for both), fixed some revealed issues in typechecker.
[src/middleware] Add get_all_stream_ports method
[doc] Documentation supervision methods activate and deactivate.
[sensors] always store camera intrinsic matrix in row major order
[CMakeLists.txt] Fails if we want BUILD_DOC and sphinx not present

Fix Issue #64 on github
[doc] Updated ROS installation instructions for Fuerte
[sensor] fix body2sensor rotation for IMU sensor, add angular acceleration
[core] add frequency property to MorseObjectClass

Returns the real frequency the Sensor or Actuator action is run at.  Now
you can just use self.frequency in actuators and sensors, instead of
getting the logic tics (which was not correct if a delay was set in the
Game Logic Sensor).
[doc] add short notes about the frequency property of components
[builder] add set_animation_record method

from:
http://www.blender.org/documentation/blender_python_api_2_63_release/bpy.types.SceneGameData.html#bpy.types.SceneGameData.use_animation_record
as proposed in the MORSE user survey
(http://www.surveymonkey.com/s/MHN2PDS)
[sensor] IMU sensor uses new frequency property
[sensor] use frequency property for accelerometer
[actuators] use frequency property instead of tics for all actuators
Some more plugin and stuff
Add on_change command
New tins required
Update installer tasks.
Update command line installation instructions.
Refactor installer task again.
added controlCamera property for Movers
[malta] set DEVICE_TYPE to developperboard

git-svn-id: svn://svn.openwrt.org/openwrt@33402 3c298f89-4303-0410-b956-a3cf2f4a3e73
[realview] set DEVICE_TYPE to developperboard

git-svn-id: svn://svn.openwrt.org/openwrt@33403 3c298f89-4303-0410-b956-a3cf2f4a3e73
[package] busybox: add patch to fix CVE-2011-2716 in udhcp.

git-svn-id: svn://svn.openwrt.org/openwrt@33404 3c298f89-4303-0410-b956-a3cf2f4a3e73
[buildroot] add sparc specific site files

git-svn-id: svn://svn.openwrt.org/openwrt@33405 3c298f89-4303-0410-b956-a3cf2f4a3e73
[leon] refresh patches so they apply cleanly

git-svn-id: svn://svn.openwrt.org/openwrt@33406 3c298f89-4303-0410-b956-a3cf2f4a3e73
[leon] fix sparc32 assembler failures with newer toolchains

git-svn-id: svn://svn.openwrt.org/openwrt@33407 3c298f89-4303-0410-b956-a3cf2f4a3e73
[leon] set DEVICE_TYPE to developerboard

git-svn-id: svn://svn.openwrt.org/openwrt@33408 3c298f89-4303-0410-b956-a3cf2f4a3e73
[realview] partially revert r33403

git-svn-id: svn://svn.openwrt.org/openwrt@33409 3c298f89-4303-0410-b956-a3cf2f4a3e73
kernel: update linux 3.6 to 3.6.8

Also refresh the affected patches.

Signed-off-by: Gabor Juhos <juhosg@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt@34402 3c298f89-4303-0410-b956-a3cf2f4a3e73
Fix defaults
Version bump - v1.4
Correction bug balayage
Added README.md.

To make github happy.

Signed-off-by: Thorsten Fischer <thorsten@froschi.org>
Bug 810295 - Switch unit button fixed
Bug 811658 - Adress info from FB is showing hometown. r=crdlc
Bug 807308 - Fix a typo and cancel the timeout put in bug 808227 when transition cancels
Bug 810738 - Part II; add a slowTransition toggle to test transitions and state change
bug 810825 fix SIM card unlock white screen problem
as well as follow-up bug 806237: add SIM card state on main menu
Merge pull request #6398 from lodr/fix-switch-unit-button

Bug 810295 - Switch unit button fixed
Merged cause reviewed+ and blocking-basecamp+
Merge pull request #6415 from timdream/wm/cancel-transition

Bug 807308 - Fix a typo and cancel the timeout put in bug 808227 when transition cancels, r=alive, a=blocking-basecamp
Merge pull request #6391 from jmcanterafonseca/fb_import_data

Bug 811658 - Adress info from FB is showing hometown. r=crdlc
Merge pull request #6418 from evelynhung/issue-810825

bug 810825 fix SIM card unlock white screen problem
Added doc comments and <user/> tag for 4 FAKE functions.
Merge pull request #54 from bentayloruk/bt-doc

Added doc comments and <user/> tag for 4 FAKE functions.
bin: added pep8 script to the bundle
redirect / to /photo_album
create homepage
Show last updates on knowledge base fixed #3599


git-svn-id: https://forge.indepnet.net/svn/glpi/trunk@18553 35612d4c-9d10-0410-837c-bf9dd1be60d7
[0.83] Ticket template : trouble when preselecting itemtype : no items displayed fixed #3454


git-svn-id: https://forge.indepnet.net/svn/glpi/trunk@18250 35612d4c-9d10-0410-837c-bf9dd1be60d7
[0.83] prepare update to 0.83.1


git-svn-id: https://forge.indepnet.net/svn/glpi/branches/0.83-bugfixes@18178 35612d4c-9d10-0410-837c-bf9dd1be60d7
[0.83] add 0.83.1 dump


git-svn-id: https://forge.indepnet.net/svn/glpi/branches/0.83-bugfixes@18179 35612d4c-9d10-0410-837c-bf9dd1be60d7
CS

git-svn-id: https://forge.indepnet.net/svn/glpi/trunk@19559 35612d4c-9d10-0410-837c-bf9dd1be60d7
Auto grading for HW3

Auto grading for HW3
Auto grading 4 HW3
new interface: load_userdict(file_name)
fix root_url_for to global
select + save
extract_feature front-end ready
Testing
Test
Testar igen
Updaterad
Test
Test 3
Test 5
Lagt till login-gränssnitt
Jag förstår ingenting
bytte namn pa tim-branchen
Added loginGif and login-related Strings
Basic login-screen design
Login-screen with progress done.
Added failed login text.
Basic pin entering-method added, still need some refinement in showing the user what pin HEN has entered so far, and the functionality to check if the pin is correct.
Missed that I had not saved the PinActivity.java, here it comes.
Fixed button-size, pin can be enterd, erased and checked.
LoginActivity is now the default activity, MainActivity is removed.
Removed some unimportant files.
added soem icons for homescreen
Fix image width and alignment in search results
Make no results found message clear floated header
Put spaces between terms in search document

Keywords (tags) weren't working for in the search query.  I realized
that I wasn't putting spaces between the terms when creating the
document that Solr uses to index the stories.  This commits adds spaces
between terms in the template.
now installs new test header files
* Фикс стандартного инжектора для абстолютных названий класса
+ Репозитарии данных
* Исправлен Core::init
+ Render
+ Controller
+ Рабочий запуск из консоли
package: improve auto-detect of shared object extension
Added comments to uarray2.c
Merge branch 'master' of https://github.com/gsiu/comp40
add schedule_relocate in MultiScheduler
allow guards to specify their templates
added inline doc for template method
Merge pull request #369 from schmurfy/template_location

Allow Guard plugins to specify their template location
Added '-d' option to list only the specified Asset(s) (similar to '-d' in ls(1)).

Added the '-d' (--directory) option to list only the specified Assets,
rather than their children.

This is similar to the '-d' option for ls(1).
Added "--delete userId [userId ...]" option to the "user" command

Added "--delete userId [userId ...]" option to the "user" command
to delete user(s) by their userId.
v0.1207160

 - Added batchedit command for pattern matching and replacing on bulk assets
 - Added -d option to ls command to show specified asset instead of children
 - Added --delete option to user command to allow removing users
changed spacing, added imports
Fix constructor for element.
Merge branch 'master' of https://github.com/haikona/OMS
Fix SerialConnect gcc4 build.
Mail: don't require a subject to save a draft (#9218)

Also :
 * if the body of message changes, ask to save draft when closing window
 * disable save button when successfully saving draft
release gem 0.0.3
add eapp prototype
add notes for ritual magic

but it's still in the TODO
Recompile to fix compiler error with super.
adding rvmrc to gititnore
typo in rvmrc
improving interface
fixing unused ajax request
removing mit javascript
mega merge
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Remove useless options at new document form
Configure i18n
Add i18n to documents
Add i18n to home page
Add i18n to the default layout
Mapa76 becames to analice.me translated to english
Add i18n to comb view
Merge branch 'i18n' of github.com:hhba/mapa76 into i18n
Transating to english
Fix en.cfg configuration file
[lib] making sure search mode is not already active when entering
[lib] fixed ctrl+c for quitting
Merge pull request #11 from st-luke/master

Search mode duplication
Bump version to 0.1.0.pre21
removed duplicated codes.
Merge branch 'master' into gh-pages
Fix adding Bcc from ActiveSync
Change this to info level.
Remove unused variable _connected
Add entity and mapper objects for Category (type actually), Property and Stock
phpdoc
phpdoc
Implement ArrayAccess interface.
Mock offsetSet and offsetUnset,
implement offsetExists and offsetGet
newline before EOF on Entity Object  and Entity Mapper class files
The driver uses and returns (arrays of) Category objects instead of property arrays
Added mutations to MongoDB import script
Added configuration option for case sensitive MongoDB databases
Merge branch 'atlas_view' of https://github.com/hrovira/QED
Merge pull request #10 from kleisb/master

Configuration option for case sensitive MongoDB lookup databases
new target
can run
21.05
commit again
FIx possessive apostrophe placement in homepage text
Try to render plaintext as markdown
Sanitize content with bleach
subckt.c, doit(), fix memory leak
subckt.c, doit(), fix another memory leak
allow time, temper, and hertz in expressions of behavioral R, C, and L devices
Independent variable 'temper' now returns the temperature in degree C
Player randy
Merge pull request #3 from tovbinm/master

Hi Inaka team, please welcome Randy
updating tests for external properties
Common bindir
add msiNcSubsetVar msi for NETCDF subsetting operation


git-svn-id: svn://irodssvn.ucsd.edu/trunk@5157 ea137bd6-aa86-47b6-b90d-b101d9f19a90
provide new archetype with more ycb compliant dimensions.json for yahoo dev
Finished updating over half of the code exammples: models, code snippets, steps, formatting.
separate dev and test
update file to make file meet manhattan app needs
Merge branch 'develop' of github.com:yahoo/mojito into develop
Removed binder tests and revised server.js for version 0.4.8.
Updated model namespace syntax in examples.
Added the server.js file needed to run apps in hosting containers.
Fixed a model test. Made sure all tests run.
update file basing on Caridy's feedback
fix space
Fixed reference to models in unit tests.
Merge pull request #705 from zhouyaoji/exs_rm_binder_tests_add_serverjs

[docs] Removed binder tests that prevented unit tests from running, corrected the server.js so apps can run on hosting containters.
Update docs/dev_guide/code_exs/intermojit_communication.rst

Fixed the formatting of the third point under summary.
Merge pull request #694 from lzhan/ycb

provide new archetype with more ycb compliant dimensions.json for yahoo dev
fix syntax/parse errors
Added config/cmdline doc for hybrid apps.
Added archetype for creating hybrid apps and for building hybrid HTML5 apps.
Merge pull request #710 from zhouyaoji/docs_hybrid_app

[docs] Add documentation for configuring/creating/building hybrid apps.
Merge pull request #708 from rmadhuram/develop

Update docs/dev_guide/code_exs/intermojit_communication.rst
Modify : RetrospectionModule, add 1 param show titre panelVideo.
Add project URL to clone command in "Installation" section
add item and page class to store parsed xml data
add item and page class to store parsed xml data
update TODO file
move noam.fsm container and constants
use grunt as noam build tool
make all sources pass jshint linting
Generated gamebox app.
Added some placeholder tile graphics.
debian: control: cupt: explicitly suggest installing a download method in the long description
Moved around methods.
ItemsTest.PutThenGet
Implemented sortByName.
ItemsTest.BatchPutThenGet
There's no such thing as batch get.
Fixed formatting.
Fixed a bug.
Added a test stub.
Added a stub implementation.
Split Put into a separate file.
Added test names.
Added more names.
PutTest.EmptyItemName
PutTest.InvalidItemName
PutTest.TooManyUpdates
PutTest.OneAttributeNameEmpty
PutTest.OneAttributeNameInvalid
PutTest.OneAttributeValueInvalid
PutTest.OnePreconditionNameEmpty
PutTest.OnePreconditionValueInvalid
PutTest.OnePreconditionHasTwoOperands
Set up a fake Conn object.
PutTest.NoPreconditions
PutTest.NoPreconditions
PutTest.SomePreconditions
unified content
unified content
alignment unified
added tripping example
updated jFin started writing add. Build changes
change fb to use localhost. Add Names into the games model. Not sure if this is the best way to go about it, or if we should do a lookup into the games table
Logging system refactoring.

LoggingLevel renamed to Level
LoggingManager renamed to Manager

We already have log:: namespace, right?
Merge remote-tracking branch 'origin/master'

Conflicts:
	apps/steady/common/log/level.cc
	apps/steady/common/log/level.h
Add ex1.5
Cry HAVOC!
Elmo's song
added lyrics file
Adding in text.
my first commit
my pagefile!
Testing commit
Merge pull request #24 from valsavva/master

rolling it up
Merge pull request #6 from githubstudent/master

Cried havoc
Merge pull request #31 from sieffertm/master

I'm pull-requesting another person's stuff
Merge branch 'master' of https://github.com/Pwn9/poems.git
Merge pull request #29 from mteece/master

Gandalf speaking to Frodo
Merge branch 'master' of github.com:githubtrainer/poems
Merge pull request #1 from roxchkplusony/master

I added elmo's song. Would you include it?
Merge branch 'master' of https://github.com/githubtrainer/poems
Merge pull request #34 from Pwn9/master

I need the latest stuffs
Prepare to update contact info
update NEWS/README with drainaquifer/superdwarf
ruby: misc tweaks
IE7 JS and style support
Connection pooling using the GenericPool npm lib.
preventing encoding problems in ajax request body (PUT/POST requests)
Minor documentation fix for states. 
Cleanup
Bump revision in README
Document namespace option of RESTAdapter (added in 95d938ef)
Merge pull request #217 from bradleypriest/patch-1

Minor documentation fix for states. 
Merge pull request #210 from joliss/cleanup

Cleanup
Merge pull request #207 from joliss/doc

Bump revision in README
Merge pull request #172 from naltatis/master

Explicitly setting ajax charset to utf-8 to prevent encoding problems.
Merge pull request #208 from joliss/doc2

Document namespace option of RESTAdapter (added in 95d938ef)
Added capability to enumerate remote shells.
latest
Merge branch 'master' of github.com:jpata/stpol
Implement channel 4
Fix sound ratio; unbound FIFOs
Take the median of all proposed outcomes instead of a random one
cartafoles iniciais
Just a quick test for ci
adding expression actions
Finished parsing of Dojo loader configuration.
change after b
sourcemaps - remap all lines on stack trace
update rails 3.2.5
Correct error messages when unable to load modules

Remove references to the old Empty objects for middlewares and
modifiers, as well as the code that looked for them
Correct indentation when looking for radars
Add Segway RMP 400 robot, and related actuator

There is a new class in the Builder API to include robots of this type,
called ``WheeledRobot``.
The robot should be used with the v_omega_diff_drive actuator.

Thanks to David Hodo and Pierrick Koch for their work on this robot.
[cmake] Compute the Morse version from git describe

The version which appears in morse --version, and in the documentation
now reflects the exact state of your repository.
Thanks to Thomas Moulard for sharing its cmake macro
[cmake] doc rule improvement

Register the dependency on the git version
Set up correctly PYTHONPATH so it generate the doc from code in tree.
Always generate the documentation
Waypoint: fix vector projections for speed computation
Display the name of the camera shown on screen

Also make the screen visible by default when a camera has been selected for
display
[view_camera] hide cursor when CTRL is pressed

prevent the cursor from blinking
Stop screen material from casting shadows
Correct child placement on segway robot

Because of the different orientation of the Segway robot (pointing
in the direction of the Y axis), the coordinates of the child components
are changed when appended to the robot.
These changes will change the values of the translations in X and Y, and
also rotate the sensor around the Z axis by PI/2
Rename Ressac in RMAX
Add UTM modifier to Builder's data
[builder] Allow custom config in services and overlays
[builder] env set GLSL rendering
[builder] env: add set horizon color method
[builder] clean get_selected method

according to Blender naming convention:
name size = 21
so 17 if we add ".001" when objects name already exists
[mw/ros] when posting image, publish too the associated cameraInfo msg

thanks to Denis Štogl for the patch (on morse-users@laas.fr )

Adjust the documentation
Modified Human so that Actuators can be used
[ros] IMU uses standard middleware (odometry)
[ros] Pose_sensor posts odometry msgs to comply with ROS fake-localization
random push
Merge branch 'master' of https://github.com/katfang/dsm
Added Eclipse's files in .gitignore
Catch by const reference (remove Eclipse warnings)

(closes #245)
Add AM_PROG_AR for automake 1.12 (closes #250)
Warn when server has not heard from us (even if we have heard from server)
Fix bug in retransmission logic (improves performance on lossy links)
Improve lossy connections by sending diff from "known" state if it's easy
Tab preserves, but does not set, wrap state when used in last col.

Fixes vttest regression.
Correctly handle wrapped lines where first portion is blank
Enable round-trip verifier in verbose mode
More graceful output from failed verification
gitignore ar-lib, another autotools dropping

Closes #253
Define PROG, for newer versions of skalibs

Needed to build from our source tarball on some Gentoo systems.

Closes #239.
Closes #254.
Don't flag blank->blank predictions.
Tabulation clear preserves wrap state (per davidben)
Only use AM_PROG_AR if it’s defined

Fixes
  aclocal:configure.ac:22: warning: macro `AM_PROG_AR' not found in library
and
  ./configure: line 4024: AM_PROG_AR: command not found
with old automake.

Signed-off-by: Anders Kaseorg <andersk@mit.edu>
Move NetworkException formatting into NotificationEngine
Deliver sendto() exceptions without disturbing control flow

This prevents the client from waking up every 200 ms while the network is down.
Addresses #243.
Make timing parameters public within namespace Network

So that UI timeouts can adjust accordingly.
Display sendto() exception until a successful send
Calculate wait_time separately for {Notification,Prediction}Engine

Simplifies access to private data, including the next commit.

git renders this diff poorly.  It's a bit better with --patience.
v004

Template
Updated tweet.txt

Removed 170 char tweet, increased the total number to 15 and added more realistic meta.
Correctif: En mode Toutes périodes, sans catégories, on n'affiche plus les enseignements non visibles sur les bulletins.
Correctif sur la visibilité des groupes.
Saisie possible en compte secours quand la période est partiellement close (comme pour les autres notes et app).
Correctif sur un pb de doublon de noms de périodes.
Correctif sur l'ordre d'affichage des enseignements.
Correctif sur un id/name.
Amélioration du dispositif d'alerte sur sessionMaxLength.
Correctif: En mode Toutes périodes, sans catégories, on n'affiche plus les enseignements non visibles sur les bulletins.
Correctif sur la visibilité des groupes.
Saisie possible en compte secours quand la période est partiellement close (comme pour les autres notes et app).
Correctif sur un pb de doublon de noms de périodes.
Correctif sur l'ordre d'affichage des enseignements.
Correctif sur un id/name.
Amélioration du dispositif d'alerte sur sessionMaxLength.
abs2 : correctif, sur le non affichage des élèves changés de classe
Ajout d'indications de debug sur un pb avec les tables temporaires.
Merge branch 'release-1.6.0'
Merge branch 'production', remote-tracking branch 'tbelliard/master' into developpement
Avoid loading javascript for admin area when user is not an administrator
fixed small typo. whoops.
Fix for fix to isssue #26.

Fixed non 'a' lines hanlding in 'm' sections.
Spec #started? improve #start coverage
Spec #remaining and #done?
Test notifications

Stub explicit Process.spawn
added getopt flag handling
bidiagonalization
fix edit form of vote
1.改下载BUG，（socket初始化）
Merge branch 'master' of 192.168.9.14:dhsgclient-x
#修复一条线问题（露小缝）
Merge branch 'master' of 192.168.9.14:dhsgclient-x
修正点击穿透问题，修正酒馆页面按钮选中图问题
Merge branch 'master' of 192.168.9.14:dhsgclient-x
1.NPC页面提示图片显示问题
修正点击穿透问题
#搞定主界面系统消息的字体问题（windows和android基本ok）
Merge branch 'master' of 192.168.9.14:dhsgclient-x
#骑宠界面字体适配（windows OK，android待测试）
Merge branch 'master' of 192.168.9.14:dhsgclient-x
1. 更新代码至外部最新版本（2012-12-5）
因確定宕機問題不是聲音模塊造成的，重新開啟聲音模塊。
1.修改图片资源显示错误，竞技场祭祀问题
Merge branch 'master' of 192.168.9.14:dhsgclient-x
#查询任务数据效率优化
Merge branch 'master' of 192.168.9.14:dhsgclient-x
小修改
1.更新机制的文字单独一个文件
1.NPC页面提示图片显示问题
修正点击穿透问题
#搞定主界面系统消息的字体问题（windows和android基本ok）
Merge branch 'master' of 192.168.9.14:dhsgclient-x
#骑宠界面字体适配（windows OK，android待测试）
Merge branch 'master' of 192.168.9.14:dhsgclient-x
1. 更新代码至外部最新版本（2012-12-5）
bug fix: candidate select bug in H2K mode
add allNames api call
fix a bug in a helper function
update by carly  2012-04-09
Cleaned up the xml some more.
Fix bugs in OpenEXR multi-part input
Small error reporting improvements, found along the way.
support Time#to_s taking tz parameter (ActiveSupport)
x86: cosmetics: Comment some #endifs for better readability
avfilter: x86: Use more precise compile template names
fix off-by-one error for chrom start and chrom end.
depend on tcp/ip service
depend on LanmanServer service
Add some info to the file
fixing JSON syntax issues
Adding stylecop tag
Add extra data() function to Node for consumer-specific data.
Add proper AST formatting.
Remove some unnecessary inspect() calls.
Fix some string escape tests.
Temporary workaround for Elixir's broken "\0".
Add test directories for parsing.
Add some parse-fail tests for module declarations.
Add some parse-pass tests for module declarations.
undo mistaken changes
Modification de la fonction skip_bom_utf8 pour retourner un boolean
Modification pour que les profs restent sur l'accueil graphique en cas de
suppression de message du panneau
Modification (2) pour que les profs restent sur l'interface garphique en
cas de suppression de message du panneau
Correctif sur l'imbrication ul/li archives CDT
Merge remote branch 'marc/modif_skip_bom' into release-1.6.1
Merge remote branch 'marc/modif_panneau' into release-1.6.1
Ajout de styles manquants. Correction sur la prise en compte de largeur de colonnes.
Correction d'un petit bug sur les liste d'eleve mod_abs2
Correctif sur une liste ul/li quand le module CDT est activé mais sans que la scolarité ait le droit de consulter les CDT.
Modification 2008->2013
Correctif sur l'accès PP.
Merge branch 'release-1.6.0' into release-1.6.1
Correction du contenu du JS de redirection sur les intrusions dans backup.
Merge branch 'release-1.6.0' into release-1.6.1
Espaces manquants entre les logins élèves affichés.
Correction: On affichait trop de titres de partie inutiles. Précaution sur une création de table temporaire.
textareaで編集中にコンフリクト解決がうまくいかないのを修正。
/tmp/loglogにログを吐くコードが入っている
/tmp/loglogに書くコードを消去
Waiting for resources folder to be added again….
htdocs/js/square.crossfilter/

added crossfilter viz
Fix d3.geo.path().area.
Reinstate d3.geo.path().centroid.

Also adds support for previously unsupported object types e.g. Points
and LineStrings.
Rename a few variables for consistency.
Merge branch 'projection' of https://github.com/jasondavies/d3 into 3.0
Fix a segfault and add some debugging
heh
working(tm)
Merge pull request #4 from mgj/dev

Dev
fix create app repostiory references
include_attribute is only valid in attribute files..
increment tag for aegirdemo.build to 201204181336_23
Modify RADEME.md

* Array Example is appended.
* Bug fix on an example code.
Compute page etags based on page shas

This gives us better performance and better scaling!
code cleanup
fix markup editor js
optional fragment caching added
Merge branch 'undo-manager' into next
Merge branch 'merge-labels' into next
Merge branch 'master' into next
Merge branch 'master' into next
Merge branch 'master' into next
redraw screen upon sigwinch

I feel like I tried this at some point and it didn't work, but I don't
remember the specifics.

Modified from a patch from Liam O'Connor-Davis <whiteslug@gmail.com>
Merge branch 'master' into next
Merge branch 'multi-remove-labels' into next

Conflicts:

	lib/sup/modes/thread-index-mode.rb
Buffer switching, 'bn' for the next one and 'bp' for the previous
Merge branch 'roll-buffers' into next
Merge branch 'encoding-misspellings' into next
Merge branch 'sigwinch' into next
Merge branch 'default-colors' into next
Merge branch 'default-colors' into next
Revert "redraw screen upon sigwinch"

This reverts commit 9bc61b52f1a4fb3492e3799240815ed0c2a7b67f.
Merge branch 'sigwinch' into next
Merge branch 'merge-labels' into next
Merge branch 'background-save' into next
Merge branch 'master' into next
Merge branch 'zsh-completion' into next
tcp_and_proxy/nisroc.py and tcp_and_proxy/sammael.py - small changes,
added dh and TLSv1
jnpr/case_att_download.py - small bug fix when runned without the config
file
fixed plugins plugin
add one more compartment for the Root Task, otherwise we have one compartment per worker thread.
reset hold_timestamp_end on seed_drop replant
added hook_seed_replant and hook_seed_pluck
ON DELETE CASCADE (2)
Working on that Gwen renderer!
FTW && TODO
removed MainWindow.py
removed player 1.0
Modify obj_free to free instances of Struct.
Modify gc_gray_mark for Struct.
Merge pull request #317 from masamitsu-murase/fix_struct_new_gc

Fix GC of struct
define convert method mrb_int/mrb_float with C string
Merge pull request #510 from masuidrive/master

define convert method mrb_int/mrb_float with C string
make plugins work again \o/ | resque-edge compatible
fix #20
If an input/text is nested in a label associated with a radio button,
when the user clicks in the input/text, Chrome gives it focus,
whereas Firefox gives the focus to the radio button.
The focus now goes to the input/text on either platforms.
redundant 'password'
fix #18 : first link not loaded
The first pageload does not go through the 'stateChange' history
event, where current page hash is stored to be compared to the
page hash of the next clicked link.
If the application opens with a hash different than '?' or '',
this makes the first link fail as there is no 'previous hash'.
fix #10 : removed default 'admin' user, prompt for new user after startup
fixed formatter again to please jslint
minor anchor fix
fix #29: return newly created user on /user/add
fix #30
[HtmlFormatter] Add http-equiv attribute to Content-Type meta tag
Merge pull request #171 from alexandresalome/feat-html-encoding

[HtmlFormatter] Add http-equiv attribute to Content-Type meta tag
Merge remote-tracking branch 'origin/develop' into error-reporting
add gitignore
modify default.settings.py
fix def.setting
Добавил регистрацию
Merge branch 'develop-evor' into develop
update gitignore
убрал app/config/parameters.yml
добавил симлинк для консоли
обновился composer.lock
обновил базовый шаблон. включил yui компресор. добавил ксски и картинки.
Tiny fix on nlp
Merge branch 'master' of https://github.com/mydlp/mydlp
Added spaces to regex for iban
Merge branch 'master' of https://github.com/mydlp/mydlp
Auto-generated dumps and diffs for 0.9.162-1
Added atan2.
Fixed N2.Security.PermissionMap issues (workitem/32291)
OctetPNG
Naver API library 추가
added play_auth
adding bootstrap
Merge branch 'master' of github.com:natea/ourmy
key_commit: Changed code back for checkno
key_commit: fix nulls on receiptlist function
key_commit: Added the ability to change the received of and comment fields until the deposit is created
key_commit: update all invoices when ever you want from the site screen
key_commit: fixed tax inquiry to use any residual filter left in your filter box
[maven-release-plugin] prepare release netty-3.5.1.Final
Add some package-info.java 
Remove non-used class
Use build-helper-maven-plugin instead of messy hack
Added code cloning functionality

Signed-off-by: Luke Spencer <luke.spencer@newicon.net>
Merge branch 'HEAD' of git@github.com:newicon/Nii.git
Adding post about Liquid include
New site release
begin of adding design
fix palette support
simplify the makefile and tests

* no more LOCAL_LIBS support (was it useful?)
* skip rare compilers
Merge branch 'release'

Conflicts:
	io_png.c
	makefile
	test/01-build.sh
type checker refactoring complete
Add file.

Fix

B

C
Add Hello.
Update README for release 1.0.0
Merge branch 'release/1.0.0'

release 1.0.0
updated dependencies.
added pending specs for Project.
Additional JSON tested.  Fixed date time zone for test dates to UTC.
Merge branch 'master' into 0.0.8_2.9.0-1

Conflicts:
	salat-core/src/main/scala/com/novus/salat/json/ToJValue.scala
Specs for grater delegates in ModelCompanion trait.
Major commit: canonacalize all log.* method invocations. Makes it much easier
for fingerprinting (the "%s" is the fingerprint itself! No need to define a
mask)
libopenflow: wildcard wireformat converion only on FLOW_MOD

see github ticket #30
Consistent with ovs's behavior which isn't terribly consistent in
itself.
Merge pull request #31 from noxrepo/dev/andi/of_wildcard_wireformat_only_flowmod

libopenflow: wildcard wireformat converion only on FLOW_MOD
Change ls flag to use symbols, not colors.
Fix prompt to use vcprompt properly + better arrow.
Add ctrlp and lucius.
Update color scheme options.
Rename run_pycc_test_result.py so nose doesn't try to auto-run it
Reduce debug output, rename numba.error as the base exception to numba.Error, fix type promotion issue
VER: Bump up NPY_API_VERSION from 6 (Used by 1.6) to 7

Also added NPY_1_7_API_VERSION to numpyconfig.h to help with
NPY_NO_DEPRECATED_API macro usage.
DEP: Update all the '#define NPY_NO_DEPRECATED_API' instances to be
versioned
DEP: Update NPY_NO_DEPRECATED_API to be version-based
DOC: Update documentation and release notes about C-API deprecations
API: Update c_api_version hash.
UPD: Make lapack_litemodule.c use non-deprecated macros/functions.
UPD: Make fftpack_litemodule.c use non-deprecated macros/functions.
MOV: Rename numpy.pxi to numpy.pxd to conform to current Cython.
ENH: Add npy_no_deprecated_api.h

This is to provide a file defining the NPY_NO_DEPRECATED_API macro that
can be included in Cython *.pxd file.
UPD: Make numpy.pxd and mtrand.pyx use non-deprecated macros/functions.

The non-deprecated macros and functions were defined for Cython in
numpy.pxd and mtrand was fixed to use them. In particular, direct
access to structure internals in mtrand.pyx needed to be replaced
by the new access functions.
UPD: Update files for versioned deprecation.
UPD: Add NPY_NO_DEPRECATED_API to some more files.

_dotblas needs more work to remove direct access to ndarray internals.
UPD: Make sort functions use non-deprecated macros/functions.
UPD: Make _dotblas.c use non-deprecated macros/functions.
UPD: Regenerate mtrand.c
STY: Remove trailing whitespace.
ENH: Check that npy_no_deprecated_api.h is included before it is needed.
BUG: old_defines.h needs a guard.
WRN: Fix some compiler warnings.
BUG: Update base-traversal algorithm for array sub-classes so as to stop the base-traversal when the new base would not be an instance of the sub-class.
Merge pull request #2708 from ContinuumIO/base_traversal

Update base-traversal algorithm to stop at sub-class boundary
Ferme #2518 : couleur de certains elements en interface système inversée

git-svn-id: svn://trac.rezo.net/spip/spip@19139 caf5f3e8-d4fe-0310-bb3e-c32d5e47d55d
Upgrade jqplot to version 1.0.0, show data labels when hovering over a chart segment
Value-attribute in non-native XML elements treated as JSON value in
tree2json.
Exposed XML Export Post-process hook
Pass the XML element to gis_encode.
Export GeoJSON in Python not XSLT
Merge branch 'master' of git://github.com/flavour/eden
Courses & Certificates have tabs to set up equivalence & create_next directs there
merge Mike: Climate updates
Tweaks
Merge branch 'master' of git://github.com/flavour/eden
整理一下注释
assorted improvements to output
artistes similaires sur page profil
Reverted combo boxes to default, vertical gradients.
Major UI tweaks:

* Added basic skin.chameleon support
* Added brightness correction for chameleon feature
* Used toolbar_end with borders instead of an image to separate toolbars.
* Adjusted background image.
* Increased border contrast.
fixes repo permission bug
Make item types not matter. (See #154)
Make Travis CI config more minimal.
Float item thumbnails to the left and add margins for different breakpoints.
fix zip url
ServiceMetaclass responses now registered at class construction rather than instance init.
Recommend reading the code / docstring. Thanks/blame to @inglesp
목적에 따른 솔루션 파일 분리
implemented start/stop of sc_serv
Add ConfigDefaults class
Plug-in
Merge branch 'v.0.2'
last min. corrections
Update NEWS for #61541
Merge branch 'PHP-5.3' into PHP-5.4
Ignore the tempoary files
Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  Ignore the tempoary files
Merge branch 'PHP-5.4'

* PHP-5.4:
  Ignore the tempoary files
undo "#define interface struct" caused by including windows.h
pull in headers necessary for win32 network functions
win32: mask off non-applicable error codes
zre_interface only destroy context if it created it
Merge pull request #78 from hintjens/master

zre_interface only destroy context if it created it
Added initialization
Merge pull request #80 from hintjens/master

Added initializer to prevent warning
Merge pull request #81 from pijyoi/win32fix

fixup compilation on Windows
Cleanups to project structure

* Moved Java sources to java directory to be consistent with FileMQ
* Moved C project up to top level to be consistent with FileMQ
* Removed code generation scripts, now use FileMQ scripts ('make install' in filemq)
Merge pull request #82 from hintjens/master

Fixed project structure
Move initialisation of the VM out of main.
Factor main out of the VM.
Add simple program to generate binaries with a baked-in ROM
Refs #3194, reverted [6518] smarty escape modifier change.


git-svn-id: http://dev.piwik.org/svn/trunk@6523 59fd770c-687e-43c8-a1e3-f5a4ff64c105
git-svn-id: http://dev.piwik.org/svn/trunk@6351 59fd770c-687e-43c8-a1e3-f5a4ff64c105
Revert "No more need for the LD_LIBRARY_PATH hack when calling the binary"

This reverts commit 930b2b7971e0199552df1afd577d044060c50822, using $ORIGIN is
evil :)

Discussed with:	kib
Revert "make a lib symlink to libpkg for now"

This reverts commit 7af967513989d22f52a7f679dc59299a1bcc4811, using $ORIGIN is
evil

Discussed with:	kib
Revert "use $ORIGIN to make sure pkg always finds the right version of libpkg"

This reverts commit 4324be1d61bc978d9ad9a011bd21f1916f79db56, using $ORIGIN is
evil

Discussed with:	kib
Revision 04/09/2012/15:05
Minor URLs fixes
Fixing homepage styling
Adding more content to the modules section.
[rules/base.ham]: Fixed a bug in the IncludeOnce rule ;
[bin/bin]: Added the bin/bin folder to fix bash scripts compatibility issues on Windows ;
[rules/toolkit.ham]: Added rules tkDefDLL & tkIncludeDep ;
[bin/ham-bash-lib.sh]: Prompt don't use a special folder for the current working directory so that it works better in all color schemes ;
Added the toolsets folder and basic toolsets setup for msvc_10_x86 and emscripten ;
Automatically download packages if for the toolsets ;
Removed unused emacs/ham-shell.cmd ;
[rules/run.ham]: More flexible run rule ;
Created test for route callback functionality.
Router now requires a Request object.
Request object is now passed into the Router Payload.
Routes can now call simple callbacks when matched.
Merge branch 'feature/simple-route-callbacks' into develop

Closes #93
move, renames, true getters
unselectable button
add news + events templates
add news + events templates
fix bug in nonNK generator
Cruft.
Added a few other tests and made minor changes to Album construction in
Controller.
Fleshed out Acoustid query implementation and began testing. Created a mock, but
it's not complete yet, and relies on some additions to the Musicbrainz mock.
Tests pass without the mocks in place, so things are working, I just need to
finish the mocks so that testing doesn't cost a two minutes per run
update vim config, still messy
reverting decoupling of NumberHelper from safe_join and adding tests for escaping of delimiters and separators
Merge pull request #6355 from amutz/fix_number_with_delimiter_escaping

NumberHelper.number_with_delimiter should html_escape both delimiters and separators
Changelog entry for PR #7560
Merge pull request #7591 from bogdan/callbacks-changelog

Changelog entry for PR #7560
Extract clusterfuck method for surgery
refactoring
we don't need to test that constant assignment works
we have no need for the ASSOCIATION_METHODS constant
Allow Relation#merge to take a hash
assert valid keys
Add Relation#merge!
Make Relation#extending work like other value methods
remove apply_finder_options call from AssociationScope
doesn't make sense for select! to take a block
swift fixes, chmouel patch
исправил ошибку в предыдущем, добавил новую функцию в пересчет
The consumer doesn't need to load AR models
ajout du plugin gvchat pour améliorer le chat
suppression logo evnix
ignore /temp in .gitignore
[bug 806935] Only relate documents in default categories.

* Only documents in the default categories should show up as related
* Only documents in the default categores have related
less magic numbers
[bug 782292] Add KB Helpfulness chart to KB Dashboard.
Add sr_device_get_info
edid: properly deal with leading I2C crud + small fixes
srd: Add missing <inttypes.h> #include (for PRIu64).
sr: zp: Add missing <string.h> #include.
sr: Eliminate usb/serial instances from API.

The API should be generic and only provide sr_device_instance_new() and
friends, but not sr_usb_device_instance_new(), sr_serial_device_instance_new(),
or others for other device types we may have in the future. The
frontends shouldn't have to know or care about this implementation detail.

This also fixes the problem that parts of sigrok.h contained
'#ifdef HAVE_LIBUSB_1_0' and such, which is even less desirable for the API.

The usb/serial instance specifics are now private, and each driver that
needs them keeps a pointer in its driver-specific context.
srd: add generic I2C filter PD
srd: remove obsolete DDC-only I2C filter
srd: avoid POSIX_SOURCE warning
srd: free all decoder instances when unloading decoders
srd: rename extra_probes to optional_probes
srd: rename extra_probes to optional_probes in all PDs
sr: remove unused time/duration fields from datafeed packets
cli: cleaned up debug output
gtk: cleaned up debug output
srd: uart: Use strings for packet types.

While this has a (small) performance penalty compared to using integers,
it has the advantage of not requiring the use of magic numbers which
need to be declared in both the UART decoder and all decoders which
stack on top of UART.
srd: uart: Add missing initialization.
srd: uart: Move protocol docs to __init__.py.
srd: uart: Use strings for most PD options.
srd: spi: Use strings for most options.
srd: Move all protocol docs to __init__.py files.
Услуги и деятельность -> Строительные и ремонтные услуги -> Строительно-монтажные работы - исправляем опечатку
БО: Логинимся надежно
better default values for fifo size adjusted
Prototyping MongoDB Shell and NodeJS integration.
Make Request#remote_ip return nil when HTTP_X_FORWARDED_FOR is empty

If HTTP_X_FORWARDED_FOR only contains whitespace, don't try to extract a
list of IP addresses from it.
Merge pull request #4202 from dasch/request-remote-ip

Fix bug in `ActionController::Request#remote_ip`
bump up rack version to the one that includes the Hash DoS fix
Merge pull request #4247 from amatsuda/hashdos_23

bump up rack version to the one that includes the Hash DoS fix
Better minimum validates_length_of examples (adapted from master).
Merge pull request #5653 from eee-c/patch-1

Doc fixes in 2.3: validates_length_of
Update src/org/apache/ioscm/TraceReplayer7Batch.java
bump development version number
Bower installable

Issue: #1
update change log for bower
clean up buster, curl configs
extend storage, touch and gesture events from the correct property hierarchy
Capture history events

Events are defined in `clicks/events/history`

Captures:
- popstate
- hashchange

Issue: #2
`clicks.reset()` will flush the stream buffer

Previously, buffered events would survive a reset.

Issue: #3
Release clicks 0.1.1
File and line are fine for the ASSERT macro
Support compilation with Microsoft Visual Studio
Moved statements to make MSVC happy
Updated README
Merge branch 'master' of github.com:saghul/pyuv
Update lua binding for LodConfig.
add helper for getting input particles from input lists
Exempt bundled dependencies from standards checks.

git-svn-id: https://svn.salilab.org/imp/trunk@15561 e91f8c7b-0e32-4433-a9ac-4502d39a4eab
Move in molecular surface generation code needed for cnmultifit.

git-svn-id: https://svn.salilab.org/imp/trunk@15562 e91f8c7b-0e32-4433-a9ac-4502d39a4eab
Use the rmf source from http://www.github.com/salilab/rmf

This also involves deleting the RMF applications that don't depend on other IMP code as they are now part of the external source. IMP.rmf is not yet updated.

git-svn-id: https://svn.salilab.org/imp/trunk@15563 e91f8c7b-0e32-4433-a9ac-4502d39a4eab
bring up to d9716d7

git-svn-id: https://svn.salilab.org/imp/trunk@15564 e91f8c7b-0e32-4433-a9ac-4502d39a4eab
support changes to RMF

git-svn-id: https://svn.salilab.org/imp/trunk@15565 e91f8c7b-0e32-4433-a9ac-4502d39a4eab
remove special cases for RMF in build scripts

git-svn-id: https://svn.salilab.org/imp/trunk@15566 e91f8c7b-0e32-4433-a9ac-4502d39a4eab
turn back on multifit part of benchmark
update helper to be more flexible
use base functions to get inputs in rmf module
expose more particle indexe functions
use base inputs method
use indexes
use base inputs and outputs functions
use base inputs functions in domino too
fix function name in new restraint macro
add updated constraint and score state macros
it all compiles....
merged
more minor changes
remove gcc_like characterization as we really only handle compilers like mpicxx that actually are, underneath gcc and it was causing confusion.

git-svn-id: https://svn.salilab.org/imp/trunk@15459 e91f8c7b-0e32-4433-a9ac-4502d39a4eab
nightly update
nightly branch update
Initial commit of basic MultiFit atomic fitting code; not yet completely
functional.


git-svn-id: https://svn.salilab.org/imp/trunk@15740 e91f8c7b-0e32-4433-a9ac-4502d39a4eab
Fix flags for static builds.


git-svn-id: https://svn.salilab.org/imp/trunk@15741 e91f8c7b-0e32-4433-a9ac-4502d39a4eab
Change into correct directory.


git-svn-id: https://svn.salilab.org/imp/trunk@15743 e91f8c7b-0e32-4433-a9ac-4502d39a4eab
Fix test name.


git-svn-id: https://svn.salilab.org/imp/trunk@15744 e91f8c7b-0e32-4433-a9ac-4502d39a4eab
Remove extraneous directory.


git-svn-id: https://svn.salilab.org/imp/trunk@15745 e91f8c7b-0e32-4433-a9ac-4502d39a4eab
Be more verbose when we fail to package something, to make it easier to figure
out what the problem is.


git-svn-id: https://svn.salilab.org/imp/trunk@15748 e91f8c7b-0e32-4433-a9ac-4502d39a4eab
add numerical stability to VectorD::get_unit_vector() - if vector is tiny, will return a random unit vector (alternative would have been trying to magnify it recursively, but discarded to avoid unpredicted behavior) ; appropriate test was added for VectorKD instance

git-svn-id: https://svn.salilab.org/imp/trunk@15507 e91f8c7b-0e32-4433-a9ac-4502d39a4eab
Removed deprecated functions. No functionality change.

- Unused utility functions.
- Overly general utility functions, replacing their one-time use.
- Etc.