labofsahil/github-event-dataset-2012 huggingface dataset:
clean up; bug fixes
Merge branch 'master' of https://github.com/srkunze/ckanext-lodstats
created new route and controller
when an RRA grows, try to derive the data from other RRAs. Also the population code is improved
Fix if the user schema is not called 'user'
Merge pull request #6 from ilbambino/master

Fix if the user schema isn't called 'user'
slight style changes, new entry, new draft
Update jquery.uniform.js

Resolved JSLint violations as well as removed (some) superflous logic.
[git] Threespot Media -> Vox Media
[zsh] Makes use of RVM for Vim
Updates README
Changed the way objects and agrs are passed to fix non-blocking issues.
Automatically export Pangolin so that a find script isn't needed

Signed-off-by: Steven Lovegrove <stevenlovegrove@gmail.com>
Merge branch 'master' of github.com:stevenlovegrove/Pangolin
Rework ffmpeg include paths to avoid polluting searchpath with avutils time.h

Signed-off-by: Steven Lovegrove <stevenlovegrove@gmail.com>
Portane stvari iz SVN-a (nadam se da je to sve)
Merge pull request #136 from stowellm/master

QR Code Abilities, Fixed Merge Conflicts for lint/media management
Removed .orig and other unnecessary files
Re-added gitignore, project, and settings
Merge pull request #137 from stowellm/ms129

Removed strings.xml backup files that caused Eclipse issues
Added .classpath file
Fixed source packages
Merge pull request #138 from stowellm/ms129

Fixed source package issues with Data Collector App
added rest API from DUCK
Merge pull request #139 from AlanRosenthal/AR_Issue126

added rest API from DUCK
Fixed picture uploading, added QR code error checking, fixed 1 lint issue
Merge pull request #140 from stowellm/ms129

Fixed picture uploading, added QR code error checking, fixed 1 lint issue
Started writing support for DataSet object
Commiting merged files
Added phone landscape compatibility
Merge pull request #142 from stowellm/ms141

Added phone landscape compatibility
Started to implemnet upload to iSense.  Now puts everything in ArrayLists.  No more double time column.
Merge pull request #143 from AlanRosenthal/AR_Issue133

Started to implemnet upload to iSense.  Now puts everything in ArrayLists.  No more double time column.
fixed .class file from gitting
Merge pull request #144 from AlanRosenthal/AR_Issue133

fixed .class file from gitting
.gitignore updated
Replace deprecated spec.opts file with .rspec file and use documentation style output format.
Update tested ffmpeg version to 0.10.2.
Better handling for invalid EXIF
Fixes missing about page
Merge branch 'master' of github.com:sukima/dev-tritarget-org
Added alot of assets and icons.
Icons galore! Swipeytabs with ActionBarIcons.
Other tests for Path finding
Adding title block

http://johnmacfarlane.net/pandoc/README.html#title-block
Add dynamic date substitution
Adding prepare() call for all outputs
#9 Compatibility issue with IDEA 11 (trees / expanded paths)
first userland allocator for (v)ram
Modified time and add search function
Merge branch 'master' of https://github.com/t-chov/language_marathon
Adequações de detalhes.
Commented out pending tests
Generate the devise views
Replace bootstrap-rails with bootstrap-sass
Add bootstrap navbar to the layout
Modify git architecture
Checking in essentially blank lift project.

Copied from another site I am doing.  Started as a blank project as specified
by the cookbook site. <http://liftcookbook.spiralarm.cloudbees.net/>
Clean up generated markdown
Site updated at 2012-08-29 06:05:44 UTC
Reduce number of queries for automatic product list
Prefetch generic content objects for promotions
Merge pull request #212 from tangentlabs/reduce_query_number

Reduce query number
fix problem with joining events
Update controleurs.gtw

correction :
un certains nombre -> un certains nombre
d’objets jResponse fournies -> d’objets jResponse fournis
actual documentation
* reorganized mixins and functions
* normalized spacing
* fixed small bug in "retina" mixin
* added $default-font-size variable of 16px
initial commit v1.4.4
Simplify resource builder API
[maven-release-plugin] prepare release 2.1.1.CR5
[maven-release-plugin] prepare for next development iteration
Refactored prime_factors to return a dict
Refactored prob3.py for new version of prime_factors
New output function
Solved problem 5\!
provided basic readme files
Added nbsp if create buttons are not set to prevent layout messing up
Added the venue mapping to the mapping layer
Fixed the services.yml
Added support for serving knockback.js and it's dependencies as compressed and uncompressed through django-compressor.
extracts lat, lng and name from JSON
Merge branch 'master' of github.com:thenoviceoof/hacknyancat
Move to super simple layout
make that shit less french
add video for the lessons learned talk
Client template engine restructured, introduced template-sources
merged
Stripped back pagination
New jQuery type of pagination
set connect mysql use utf8 character set
Merge branch 'master' of github.com:tianlong1986/upload-tool
Tutorial on tic tac toe using Pygame
Revert "Issue #5 Code:"

This reverts commit e4a390e036d3b6ffafa79b2e9a770fb527fde9a4.
Revert "fixed some errors in armlevelstate. Added dummy AI"

This reverts commit aeb0eb0a3b48c68c182d3620ab73bf6f5ab382b0.
Revert "did some refactoring"

This reverts commit 96701fb92657cef9ef4eef982b6198ab5949ce59.
organize imports, format
fix covers again after using the proxymodel
Made the merging radius factor and alpha config parameters, updated README
x
Initial pull from existing repository.
Merge branch 'master' of https://github.com/tomfy/RandomMathProblems
seems to work better if you send before disconnecting
ie, don't exit directly or still get unhandled sigpipe. Why?
removed a bunch of debug messages
added some textures for the trees and mountains
fix db routing issue
add some jquery logic
implement nice ajax sample with jquery
remove duplicate activerecord dep
Now prints out options if not search specified.
FABRIC: update version number to 3.3.15
more email addresses
Merge remote-tracking branch 'origin/master'
Okay, I admit, the compiler is probably better at this
Fixed issue where SMSes were not being filtered on real devices.
Modify project structure.

Signed-off-by: Takuya UESHIN <ueshin@happy-camper.st>
Removed a check that was made unnessicary by r1644.

git-svn-id: svn://svn.icculus.org/quake3/trunk@2310 edf5b092-35ff-0310-97b2-ce42778d08ea
Added r_mode -2, uses desktop resolution. Bug #5408. Patch by Andrei Drexler and myself.

git-svn-id: svn://svn.icculus.org/quake3/trunk@2311 edf5b092-35ff-0310-97b2-ce42778d08ea
Use correct fallback height and width for r_mode -2.

git-svn-id: svn://svn.icculus.org/quake3/trunk@2312 edf5b092-35ff-0310-97b2-ce42778d08ea
updated glfw header file
Scores are drawn and better game zone restriction for ball
closes #12

Signed-off-by: Tomasz Kamiński <kaminski.tomasz.a@gmail.com>
Normals influenced by animation
moved some static content
Add overclock management support
Add Extra OC level
Update tweakaio init script
Cleanup
Max speed is increased to 1556Mhz
Remove presence true from email and login from users
Type user Adimin UMRBrazil
Issues
mode man/woman
mode VIP/noVIP
debug tools in checkin

Signed-off-by: antoineangot <antoine.angot@gmail.com>
Update TinyAccessSecure/tas.viila.sh

change description
splitted schedac in three
Version 0.6.43
Inorporating processing of AX request/response into Google authentication
Merge remote-tracking branch 'origin/development' into production
Ocultar la realización de informes de empleados.

Añadido Notificador de Stock a falta de datos de acceso de cuenta de
correo.
Informe parcial completo.
Informe finalizado.
Proyecto Finalizado.
Se han tenido en cuenta los tickets especiales.
Añadida opción de genera informe de puerta y barra.
Corregido el problema de guardar las asignaciones de empleados.
Mini-Project - Padma Preethi and Vivek Murali
Three Little Pigs
adding explanatory comments
resposnsive typography added
Removing redundant GeneralUtils class
Adapting test methods for the last app version
add test case for submit fail error
fix: from interrupt by exception to FailureResult.
return FailureResult when catch SeleniumException.
Removed slf4hx dependency
Latest hg pull: 18 Nov 12
[opencl] refactor directory structure

Signed-off-by: Ni Qingliang <niqingliang2003@tom.com>
new file:   blog/__init__.py
	new file:   blog/database.py
	new file:   blog/models.py
	new file:   blog/settings.py
	new file:   blog/views.py
	new file:   flaskTest.py
fix unittest issue
. fix bootstrap.sql with no id value
added sensorsimulator-2.0-rc1 and installation instructions
modified website/aspect/update.sh
Allow for external redirects on nodes, add redirect.module.
No changes: Build 201212241753 of webos 1.0 for machine tuna on
No changes: Build 201212241935 of webos 1.0 for machine tuna on
No changes: Build 201212241936 of webos 1.0 for machine tuna on
packages: Build 201212252121 of webos 1.0 for machine qemuarm on borabora
Use PHP DOM to generate fully standard compliant XML
QUnit bridge for nodejs
Bump app version to 1.1
Problem 8. Plus notes on Problem 7.
possibilité de lire les questions normales a partir du xml
Ajout de la lecture des QCM
Update css/calor-me.css
Some cleanup of doApiRequest in test module

Change-Id: Ia5bdf04c5b43c551f383af9fd078528e14d07efc
Merge "Some cleanup of doApiRequest in test module"
[Database] Fixed case where trx idle callbacks might be lost.

* (bug 41656) LoadBalancer always commits if there are callbacks pending.
  This works by checking a new DatabaseBase::writesOrCallbacksPending() function.
* Made transaction idle callbacks run in autocommit mode. Generally callers already
  want autocommit mode or do quick begin()/commit() calls anyway. The docs already
  make stat that callbacks should close any connections they start, but this makes
  it harder for people to forget about implicit transactions. Since the callbacks
  often may happen in commitMasterChanges(), if transactions are left open, they
  might not get committed by anything afterwards.
* Added sanity exceptions and warnings if callbacks get lost for some reason.
* Renamed trxIdleCallbacks -> mTrxIdleCallbacks for consistency.

Change-Id: I00e1e0fcdd7deeee1fbac6d0f295160479cb8962
added __all__ to protocol
added documentation to protocol
RF Refactored waiting for auth into its own function
TEST: added tests for stopping and waiting for auth
add workgroups to emacs
update files
manual merge
Addded the %include preproccer directive
volcanoes3
* Uodate link to github fork image
delete the bak
del unused bg.jpg
初步确定数据结构，开始着手数据传输与存储。
was missing a version number.
paul
Site updated at 2012-11-06 11:54:24 UTC
Site updated at 2012-08-23 02:29:30 UTC
Macbook 上的配置

在Macbook上配置了该网站目录，可以在localhost/cfd中浏览该项目
client example, first iteration
self-hosted packrat passed its tests
3번탭 indicator 적용 완료
rails generate model Relationship follower_id:integer followed_id:integer
Section 11.1.1 done: Listing 11.1 + bundle exec rake db:migrate && bundle exec rake db:test:prepare
Listings 11.2-11.6 basic model associations
Listings 11.7-11.8 quick validations on followe*_id presence
Listings 11.9-11.10 User has_many :followed_users through: :relationships, source: :followed
Listings 11.11-11.12 following?() and follow!() utility functions
Listings 11.13-11.14 unfollow!(), by symmetry
Listings 11.15-11.16 followers() - completes model methods for utilizing the database associations created via migration
Listing 11.17 + 'bundle exec rake db:reset && bundle exec rake db:populate && bundle exec rake db:test:prepare
Listing 11.18 routes for followers/following (no tests)
Listings 11.19-11.21 followers/following links to home
Listing 11.22 followers/following styling - there is no TEST for STYLE, baby
Listings 11.23-11.24 follow/unfollow partial and relationships' routes - go restart Guard before continuing
Listings 11.25-11.27 follow/unfollow buttons and forms (no tests?)
Listings 11.28-11.31 Followers/Following pages (not just links)
Listings 11.32-11.34 core follow/unfollow functionality COMPLETE
Listings 11.35-11.36 follow/unfollow button Ajax in views
Listings 11.37-11.40 Ajax follow/unfollow - and Section 11.2 (following users) is done. ONE MORE SECTION\!
Listings 11.41-11.43 status feed 'first cut'
Listing 11.44 - a stupid intermediate syntax modification
Listings 11.2-11.6 basic model associations
Listings 11.7-11.8 quick validations on followe*_id presence
Listings 11.9-11.10 User has_many :followed_users through: :relationships, source: :followed
Listings 11.11-11.12 following?() and follow!() utility functions
Listings 11.13-11.14 unfollow!(), by symmetry
Listings 11.15-11.16 followers() - completes model methods for utilizing the database associations created via migration
Listing 11.17 + 'bundle exec rake db:reset && bundle exec rake db:populate && bundle exec rake db:test:prepare
Listing 11.18 routes for followers/following (no tests)
Listings 11.19-11.21 followers/following links to home
Listing 11.22 followers/following styling - there is no TEST for STYLE, baby
Listings 11.23-11.24 follow/unfollow partial and relationships' routes - go restart Guard before continuing
Listings 11.25-11.27 follow/unfollow buttons and forms (no tests?)
Listings 11.28-11.31 Followers/Following pages (not just links)
Listings 11.32-11.34 core follow/unfollow functionality COMPLETE
Listings 11.35-11.36 follow/unfollow button Ajax in views
Listings 11.37-11.40 Ajax follow/unfollow - and Section 11.2 (following users) is done. ONE MORE SECTION\!
Listings 11.41-11.43 status feed 'first cut'
Listing 11.44 - a stupid intermediate syntax modification
Listing 11.45 status feed optimized with SQL subselect
Change for making pc-lint error/warning free
为分类模型添加属性imgUrl
rockyou passwords
Rotate based on touch position
Merge from 'line-construction-test'

- Merge from 'line-construction-test' branch into
  'line-construction-staging' branch.
Add 'pointForCoordinates' function

- Add 'pointForCoordinates' function in graphing_tool.js to
  calculate logical coordinates from screen coordinates.
Merge from 'line-construction-test' branch

- Merge from 'line-construction-test' branch into
  'line-construction-staging' branch.
Merge from 'origin/line-construction' branch

- Merge from 'origin/line-construction' branch into
  'line-construction-staging' branch.
Update the line-construction activity JSON

- Update the line-construction activity JSON file with the
  updated one from the smartgraphs-converter tool.
Merge from 'origin/line-construction-staging' branch

- Merge from 'origin/line-construction-staging' branch into
  'line-construction' branch.
Merge from 'origin/line-construction' branch

- Merge from 'origin/line-construction' branch into
  'line-construction-test' branch.
Fix point drag from annotationHolder

- Fix point drag issue, when point stop moving along with the mouse.
Merge from 'origin/line-construction' branch

- Merge from 'origin/line-construction' branch into
  'line-construction-test' branch.
Fix plot of points with same values

- Fix plot of points on the axes with same x and y values.
Fix tooltip and point plot issue for safari

- Update the function "_checkInputAreaScreenBounds" in views/graph.js
  to fix tooltip visibility and point plot on grid line intersection
  for safari 4.x.

- Handle tooltip width for negative values.
Fix bug of 'pointMoved' operator

- Fix bug of 'pointMoved' operator in lib/operators.js.

- Add 'dataPointDown' function in controller/graph.js and
  graphing_tool.js to store the dragged point.
Merge from 'line-construction' branch

- Merge from 'line-construction' branch into 'line-construction-test'
  branch.
Update integration test

- Update integration test for graphingTool.
Fix 'xFixed' and 'yFixed' function of point.js

- Fix 'xFixed' and 'yFixed' function to first round the values and then
  convert to string.
Fix rollback point code and tooltip hide bug

- Fix rollback point code for point drag.

- Fix tooltip hide bug after point drag when single point is present.

- Change function name 'getLogicalBoundsFromState' to
  'updateLogicalBounds' in graphing_tool.js.

- Fix tooltip width bug.
Merge remote-tracking branch 'origin/line-construction' into line-construction
Fix pointView mouse drag

- Remove mouse events for propagation from 'annotationHolder'.

- Set annotation's "isOverlayAnnotation" to true in graphing_tool.js so
  annotation passes all the mouse events to the pointView.

- Add function "_updateAllViews" to the views/graph.js to update
  the views.
Merge from 'line-construction'

- Merge from 'line-construction' branch into 'line-construction-test'
  branch.
Update integration test

- Update integration test for graphingTool.
re-initialize firefox add-on folders

re-initialize firefox add-on (since this one has not started yet). Now
come with a better understanding of JavaScript and more new ideas.
Update to Rails.3.1.4
Oct 26 2012
added time units for max simulation time
set the fixed size of edit lines of params
placement params of modules in tree
localization hardcoded
Fixed strings in Minto Seed file
Folders name correction + upgrade news page (copyright and page number)
upgrade news page (copyright and page number)	.
upgrade news page (copyright and page number)	.
Move user api to seperate module.
Fixes, stuff.
improved handling errors in tests
Merge branch 'master' of ssh://github.com/2062/CORE-Scouting-Server

Conflicts:
	main.py
	model/newuser.py
Allow script to run standalone
Testing new servers
added ruby class diagramm
Merge branch 'master' of https://github.com/AI-Praktikum/kindergarten
fixed formatting for printing
commited correct script
building main view based on publishers and feeds
Updated for V2
Updated ReadMe
Corrected the URL for the api
Merged
Added some infrastructure for PlayerCharacteristics. Loader/Writermostly.
skipBackupAttributeToFile added to Documents database
Rewrite stitch bootstrapper now in coffeescript
New feature. Configuration parameter "Profile/CheckCacheModifyTime" can be used for forcing update of cached styles and scripts at the client browser.
created <canvas> for pieces separate from the chessboard canvas
Fixed EaselJS piece renderer
CSS tweaks
Site updated at 2012-10-22 20:27:13 UTC
add redirectAsGuest for FDL_CARD/OPENDOC/GENERIC_EDIT (closes #3062)
Merge pull request #495 from Eric-Brison/3.2-A3062

add redirectAsGuest for FDL_CARD/OPENDOC/GENERIC_EDIT (closes #3062)
corrected error for lecture terms
Fixed the Mysterious Immortal AI bug.
Signed-off-by: Harrison Houghton <actorclavilis@gmail.com>
Added function that converts numbers to two decimal points.
Track CM zlib and AOKP bluez
Lighting now turns off before equipment
removed all kobold speak messages

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
fix for non-working shutters and blast doors on exodus and antiqua

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
players who died while in control of simple_animals should now have their name display properly

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
Merge branch 'master' of https://github.com/Baystation12/Baystation12
some tweaks to vermin spawning

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

mapfix for non-working blast doors across both antiqua.dmm and exodus.dmm
Ported AutoTraitor.
Added RP revolution.
Merge pull request #1775 from CIB/master

Ported autotraitor
Fixed: Inverted test when getting avatar image link for stats output.
Fixed: Polls not animating in post.php when replying directly to poll.
Changed: Upgraded jQuery, jQueryUI and fineUploader.
Changed: Load Twitter, Facebook and G+ JavaScript libs using jQuery.getScript().
Changed: Updated styles and images for fineUploader.
Update dependency, add mouse tracking
Added glimpse support
JSON API - Get Data from HVW and Wordpress
[remaster__legacy] again
[remaster_pre] fixed repo
Add stubs
New mock file for testing
Add some docblocks
Move sort logic and change to natural sorting
Remove unnecessary files
Add new line so next line can be part of a new commit
New line
Add ran command on exception for debugging
Update regex
Update groupby
Add 26 unit tests that all pass. [:
Alt4
added foreigner gem
Ideas

Added WANTTODO list. ideas we want to implement but are on the back
burner until functional site is up.
Plots Starbucks Locations

Plots starbucks locations, draws a red dot where the user clicks, calls
getNearest on the location the user clicks.

Problem: getNearest always returns 0.5, 0.5.
Updated mod_tar docs to mention use of libarchive, rather than libtar.
Updated mod_tar to use the libarchive library.  This enables us to support
largefile archives, as well as support the .zip extension.
changed to use the toolbox-0.11.0 dotkit
commit so i can work on menu stuff for brian

Signed-off-by: JPBarker <joseph1.barker1@gmail.com>
Merge branch 'master' of https://github.com/ChaosHill/Armored_Assault
It is there for brian

Signed-off-by: JPBarker <joseph1.barker1@gmail.com>
Merge branch 'master' of https://github.com/ChaosHill/Armored_Assault
v1.1 defconfig
NADA pero me detecta unos saltos de linea nuevos..
add license header
fix dependecies (WIP)
add more finegrained map zooming

 - associate zooming of a map with Ctrl-wheel

 - synchronize displayed zoom level when zooming is done via mouse

 - make zooming level 10-100% by 10, 100-200% by 25

 - remove <F2> association

 - add event logging via AspectJ in debug level
Merge branch 'issue-23' into M1
trying to get callable querysets working
CreateSomeObjects
NydaG()
add readme

ver 1.0
Work on feed parser
Begin work on version 1.5 of libcvautomation
Initial Commit.
Merge https://github.com/Dm47021/AOSP-2.3.5-Source
VFS quota: add a function to set a per mount-point global space limit
VFS quota: start enforcing limits

* Add a function vq_write_ok() to check if writing a specified amount
  of data to a mounted filesystem is allowed.

* It only checks a global per mount-point limit for now.

* Enforce this limit check in vop_write().
ixgbe.4: Remove trailing whitespace.
bge: Rework MII register accessing and auto-polling support

Obtained-from: FreeBSD 213485 213710 213808 213812
bge: Force interrupt if link status changes

Obtained-from: FreeBSD 178785
bge: Properly configure receive and send RCBs

- More comment
- Limit receive and RCBs accessing according to chip type
- Always configure send RCB
- Move producer RX ring index resetting to the proper place

Obtained-from: FreeBSD 213495
bge: Avoid accessing invalid internal memory region on BCM5906

Obtained-from: FreeBSD 213747
bge: Workaround "short DMA" bug on certain chips

If controllers receive two back-to-back send BDs with less than or equal
to 8 total bytes then the device may hang.  The two back-to-back send
BDs must be in the same frame for this failure to occur.

Obtained-from: FreeBSD 214087
bge: Enable hardware patch for TX MAC lockup on BCM5755+ and BCM5906

Obtained-from: FreeBSD 214216
bge: Workaround BCM5906 chip bug

When auto-negotiation results in half-duplex operation, excess collision
on the ethernet link may cause internal chip delays that may result in
subsequent valid frames being dropped due to insufficient receive buffer
resources.  The workaround is to choose de-pipeline method as a flow
control decision for SDI.  De-pipeline method allows only 1 data in TxMbuf
at a time such that a request to RDMA from SDI is made only when TxMbuf
is empty.

Obtained-from: FreeBSD 214219
bge: Always enable buffer manager

Also make sure various blocks are stopped in bge_stop()

Obtained-from: NetBSD via FreeBSD 221712
bge: If chip has CPMU, let it handle GPHY power down

Obtained-from: FreeBSD 226804
bge: Workaround mbox write reordering for PCI-X devices

Add per device tunable hw.bgeX.mbox_reorder to control this; it is
off by default.

Based-on: FreeBSD 232848
pci: Add more definition for PCI Express device {control,status} registers
bge: Don't force PCI Express TLP to be 128 bytes

Instead, status errors are cleared and "no snoop" and "relaxed ordering"
are disabled.

Obtained-from: FreeBSD 235821
Ignore unknown fields, make xml files prettier
Corrected some decoding errors in Microcode state machine.
1st Release: Last Edit
Es wird nun ein Favoriten-Icon bei den Autofavoriten angezeigt.
Merge branch 'master' of https://github.com/ErikWitt/CarAssist_iPhone

Conflicts:
	CarAssist/CarAssist.xcodeproj/project.pbxproj
expiremebt
Fixed example.com issue
added builder pattern example with gnarley test
Creation of the service form validator
Creation of the service form validator
feature #339
create branch for feature #339

Rebuilding this branch.
Feature rearranges common flow to initialize paths and debug before all
includes so they are available to entire codebase.
Merge branch '339-common-flow' of github.com:GetSimpleCMS/GetSimpleCMS into 339-common-flow

Conflicts:
	admin/inc/common.php
newlines argh
Merge branch 'master' into 339-common-flow

Conflicts:
	admin/inc/common.php
Merge branch 'master' into 339-common-flow

Conflicts:
	admin/inc/common.php
replaced basic.php function not defined yet.
getdef and isDebug
Merge branch 'master' into 339-common-flow
hotfix
hotfix
Merge pull request #460 from GetSimpleCMS/hotfixes

Hotfixes
feature #461
feature #456

global cache control

added global $nocache
$_GET['nocache']

Added common include to style.php to use globals and config.

Only style cache is plumbed in now, api cache will not be linked or
bypassable.
Adding back most ckeditor icons, still some missing
slug generation, servers with no mb_ functions

fix issue #464
Merge pull request #465 from cnb/master

 slug generation, fallback for servers with no mb_ functions
fix for issue #456
Merge branch 'master' of github.com:GetSimpleCMS/GetSimpleCMS
edited gitignore
Merge branch 'master' into 400-new-theme-editor

Conflicts:
	admin/template/css.php
Fixed .htaccess on static

Somehow, some additional entries had been added by the former
webserver. Need to review the .htaccess file later to see if it works
like described.
Paint border for default cell
添加功能测试脚本
改变alloc的方式
three20 切换到development分支
添加字符串的替换方法，支持对${} 占位符的替换

修改了字符替换的调用逻辑，顺便改了下requestMap的reuqestPath名字，改成urlPath
修改基础地址使用占位符替换而不是强制拼接，可以得到更灵活的url配置
调整下代码
Merge branch 'Lab'
Added animatein for level pages and quick game
Added license information to the classes
Only support 1.9.3
build.xml: deploy snapshot sources, by having non-unique version.
removed call to create menu
Added the README

Added the README file
Enabled stub version control repo to pull its log data from a file.
Adjusted Stub version control and issues clients.

Recreate Sqlite database on every test
Moved test data files around

Added StubStatusMap to read jira statuses from file
Removed jiraIssues.txt
Removed URI target overloads from Subversion repository and client classes. This provides flexibility when testing
Updated todo file
added ability to unfollow people you are following
Started on aligning the GlycoProtein object with the UniProt core ontology schema and Faldo
Fixed the 'confusion' bug. Seems to feed properly now.
Improved and added options
Actualizacion core 21-9-2012.
Fin de actualizacion total.
Add gitignore file
Initial commit
update kernel source to faux
Enable proper WiFi power enabling/disabling.

*this turns off WiFi correctly thus preventing noticeable heating up of the Fire
while on standby
Light house updated, fences removed, people got stuck
Kaptorek + general
Added handlebars plugin for vim
Updated some git and terminal settings and some Vim plugins
Much better Map Zoom and reload
Reverted to local copy of android_hardware_qcom_display
Tournament brackets
Move AStarSolver so usage in project is consistent with usage after `make install`
Merge pull request #12 from jgulotta/unify-project-install

Move AStarSolver so usage in project is consistent with usage after `make install`
Making verification happen by default

To skip verification, push to refs/force/target
This also acts as a force push

Regular (verified) pushes now are rejected if on/behind head
Add API for batch imports
SmartApp.Sample1 realisation
studentfinder
Added new version of Acceptance Tests and renamed existing documents.
Merge branch 'master' of github.com:MarcusParkkinen/AudioBook
comments about layout and images
Add OS X System style menu.
saubiman: form and empty reposclass added
Merge branch 'master' of https://github.com/MatthiasAllseits/saubiman
Parse isPicture in place of WindowsID.
Wrong copy-paste variable fixed
Added option to download short or long actors list, property #groupmovielist sorted by movie name,auto update of actor info every 7 days + skin property #Actor.LastUpdate, new skin files
Added methods NavigatePopStates and IsAnyStateContainedInNavigationStack to interface IWorkflowManager
Fixed save playlist failed screen was not removed in some cases if ok was clicked
Removed obsolete folder PluginItemBuilders from Media project
Trivial code refactoring; avoid warning in Utils class
Revert "fix activity default background can't diplay when available memory is low"

There are many system drawable can't load,and nine patch drawable display abnormally by using the fix method.
fix change id is I78ba74b0,I1c6a24c4 and Ia9587907.
So we revert the change and restore stock code.

Change-Id: Ie20487d3c7e985e8e4f98fcf6dabad4ad81fbfa5
Signed-off-by: wangwei_b <wangwei_b@xiaomi.com>
remove '设为' button in htc camera preview screen

we have changed htc gallery to miui, and miui gallery doesn't
have set wallpaper function in preview screen.
So we remove the button.

Change-Id: Ic7acd943bc9fe3968a298ebc1d4307ae8bde7800
Signed-off-by: wangwei_b <wangwei_b@xiaomi.com>
Fixing production problems by precompiling
Ordered clips on index by order_by var.
Changes to FileIndex.pm that handle concurrency.
Changed backticks to system call, works better for user input
Webapp label changes
clean code, remove unavailable classes;
added Operator/getDistributors;
release version commit;
Addign neuroml v1.8.1 version of purkinje cell moprh and minor update to NEURON example to load this in
Note: only works with NEURON 6.2-7.1 so far...
Merge branch 'master' of github.com:NeuralEnsemble/libNeuroML
Her er builderen til XML
Добавлена страница входа в систему для администратора.
Добавлена страница, содержащая панель администратора системы.
В таблицу для хранения ответов добавлено поле для хранения комментариев дегустатора.
Реализовано сохранение ответов дегустатора на опрос составленный по профильному методу.
Добавлен интерфейс для создания опроса по методу треугольника
Correction de diverses erreurs.
Rajout de la class AddService.
Update kuliah/Web/tugas/Web-1/profile.html
Fixes #3035 : Add a patch to fusion inventory to handle service pack in Suse system
Merge pull request #1 from VinceMacBuche/bug_3035/Patch_Fusion_Inventory_SuSE_servive_pack

Fixes #3035 : Add a patch to fusion inventory to handle service pack on Suse systems
Refs #2668 - Adapt rudder-init.sh script to merged initial promises and force uuid.hive for root in preinst instead of postinst
signup page + deleted public/backend
added google spreadsheet export

See readme for details, spreadsheet included for source data
gestion du connard qui a pas de carte wifi...
Merge branch 'master' of github.com:OTTeam/CaptainAdhocClient
+des NOMS POUR LES SIGNAUX
Added support to run delayed job on app master on ey (so a util instance isnt needed)
Possible concurrency bug with oauth client in memory repo due to hashmap. Changed to ConcurrencyHashMap
Adding Choco to GlobalCoordinator
fehleingaben übergehen
Remove backup opcode
Update method to destroy correct iplayer/mplayer PID's per WindowID.
Finished added unit tests.

Completed unit tests for all features, and plugins, with the exception
of the InputMask.

Can't add that due to the nature of the plugin and it requiring
keyboard/mouse interaction.
updating calls

still more work to do
Core/Transport: Fix Debug crash.
Signed-off-by: whoseyourdady <307971173@qq.com>
Merge branch 'master' of https://github.com/whoseyourdady/VoiceControl
Merge branch 'master' of https://github.com/whoseyourdady/VoiceControl
Signed-off-by: jackzpj <jackzpj@gmail.com>
Merge pull request #6 from jackzpj/master

06_28_PJ_修改3

没有冲突

同意整合
Merge branch 'master' of https://github.com/whoseyourdady/VoiceControl
Signed-off-by: Seaweed123 <540496185@qq.com>
Merge branch 'master' of https://github.com/whoseyourdady/VoiceControl

Conflicts:
	VoiceControl/src/com/scut/vc/identifysemantic/SemanticIdentify.java

Signed-off-by: Seaweed123 <540496185@qq.com>
Merge pull request #7 from Seaweed123/master

讯飞文字分段问题

没有冲突

同意整合
Signed-off-by: whoseyourdady <307971173@qq.com>
Merge branch 'master' of https://github.com/whoseyourdady/VoiceControl
test_pj

test_pj
test_pj

test_pj
Signed-off-by: jackzpj <jackzpj@gmail.com>
Signed-off-by: jackzpj <jackzpj@gmail.com>
Signed-off-by: whoseyourdady <307971173@qq.com>
Merge pull request #8 from QiuJingLiang/master

6.28改动界面

没有冲突

顺利通过
Signed-off-by: jackzpj <jackzpj@gmail.com>
Signed-off-by: Seaweed123 <540496185@qq.com>
Signed-off-by: whoseyourdady <307971173@qq.com>
Merge pull request #36 from RackerWilliams/master

Updates to next version
DB/Conditions: Add some conditions for spell targets
DB/Conditions: Add conditions for Sigil of the Ebon Blade for only Lithe Stalker
SQL: Fix "No newline at end of file" in af4f42383fb939ddb23b857e8f187ba17c07d814
Core: Fix some codestyle in 957571e18c4d6e5874ce1052ae49e4d0d21018be
DB/SAI: Finish off converting quest_end_scripts

* http://www.trinitycore.org/f/topic/7556-looking-for-people-to-convert-quest-end-scripts/
* fixup some timing errors I made on previous
* someone has to kill table + core linking to it
Core: Fix more some codestyle
Fix pet stopping approach when attacked by another creature
Fix pet placed on stay after "attack" not attacking new attackers

Closes #8735
Core/Spells: TARGET_UNIT_MASTER passenger support

* what happened before was spells casted from vehicle to passenger getting blocked by general check exceptions that state passengers to be not implicitly spell hit, however they should be ignored when caster is vehicle to master passenger
* fix a lot of quests that award kill credit that was blocked before
* precisely closes: #8643 and makes #5254 awardable
Core/Spell: Properly rewrite previous change: 80dcf879deb61198ff2c91d71887f0eae9acad68

* thx to @joschiwald for noticing problem and helping, see rest info in comment or previous fix
Merge branch 'master' of https://github.com/TrinityCore/TrinityCore
Core/Spell: Shadows Fate crash fix
 Core/Spell: Last work on Shadows Fate

 - Shadows Fate can now be applied by more than just one player at the same
   time. So on everyone who hits the unit the credit spell with the visual
   will be casted on death.
- The AOE credit spells for the three infusion quests will be casted by
  the boss once. If this would be done on proc, these AOE spells could be
  casted up to 25 times.
  -> 25 AOE credit spells plus 25 Soul Feast credit spells equals Sh**
Update src/server/game/AI/CoreAI/PetAI.cpp
Update src/server/game/Entities/Unit/Unit.h
Merge pull request #8739 from MrSmite/PetAI_CanAttack_bugfix

Fix a minor PetAI behavioral issue
Merge branch 'master' of https://github.com/TrinityCore/TrinityCore
Agora vaiiiii mensagem
icrushservers: Initial harp JSON data.
Updated with document
完成tooltip 组件!
Making Memcache optional
removing some dependencies
updating readme
deploy .ear in glassfish with script

git-svn-id: https://imag-forge.e.ujf-grenoble.fr/svn/bookoncloud@123 bd336521-3a01-0010-8dd0-db1564cb58a4
clean repository (.gitignore)

git-svn-id: https://imag-forge.e.ujf-grenoble.fr/svn/bookoncloud@124 bd336521-3a01-0010-8dd0-db1564cb58a4
Classe Panier.java + icone supprimer.png
Utile pour l'utilisation du panier et son affichage !

git-svn-id: https://imag-forge.e.ujf-grenoble.fr/svn/bookoncloud@125 bd336521-3a01-0010-8dd0-db1564cb58a4
When using AddDynamicParameters, watch out for duplicate parameters coming from templates
removed warning in bodyfactorytest
Get Razor views to use new instances, Dispose when done.
INCR to v3.9.25
Adding new Contributor 74: @pseabury - Welcome!
Adding the ability to pass a timeout to the server for timeouts on a job at a global or job level.
Fixed broken references to the API code
Final Commit (ver 1.0)

Da qui in poi ci saranno solo bugfix
SONARIDE-221 Include dependent projects in the classpath of local analysis
Rename crmPersonTrail to crmPersonMerged and fix spelling of table for PersonAccountLookup
Fixed to work with latest update to IRepository interface
Added new SearchField control that supports autocomplete and a pluggable architecture for easily adding new search capabilities through MEF.
prevent crash when not logged in
use haystack 2
Nicify specs
Added VS Settings and a link to development tools.
removed files from package stub
les bombes détruisent les briques
reste à faire l'animation pour la destruction
wlconf: update INI default power values for hp siso board

new power values:
low:  05
med:  14
high: ie

Signed-off-by: Ido Reis <idor@ti.com>
Class for testing Cell class
removed unused test class
管理番号:18

【課題】
管理メニュー内　行事一覧及び休館日一覧ページにて　検索条件の開始日と終了日に全角文字を入力するとアラートが表示もしくは入力不可でないといけないのにエラー文が表示

【修正内容】
全角文字を入れたときアラート文を表示するようにしました。また、リセットボタンを押すとアラート文が出てしまう障害も修正
【修正ファイル】
gyoji_ichiran.php　ichiran_functions.php
管理番号:18

【課題】
管理メニュー内　行事一覧及び休館日一覧ページにて　検索条件の開始日と終了日に全角文字を入力するとアラートが表示もしくは入力不可でないといけないのにエラー文が表示

【修正内容】
全角文字を入れたときアラート文を表示するようにしました。また、リセットボタンを押すとアラート文が出てしまう障害も修正
【修正ファイル】
gyoji_ichiran.php　ichiran_functions.php
Hamerlyの方法を理解しました。Hamerlyの命題の成立分岐を書いています
some fixes, still has bugs, but I'm moving to circe.
Made the api better and created a page for remote logging
Merge pull request #9 from TerraCycleUS/master

various fixes
fix merge conflict error
git tag returns the last tag in alphabetical order. we need the latest tag even if it's not at the bottom of the alphabetically sorted list
Pass the queue options when declaring the exchange
Changed test to include new URL for Twitter API.
Reload works. Ammo status dosent update on reload. Frontend chnged. Strange stuff happens to score
fix upfate rails
Merge branch 'master' of github.com:TopClubCompany/developers
fix location
fix
fix
fix seed
fix
fix front
Merge branch 'master' into maps
wrapper methods to access the email account
implemented home button
Updated AbstractStepInstance with new abstract execute() method and
better support for handling of properties
Updated mechanisms for factories to use BuildingBlocks as parameters and
set up building block property of BuildingBlockInstances
Updated runtime classes to use new helper class and provide better
support for management of properties
Initial support for changed runtime classes
New classes in runtime support
Cleanup of some code
Minor cleanup
Corrected IncommingCallMonitor to look for more information to retrieve
incomming phone number
Fixed bug in factory introduced after changing factory to use Build
Block as parameter
Revert "Correct default CMake flags"

This reverts commit 12e26530314fcdb94467a2b5af8194f8adb3adf9. Commit was not ready to be pushed to main (broken and untested code).
Allow blending of two different animations

At the moment, this is more of a client side hack. Ideally, the game should set torsoAnim for animations that require the torso (like NSPA_ATTACK1) and use legsAnim only for WALK/RUN/TURN, howwever, doing this would break md3 animations.
The order of the nonsegmented animations enum was changed to simply some of the logic.
Fix mandatory ERR_DROP when fopen fails
Happened on startup when default.cfg wasn't found
Retry without multisampling if hardware or driver doesn't support it.

Yes, it's a bit of a hack.
Have creep shrinkage mirror growth; don't get built time unless needed.
Missing ) in teamchat.
Combine human MD5 animations through bone names instead of a block range
Crouch animation does not loop
Only load required animations for MD5 buildables
Don't load idle2 twice for barricade
Remove death effect code
Don't use model bounds from MD5
Change leg and torso skeleton merging code into a function so it can be reused
Make the player rotate with the view
Have legs point in direction of motion and torso in direction of view
Don't take sprint stamina when walking with sprint pressed
Clean up some preprocessor code
Remove debug code and replace with more release worthy code
Copy torsoControlBone over as well in CopyClientInfoModel
Don't bother loading dds first.
Load try loading md3 before mdc
Change image loading priority for vanilla renderer
Remove code that "shakes the minds of every sane, experienced coder"
Fix case with multiple comboboxes in one window

If you click on one, they both open.
Don't try to do things to defaultProfile if nothing was read
Don't error out if Profile Name is left blank in the firstrun menu
Merge branch 'master' into translation
Allow particles to slightly obscure weapons
Destroy the growlist
We have a common Envision definition template for all Data Sources. ITS migrated.
Time to migrate SCM and MLS.
SCM M0 Envision could be configured now from a JSON file
Added Jasmine to be our TDD/BDD tool. Really cool! A new era in the development starts.
Removed an ipdb import.
Change version to 1.0.23
Correct misspelled word.
Find year with highest rating.
porting to rails
good progress
removed unnecessary php files
need to add database
removed emacs files, working on authentication
working on authentication
adding users management
added models
made episodes hide and show
added flash player, prepping to link videos
video player plays videos
improved routes
updated video urls
removed remaining php files
modified to use postgres
Added TextIO
changes to .idea directory
deleted .idea
updated views
Manual merge of #6
ENH: Fix bug on R script
ENH: change naming convention ONLY
ENH: Updated to integrate ANTS tools better.
ENH: Minor tuning of cluster usage.
ENH: Remove memory requirement for pipeline.
ENH: Add masking to the image correlation computations.
COMP: Fixed some warnings turned up by CLang static analysis
ENH: Add BRAINSSurfaceTools
ENH: Finished adding test data & tweaking tests
COMP: updated files from Slicer3 for Archetype reader/writer
COMP: Removed QuadEdgeMesh files that exist in renamed form in ITK4
COMP: Fixed erroneous testing data and incorrect ExternalData_add_test statements
COMP: Address warnings from dashboard
COMP: suppress warning messages in BRAINSResample, that were causing intermittent test failures
ENH: BCut Wrapper
Merge pull request #62 from reginakim/BCutWrapper

ENH: Wrapper and updates to BRAINSCut.
ENH: Added comments based on conversation with c.f.g.
ENH: added two template files for antsRegistrationTesting.
ENH: Added more ants tools to be nipype wrapped.
ENH: AntsRegistration wrapping
SQSH: Work in progress, added antsRegistration metric, and input images attributes
ENH:  Put WarpImageMultiTransform back in it's original file
ENH: Add the persistance check

A fast running node was added to do persistance checking
on the cluster.
ENH:  Modularized WorkupT1T2 with pipelets.

Added extended version of BRAINSABCext for output
parameters.
clean up code a bit, improve tracking
Atualização do menu e criação do modulo de importação de pasta.
rudimentary facebook selector functionality
create facebook friends with id
Now opens config.ini files from SUB_CONFIG_PATH global variable
Done somethingMerge branch 'master' of https://github.com/alexsleat/projectChimaera

Conflicts:
	Drivers/dwncam2/src/dwncamDriver.cpp
codec.chunk: Expand dynamic key names

Instead of using key names as-is in serialized messages, destructure
them from dot-notation into their originally intended hierarchical
form. If any part of the result would be an empty keyword, use an
underscore instead.

This fixes #5.

Signed-off-by: Gergely Nagy <algernon@balabit.hu>
Adding eclipse .project file to repository
Added some images on solution page. Added pagination to blog index
styling of browse page
Fixed changes
Resolving Merge Issues
Merge branch 'master' into newbranch
Now correctly attributing humps with cute plots.
Merge branch 'master' of github.com:ambivalentduck/resetManip

Conflicts:
	Matlab/checkemd.m
UI Nits: Metadata TextEdit double frame

For example the notes field on its own tab looks fugly
with a frame inside a tab (especially on a Mac). So this
patch removes the frame and background for a cleaner look.
Measures on LTMPlot got lost

When optimising for performance the measures
refresh was lost in LTMPlot. This reinstates
them.

Additionally, measures are now shown on the
metric list with a "(m)" after their name to
help differentiate them.
Fixed bugs in BB. Simplex and BB codes need cleaning.
Some code cleanings. Illegal calls now throw IllegalStateException.
Refactor UploadModal to be reusable and nice

Reuse UploadModal in Applicants
Add callback on UploadModal closing
Working on Employee QuickUpload
Add TODO comment
Fix doc wording
Increase unit test coverage to 100%
fixing url for segment home
task3 fixed
pwdmngr.py added. not complete yet.
data.db added.
Added Maxent External Optimizer

Added an external optimizer to be able to train a maxent model
fast enough to make sense to use one.

There should be a project in Go that has a fast and parallel
gradient descent optimizer
Added Classifier Based Tokenizer

More advanced tokenizers can be built using any classifier
1). Splites collection extensions into several

2). Added some randomisation functionality
3). Added some comments in statmachine classes
4). Fixed several small bugs in smarcollection2d and squarecollection
[Mod]
- css de la page clan avec les images :)
- image des bâtiments/technologies de "base" MAJ => no.jpg
Added podspec
Added support for using the enabled property to disable the refresh control.
Unregister before the scroll view is dealloc'ed.

Otherwise we get a nasty message and crash when the scroll view
goes away. Closes #16.
Merge pull request #15 from nicklockwood/master

Added support for using the enabled property to disable the refresh control.
Merge branch 'fix-scrollview-dealloc' of https://github.com/ppaulojr/ODRefreshControl into ppaulojr-fix-scrollview-dealloc

Conflicts:
	ODRefreshControl/ODRefreshControl.m
Restore some needed code
Fix beginRefreshing to match the original control. Closes #18
End refreshing only if it was actually refreshing
README update
fixes for KVO

Signed-off-by: Matthew Wilkinson <matthewwilkinson@MathBook Pro.(none)>
Support scrollViews with a content inset
Fix for tableViews with section headers.
As the fix will change the bouncy behaviour of the scrollView a bit, it's only enabled when it's actually a tableView with section headers.
Fix for tables with section headers and contentInset
Remove some apparently useless code, should fix #27
Merge pull request #4 from MSNexploder/podspec

Added podspec
Update podspec
added custom activity indicator support
UIScrollView does not implment numberOfSections
Merge pull request #31 from jwhitehorn/master

Compatibility with UIScrollView
It's probably better to use the class to check
Use %s, it's better
More dependencies
Do globally writable checks on directories, too
WITH_TLS not defined if we don't have openssl
Add boilermaker files for rlm_eap types
Fix indentation
Make rlm_ruby build for >= ruby 1.9.1
More ruby configure fixes
Swap STR2CST macro (no longer exists) for StringValuePtr
Install all SQL config files by default (they're needed by rlm_sql_null)
Add some missed src file reps
Properly parse identity in EAP-SIM module

The encoding is given in RFC 4186, section 10.8.
Merge pull request #136 from tobiasbrunner/eap-sim-identity

Properly parse identity in EAP-SIM module
optimised and adjusted filter

no longer case insensitive and not storing match
Merge pull request #137 from alanbuxey/master

adjusted filter and improved performance
Remove 'did work' warning, as it'll always be triggered if you're just using the module for group lookups

Print out DN we resolved for the user
Add cf_pair_value_type function to return whether the string was double or single quoted
DA should be const in pairalloc
Add attribute mapping functions to valuepair.c, and refactor previous list/request resolution functions
Declare radius_xlat return as size_t
Increment version.
Set NCP dependency to 3.7.4-b127 .
Add SpoutClientPlayer to default classes.