labofsahil/github-event-dataset-2012 huggingface dataset:
Change GameManager.loadLevel to use level id, rather than an array index

Mainly to work with the new Level.id. Makes more sense for the method to deal
with finding the array index from the level's id.
Add level slides and set up banner title
Update to banner
more speculative coding
Prettify code: refactoring
softBlocks fix:  BlockGrass -> BlockTallGrass

Quarry is not harvesting grass blocks (dirt with grass texture on top).
Added BlockFlower to softBlocks

Flowers are soft too.
Fixed import BlockGrass -> BlockTallGrass
Merge pull request #391 from smbarbour/patch-1

softBlocks fix:  BlockGrass -> BlockTallGrass
Update README and package.json to reflect name change
Add tournament tree
Updated teachers/Mike_Mikeson.md
Add delete_app example
Bump tentd and tent-client
Added inheritance ensembles and outputs for them.
Added and implemented some functions about virtual keyboard. It is seeable and seems not to crash. But, however, the input is still missing. ^^ Aaand I changed spInput.keyboard! filter is not anymore. I think, it is not necessary, I use the third paramter of spPollKeyboardInput now to determine, whether all buttons should be locked. To keep compatibility passing NULL/0 does the same as before. In fact: Even using 1 does the same, because the lock is a hint for YOU, YOU have to check with spIsInputLocked.
Forgot about a return type.
Revert "Code reshuffling and cleaning + minor UI changes"

This reverts commit baceafc5926567407791128a5539d1fb9305644d.
Revert "Revert "Code reshuffling and cleaning + minor UI changes""

This reverts commit c0918f4a4d21c80d9e459f34bb4c611e219cb28e.
Readding AlbumActivity: I am damn sleepy and doing some idiotic shit while committing
CHanging ALbumActivity class : keeping in sync with code cleaning and UI changes
Macro mania
functions
fixed screen_size() on Windows
Update res/values-pt-rBR/arrays.xml

Only a few strings for position words were changed to match real brazilian portuguese
Initial commit of cam updates
Remove DIYCamDelegateListener for now
DIYCam: swapped photo blocks for delegate calls
DIYCamDefaults: added video_gravity, fps, and max duration
Example project: linked core media for setting video FPS via CMTime
Example: fleshed out selector functionality and added some video stuff
renamed DIYCamLibraryOperation to DIYCamLibraryImageOperation
Added DIYCamLibraryVideoOperation to save videos to library
Re-added createAssetFilePath, now in DIYCamUtilities (should refactor to be smart about location)
DIYCam - working on video
DIYCamLibraryVideoOperation: fix an oops
DIYCamLibraryVideoOperation: cleanup
Be opinionated about gravity
Example: throw exception if segmented control is out of bounds
DIYCam: only call delegate camcapturestarted for video; 'processing' is sufficient for photo
Merge pull request #3 from dongle/v1.0.0

V1.0.0 - video stuff and updated example
DIYCam: purge should be ok now
Merge pull request #4 from dongle/v1.0.0

DIYCam: purge should be ok now
DIYCam: purge mode when releasing objects
Roughed in video thumbnail generation
fix quest I was a lot of things
added css style in user admin account page, added bool custom string to boolean conversion
Create Blala class
Fix layer selection.

Calling this method unselects the currently selected layer.
So, save it and re-set it. Weirdness.
extract AddReleaseFormViewModel
working on ex36
rss git-prompt feh
renamed test file.
Do not add post until AJAX request completes. Also, add progress indicator.
Moved all post related code to post controller.
Fixed incorrect ID for spinner.
More posts link now fetches posts via AJAX.
Posts are now in descending order.
Adding posts data endpoint
Adding extra permissions to the facebook login
Added simple Hello, World! program.
Update some snippets for objc.
いつものbootstrap
Cleaned the space, removed the not needed files, and added a green background color for the completed tasks
Finished Implementation section. Handing over to Raphaël for final check and submit.
Descending set
asd
new theme
reconfigured build script
new gui components
0.11g
Model->save() now works (with StoreMysql driver)
Model->delete() now works
More improvemets in the base module
Fix show the inline nav right button if relaoding the grid thanks to winzip
meilleure précision
.bash_colors追加
copied tegra_olympus_android_defconfig from olympus
upd device_lge.c
Don't display sys.maxint as a build version.
Coding style fixes.
Fixed looking for MySQL
Add FCP parsing, update phylosift parser to output annotations file into Annotate/out direction, not Assemble
Add FCP support to propagate
Merge branch 'master' of github.com:treangen/metAMOS
Created DashboardWindow which is equiv to the original Tomboy RecentNotes view
This will provide uses with a global view of notes, search and other such items like original tomboy

Also added menu options to the Dock. The New Note isn't working, but the Search Notes is.
Synchronize has not been implemented yet.
Implement @valid tags for applying validators to both entities and value objects. Validators are anything that is_callable. Also works for Zend 1.x and 2.x validators.
Add Apache configuration options.
tweaks of various sorts
explicit 256 color, tomorow scheme, ft json, set -x for my slow ass zsh start
Merge branch 'master' of github.com:trinary/dotfiles
added darker theme for some screens
cleaned up To Do list
added respond plugin, converted from  middleware
added content negotiation plugin
Fix Buy/Sell Button in DetailActivity
added dz 4 as submodule
Log level changed from info to debug
ui fix
regulator fix
fix
fix
fix
fix
special signal in EDP for unexpected failure handling
force sensor fix
mrok ma ikonę i wymiata
mr icon changed
imu_acc added to edp_manip
fix'es
fix'es
fix
fix
edp fix
exp
Xi_star class added to mathtr
imu in progress
fix
Initial commit of SGDMonoid
Removed unused code
Merge pull request #25 from johnynek/feature/sgd-monoid

Initial commit of SGDMonoid
warmUp
Change events to be serializable
adding git ignore file
adding original source files
fix bug 768857 - Fix alignment of H! tags
This adds two models -- Attachment and AttachmentRevision -- which
represent a file and its revisions. Attachments have a concept of
"current revision" just like Documents do, and any arbitrary revision
can be made the current one.

Attachments store a MindTouch ID, but not solely for bookkeeping
purposes. Because MindTouch's file URLs use the resource ID as a
unique identifier, we have to keep that in order to redirect MindTouch
URLs correctly. Their revisions store a MindTouch ID solely for future
migration bookkeeping; that field can be deleted later.

A ludicrously simple and possibly broken file-serving view is present,
and should be replaced with real views (coming in a future set of
commits).

Documents have a new property -- 'attachments' -- which returns a
queryset of Attachments for the current revision of the Document. At
the moment this is done by scanning the HTML for URLs matching the
MindTouch file URL pattern. This will, once kuma's own real file URLs
get settled, also look for those.
Bug 761826: Handle legacy MindTouch file URLs.

This is simply a URL pattern and corresponding view which responds to
the MindTouch file URL scheme, looks up the correspondong kuma
Attachment, and issues a redirect.

It is relatively future-proof for the case where kuma's own file URL
patterns change (very likely), and is testable independent of having a
fully-migrated set of files (very handy). Test cases are actual
MindTouch URLs, with corresponding dummy Attachments created so kuma
has something to redirect to.
Merge pull request #313 from darkwing/header-alignment-768857

fix bug 768857 - Fix alignment of H1 tags
fix bug 768859 - Remove syntaxhighlighter advertisement
Merge pull request #312 from darkwing/remove-syntax-about-768859

fix bug 768859 - Remove syntaxhighlighter advertisement
Allow border-radius.
Merge pull request #316 from a2sheppy/master

Added border-radius to the CSS whitelist
Added "align" to list of allowed p attributes.
<td> should allow colspan and rowspan atributes
fix bug 768542: Update School of Webcraft links.
fix bug 764426 - Prevent slashes in slugs from form
Preventing buttons UL from overlaying the info icon
Merge pull request #317 from openjck/768542-p2pu-link

Bug 768542: Updated links to School of Webcraft.
fix bug 764998 - Fix context menu display
Merge pull request #319 from teoli2003/master

Added support of colspan and rowspan attributes for <td>
Added CSS list-style-type to the whitelist
Added CSS property 'font-family' to whitelist
fix bug 769559 - Making the redirect message smaller, nicer
Merge pull request #322 from teoli2003/master

Whitelisting needed to make Template:CSS_Ref work perfectly
Updates GitHub link.
reflection.SmartCopy()
Merge branch 'master' into sharejs

Conflicts:
	index.coffee

Signed-off-by: Juan Esteban Bernabo <juan.bernabo@gmail.com>
Spike to learn SharedCollection
Huge restructuring of file structures

- Each class is sitting on it's own file
- Several classes now are included by including their package (index.coffee) like app/client/remoting or app/server/remoting or app/server
Added the functionality to insert a column.
push all my code to github
removed LocalRepoError.debug and added 'log' to Config.TYPES
mod: git alias; path
Add initialTextFieldValue to Essay
Adding tests for html.
Adding license. Will publish for easier installation :-)
печатаем еще и 12 теперь

Signed-off-by: vard <an.skornyakov@mail.ru>
Merge pull request #1 from vard/anton

печатаем еще и 12 теперь
db-guide angepasst
better nice(2) example
better example
Initial commit
my easy steps to install Arch
Merge branch 'master' of https://github.com/venam/venam_repo
A try at coding a skype cracker, but unfortunatelly this is not really efficient.
A non-orthodox way of spamming emails
Update master
Update master
my conky configs
Merge branch 'master' of https://github.com/venam/venam_repo
Update master
Update master
Update master
Update master
my user .bashrc
Merge branch 'master' of https://github.com/venam/venam_repo
my emerald icons
my easy steps to install Arch
Merge branch 'master' of https://github.com/venam/venam_repo

Conflicts:
	README.md
minor stuff to syn up with Matt's backend changes (installations vs installation, validation, etc)
Merge branch 'master' of github.com:veos/veos.mobile
Added location.refresh on clear to refresh endpoint and token
fixed invite_financee select groom/bride to render when user is female
use any debug. otherwise this happened to be the module chosen by component, which doesn't have the .component specified in the package.json causing our builds to fail
Added Codebase API.
- Drag and drop.

- Fabric JS.
Fix url path duplication for deeper paths
Add PATCH support (fixes #3)
Added Initial C Files
Enable tomorrow theme, if exists
[maven-release-plugin] prepare release memvache-0.3.0
[maven-release-plugin] prepare for next development iteration
Merge branch 'release/0.3.0' into develop
Fixed ignore reserved kind at QueryKeysOnlyStrategy refs #6
jekyll commit
jekyll commit
Check that a controller inherits from Ember.Object 
before instantiating it to the router.
Fixed selecting items in ember multi-selects

Worked fine through the API, but when you manually clicked on an option
it would loop around and select the option two in front of it.
Adding itemViewClass attribute to the each helper.
Add test for selecting in multi selects with prompts
Fix formatURL to use rootURL and remove formatPath
Adding rootURL test for formatURL
Update packages/ember-handlebars/lib/helpers/each.js

Removed unnecessary comment.
Adding documentation for blockless use of each

Added a description on the documentation on how to use "itemViewClass" with the each helper.
Fix documentation on what Ember.tryInvoke returns
Merge pull request #1330 from wagenet/error-handling

Improve global error handling for Ember.
Create error props array once
Update packages/ember-runtime/lib/ext/function.js

Removes stray comment from the days when cacheable wasn't the default.
fix scheduleOnce args
refactor _insertElementLater to use scheduleOnce
change handlebars bindings to use scheduleOnce
fix :: syntax in classNameBindings to work with falsy values
Invalidate element on parent and children

There's an observer on element that will trigger invalidation on
children.
Fix issue #1356: a small typo in doc
Computed prop setter improvements:

Setting dependent keys with not trigger change through
dependent key from inside the setter (but will still
cause the change event for other observers).

Setting a CP to the same value as is already cached
will not cause a change. 
Document the history location implementation
Add support for lists.
Add searchCollection function.
Merge branch 'master' of github.com:wagnerrp/pytmdb3
note about the DO_NOT_DELETE
Add server tls config test
Update Readme.md

one liners don't need the newline right? :)
Merge pull request #237 from walmartlabs/user/eran

Response refactor
Adding a few tests
Merge pull request #244 from wpreul/develop

Adding a few tests
Merge branch 'develop' of github.com:walmartlabs/hapi into user/eran
Cleaned up startEngine-function
init
Merge branch 'master' of https://github.com/waymondo/bootify

Conflicts:
	README.md
add https://rvm.io/binaries/osx/10.7/x86_64/ruby-1.9.3-p286.tar.bz2
NEXT: no more 1.15
fix generating config file for rubies, fix #1254, fix a41ede1
NEXT: 1254 for 1.16.17
enum as int
List may now return identifiers; Unserialize now accept the identifiers option
created description text  - now need to make background image
Adding bubble background image and updating show effect
added bubble source image
Merge pull request #49 from wdbccc/feature/descriptions#29

Feature/descriptions#29
removed __SessionCache and replaced with webnotes.clear_cache
fixes in support ticket and email settings
fixes in support ticket autoreply
fix in todos and email settings
change date field for sales invoice in sales personwise transaction summary search criteria
add unique constraint to tabSeries name column
cms now powered by jinja2
Merge branch 'master' of github.com:webnotes/erpnext into cms2
fixes in quotation item code get query
Merge branch 'master' into dev
Merge branch 'dev' of github.com:webnotes/erpnext into dev
New copy of 2012-12-04

git-svn-id: https://svn.generic-nic.net/NIC-generique/iana/whois@12497 e62f009e-d044-43ae-9900-873abb462db7
New copy of 2012-08-26

git-svn-id: https://svn.generic-nic.net/NIC-generique/iana/whois@12304 e62f009e-d044-43ae-9900-873abb462db7
Remove duplicated/redundant info
Use Maven versions plugin to update versions
Fix version numbers
Prepare for 7.1.2.M1 release
Prepare for development of 7.1.2-SNAPSHOT
Update Archetype guide to recommend using JBDS
Remove test dependencies

fixes #269
Fix #274: tasks README is missing the step to start the server
Fix #277: remove hibernate-validator and junit from kitchensink-ear parent POM.
Partial fix for issue #245: Dual branding for kitchensink-jsp
Re-add dual brand
Partial fix for issue #245: More dual branding for kitchensink-jsp
New quickstart for asynchronous EJB invocation
Minor changes

* Update readme
* Use standard names
Partial fix for issue #245: apply dual branding for hibernate3
Fix OpenShift instructions, issue #291, developer and doc links.
Partial fix for issue 287. Still waiting for BOMs
whitespace
Update BOM comments
前段增加图片展示类型参数type
use new xmpp4r branch, set history through config
Add an option to specify the maximum template depth limit
Verify the template instantiation depth limit
Do not use new...
Merge branch 'feature/template_instantiation_depth_limit' into develop
Use std::vector instead of dynamically allocated arrays
README
james add
Merge github.com:wickett/gauntlet
ディレクトリの区切りを間違えた
selfpage
initial the pom.xml
Added setup-path.sh to add symlinks to pintos binary, etc. in path
Merge branch 'master' of github.com:willscott/pintos
Make logo image smaller.
Change gold colours to orange to match logo image
Remove meta rule nonsense
fix box2d example
拡張子別のロード関数を登録できるよう修正
i do now
Add sample script to create repository
Updated all jquery-tools JS files
Moved required CSS to its own file
Update scripts/lib/Vector3D.js
vim: add haml
asdf
Merge branch 'master' of git@github.com:wuzhelan/yangbin.git

Conflicts:
	test/src/Test.java
aa
Merge branch 'master' of https://github.com/xdream86/gitTest
Re-Updated README.
repository fix
json string fixed
typo fix
Add listeners list
change the frame path
Signed-off-by:Paul <xiyuera@gmail.com>
Beautify the url - remove the script name "index.php"
Signed-off-by:Paul <xiyuera@gmail.com>
edit the configuration at timezone and language settings
Signed-off-by:Paul <xiyuera@gmail.com>
require less component
Signed-off-by:Paul <xiyuera@gmail.com>
require less component
Signed-off-by:Paul <xiyuera@gmail.com>
require less component
Signed-off-by:Paul <xiyuera@gmail.com>
enable bootstrap
Signed-off-by:Paul <xiyuera@gmail.com>

Signed-off-by:Paul <xiyuera@gmail.com>
added expUp() for managing exp upgrade
fix bug [users] User avatar is gone when just submit form without any uploads
Merge pull request #6 from suin/issues/15

[users] User avatar is gone when just submit form without any uploads
Separate Model RatingList. Correctly remove unused files.
updated confidence-interval examples and doc
rescaled FFTs to match ifeffit, use xafsft_fast more consistently
added feffit examples (still needs work)
added display style for div, link, meta, script
changed div to span because div causes an extra \n being a block
added unit test for malformed URL (& not encoded in href)
Added #error to prevent compiling of DTHTMLParser without ARC.
Added Emoji MacUnitTest test case
remove extraneous newline in span generated from attributed string color
Merge pull request #123 from jonklein/master

Extraneous newline at the end of attribute spans in [ NSAttributedString htmlString ]
Improved support for object tag, implemented CDATA callback because CSS style blocks are returned as such.
Implemented CDATA
Added test case for whitespace handling in PRE tags
Added demonstration of using OBJECT tag to put a custom view in the document.
providing a custom view for an object tag in demo.
Added explanation
Fixed whitespace handling for PRE
Fixed AppleDoc comments
Added NSAttachmentAttributeName as replacement for "DTTextAttachment" key
Implemented basic vertical-align support for attachments
added output of vertical-align for attachments in htmlString
Added vertical-align to image demo
moved image vertical alignment through used font to DTHTMLElement because we know the font at string building time.
Updated header. Suggested by Jonas. Thanks.
Борис Мудрук +
Merge pull request #32 from moodruck/patch-1

Борис Мудрук +
updating video classes
Add room's alloc ctrl  datasource
Fixed QC for rnaseq to work with paired-end samples
New implementation of power-based decay.
Normally working async auth
simple File backend for storing OAuth tokens
Fixed bug accidentally placed when writing Gaussian thermostat with *= operator overloaded for vectors. Fixed segmentation faults occurring from certain uses of the -t option.
Pinpoint revised
页面底部加入调试参数显示
创建用户显示页面，加入显示动作
添加factory_girl_rails并初始化示例用户创建
修改用户显示页面基本布局，修改测试参数，使factorygirls运行更快
完成用户注册页面的添加
Fixed instant finish Error

fixed finish all constructions
Auto Update Script 2.0

No need of updateing multiple times if u missed previous updates.
1click = Full update
Merge pull request #106 from akshay9/master

instant build Fix
Implement View Transaction as a pop-up alert dialog
Fixed Issue #2: Bitmap is fully scaled now, no longer cropped
Fixed low resolution image problem, and fixed SQL_Transactions Blob crashing when viewing image
New feature: click on image to open it in Gallery, also added background loading when loading individual transaction content to prevent UI lag
Fixed initial balance edit is not reflected on final balance
Added about screen
Added support for ldpi resolution, and changed icon
Extract opengl rendering into a dedicated class
Päivitetty etusivun tekstejä
Added READE

Just tidying up
Merge https://github.com/Mottie/Github-Dark
fixed stylesheet
Merge pull request #3 from kanzie/master

Welcome to Mottieland
Add GAWK.md
Updated POM and custom Netbeans actions to support rebase --skip.
add compiler gjslint
日  5 13 16:15:19 JST 2012
日  5 13 16:16:36 JST 2012
Use glew consistently, print shader log
Added Yak.Js project
add new post, starting to add content
updated zshrc by adding to PATH -- related to rvm
Merge branch 'master' of github.com:zan5hin/dotfiles
Dispatch updates (persistence and commands)
Merge branch 'master' of github.com:zbanks/musicazoo
Add some dependencies, plus finally remove ws
Remove old reporting system
LatLng selection from map added

- Add "click" event listener in Marker view for populating LatLng fields
from map
-Repaired bug when markers with no desription caused JS error
[APPS-218] Fixes links not opening in a new browser tab, and adds an option to allow forcing opening of links in the current window
Change terminal launch sequence
update git info in prompt
local (420s) merge fixes
more description and a note
changes to modules and config
changed startup routine, added some auctex stuff
added long fact schema
fix for ddx9
Organize code a bit better
practice 2.6
Update apache2/sites-available/default
Fixed pyflakes problems
Remove even more old code
Add launcher icon for all resolutions

So far there was only one launcher icon in a non-conforming size in the wrong
density directory.

This commit adds launcher icons for all densities that conform with the
[specified sizes][0]. In addition their naming scheme follows the [common
conventions for icon assets][1].

 [0]: http://developer.android.com/guide/practices/ui_guidelines/icon_design_launcher.html#screens_table
 [1]: http://developer.android.com/guide/practices/ui_guidelines/icon_design.html#design-tips
Add `ActionBar` logo

So far the `ActionBar` used the laucher icon as the app icon.

This commit introduces a dedicated logo that is used as the app icon in the
`ActionBar`. In contrast to the launcher icons, `ActionBar` logos don't have to
be square and may take advantage of the available horizontal space.
Demo `Gingerbread` style status bar icons

Introduce a custom [status bar icon][0].

 [0]: http://developer.android.com/guide/practices/ui_guidelines/icon_design_status_bar.html#icon9
Demo `ICS` style status bar icons

This commit introduces [`ICS` themed][0] status bar icons.

 [0]: http://developer.android.com/guide/practices/ui_guidelines/icon_design_status_bar.html#icon11
Clarified magic numbers
Fixed issue with running install multiple times causing appinit value to be erased
fixed links in archive and category
rm tag.php
Changelog 0.2
adjusted a sample image to be 300px
for supportting of_0073
dis_chargeup find a bug
fix bug chargeup dis_state=DIS_CH4
Rewrite People.
add intelligent prize drawer
to retrieve the full width or height you can reference the parent
remove svn folders
忽略svn文件
Add CanvasPlugin to the default build.
Fixed bootanimation size for grouper

In bootanimation_1280_800.zip desc.txt contained 720 x 1280 resolution. I fixed it to proper size 800 x 1280.

Change-Id: I1197fe97b22e55f16326341858456f7453312169
Signed-off-by: Petr Reznicek <kecinzer@gmail.com>
Grouper:  Default WiFi and WiFi sleep policy settings

The current default settings are more geared with phones in mind.
This allows devices such as grouper that only use WiFi data
networks to have more desirable default settings.
Fix up wrong channel layout and subformat due to changing format.m_dataFormat for passthrough to AE_FMT_S16NE to early. Passthrough formats working again. Removed logging of device enumeration as now handled by AESinkFactory on start-up.
[AE][ALSA] Added AE_CH_UNKNOWN1-8 for p16v devices
[fix] - refactored CCoreAudioAEStream::GetFrames a bit and implemented volume clamping for fadeout
[change] - use DVDAudioCodecFFmpeg and get rid of DVDAudioCodecFFmpegLpcm - obey the lpcm gui setting
[AE/CA] - implement the mute methods into CA
[fix] - removed unused function and bogus use of GLInt
[fix] - DllAvCore is deprecated
[fix] - correcting the usage of std::string when handling device names
[AE/CA] - don't wait on more room during AddData when we are paused.
[AE/CA] - fix upmix when channel layouts don't fit
[fix] - fix missing include after e064049
[fix] - fixed fading and use the right AEUtil functions of it (due to refactor of main branch)
[AE/CA] added the encodedRate thingy we don't use it in CA
[osx/ios/atv2] - sync xcode projects
[AE] fixed DTS stream parsing issues with block sizes
Merge pull request #43 from DDDamian/AE

Fix up wrong channel layout and subformat due to changing format.m_dataF...
Merge pull request #42 from huceke/AE-restart2

OSX/IOS/ATV2 CoreAudio sync
improving the getopt and preparing to actually do some work
add testcase & bug fixed
add testcase & bug fixed
Merge pull request #48 from wenshao/master

add testcase && bug fixed
implement javax.sql.ConnectionPoolDataSource
o Bugfix: Sometimes unclustered markers where vanishing when there was a possibly clustered marker nearby
l'id de joueur correspond à la place dans le tableau
Implémentation de minimax à 60%
Improved calculations of distance between two points
Changes in cluster annotation mechanism
Changes in generation of annotations
Commit user state
Signed-off-by: Toney <458820281@qq.com>
Merge branch 'zhangjun' of git@github.com:App-coder/xmaicrm.git into zhujun

Conflicts:
	WebContent/resources/css.css
	build/classes/com/crm/report/action/XmIntegradedreportsController.class
	work/org/apache/jsp/WEB_002dINF/desktop_jsp.class
	work/org/apache/jsp/WEB_002dINF/desktop_jsp.java
Merge branch 'zhangjun' of git@github.com:App-coder/xmaicrm.git into zhujun

Conflicts:
	WebContent/resources/css.css
	build/classes/com/crm/report/action/XmIntegradedreportsController.class
	work/org/apache/jsp/WEB_002dINF/desktop_jsp.class
	work/org/apache/jsp/WEB_002dINF/desktop_jsp.java

Signed-off-by: Toney <458820281@qq.com>
Merge branch 'zhangjun' of git@github.com:App-coder/xmaicrm.git into zhujun

Conflicts:
	WebContent/resources/css.css
	build/classes/com/crm/report/action/XmIntegradedreportsController.class
	work/org/apache/jsp/WEB_002dINF/settings/basic/role_jsp.java
Merge branch 'zhangjun' of git@github.com:App-coder/xmaicrm.git into zhujun

Conflicts:
	WebContent/resources/css.css
	build/classes/com/crm/report/action/XmIntegradedreportsController.class
	work/org/apache/jsp/WEB_002dINF/settings/basic/role_jsp.java

Signed-off-by: Toney <458820281@qq.com>
Merge branch 'zhujun' of git@github.com:App-coder/xmaicrm.git into zhangjun
Signed-off-by: mxzjzj <mxzjzj@gmail.com>
Signed-off-by: Toney <458820281@qq.com>
Merge branch 'zhujun' of git@github.com:App-coder/xmaicrm.git into zhangjun

Conflicts:
	build/classes/log4j.properties
	src/log4j.properties

Signed-off-by: mxzjzj <mxzjzj@gmail.com>
Merge branch 'zhujun' of git@github.com:App-coder/xmaicrm.git into zhangjun

Conflicts:
	build/classes/log4j.properties
	src/log4j.properties

Signed-off-by: mxzjzj <mxzjzj@gmail.com>
better layer api reflected
Remove bad recommendation and detail support for Modular Sinatra Apps

Change-Id: I0261af66fad7c1e04bc708e7ad24391f7a6c120b
Merge "Remove bad recommendation and detail support for Modular Sinatra Apps"
Still working on performance issues
Fixed flags for BIT
added clojure_poll gitignore
change dependency from clojure 1.3.0 to 1.4.0
added gitignore
changed alot
Implemented collisions with other snakes
Fixing error in single type checking example in README
perus käytöt

Nyt voi lähettää HISSI#-alkuisia, ID#-alkuisia, sekä pelkän osoitteen
sisältäviä maileja, ja palvelu vastaa jokseenkin järkevästi
Adjusting Matt's twitter link
fixing check_profile method
fixing adding new admins
some spec to test user saving
when profile is nil
Added measuring time and memory in supervisor. It still needs some work
though.
Revert "Make OMX mm-video libs compile for MSM7x27"
- found it's already there after changing branch...
Tweaked C4Label, added class initializers, added pause method to C4Movie
Committing before working on SEED prototypes
Commit before tailoring header files for universal framework build

I will remove the guts of the blanketed C4Import.h and making sure that
every file can compile on its own
[SEC-34] Revamped Makefile and sources. Needs SLC5 support
Use getenv for getting the PATH
Add Shunlist
fix date parsing in shunlist
update weights, fix URL for sshbl
fix autoshun module
donot explode if there is nothing to display
TFS Client OM and native binaries updated from TEE-11 release 20121212
Adding mandatory_keys array to app_config
Ensures update_updated_at_trigger is added whan duplicating tables
fixed specs from cartocss editor and Ctrl+s/cmd+s implemented for both editors
Merge branch 'develop' of https://github.com/CartoDB/cartodb20 into develop
Zurück zur Basisseite funktioniert wieder
Amend read me.
Revert "Revert "2.3""

This reverts commit fe4eb815df296b9dedbceec2a4fc50d4e3e6862e.

Conflicts:
	GlobalLib/WDNav.cs
Explain use of uint and long
Added nethack config
The update of the ability of editable paddock basic information.
修正鼠标移动到注释行首箭头图标上的时候显示错误 ， 改-〉该
Clase archivo e implementacion
Change package naming to org.chorusbdd.chorus
Reference JMX_EXPORTER_ENABLED_PROPERTY from ProcessHandler so as not to duplicate the property name, make it safer for future refactorings
réalisation entitymanager commentaireCinema + tests correspondants + couplage avec action detailCinema + tests correspondants action + redirection connexion/déconnexion vers page courante + modif base de données et persistence + style jsp identification et commentairesCinema
Moved the Variables up top

Got rid of a few errors
moar GUI goodness. yum.
created world channel

Signed-off-by: CorriePie <corriekay.pinkie@outlook.com>
fixed incorrect getter/setter methods.

Signed-off-by: CorriePie <corriekay.pinkie@outlook.com>
Reverting last commit.
Need to figure out a better way to handle ID's for private messages.
Linea Base LB1
Resubiendo Docs
Merge pull request #2 from CriVasquez/Documentos

Documentos
Fix a bunch of xpath paths to pull out correct unixref data.
Removing node, page is the new parent class
Added first content pages and loading screen
Arreglado el problema de el merge
remove another for loop
package.json: fix missing comma
readme: add a couple of contributors to the list
- Added content completion
- Commented unused import in Lift.rsc
unworking test
initial import of fubu.exe code
Case icon support and form layout changes
Auto-focus first field on case edit form
Add button and menu icons
Minor bug fix.
Merge branch 'devel-wyilregs' of github.com:DavePearce/Whiley into devel-wyilregs
cluedo v1.0
postspam template
No longer hardcode the git repository
Endring i Appointment
Change internal names given to original callers

Fixed the internal names given to the views from where update & download
are called from so that the link 'Back to list' takes users back to the
view from where they originally initiated the action
Code Cleanup, Advanced colour Checking, TabList colours [Doggy]
Fix: strict mode tour
Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop
Fix: for compatibility and avoid error if external module use
$conf->module_parts
New: Show company in contact box
Merge branch 'develop' of ssh://git@github.com/Dolibarr/dolibarr.git into develop
Use stable url.
Merge branch 'develop' of ssh://git@github.com/Dolibarr/dolibarr.git into develop
Fixed small drawing bug
Moved all debug cross code to DebugCross
[ticket/11103] Trying to fix an odd issue with unread status on approved posts

From a recent change, when your posts/topics are approved, they will be
marked read automatically because you've read the topic/post already.

To change that I've forced the notification to be marked unread and
attempted to reset the read status on the post/topic to be unread before
the post that was approved.

This does not seem to work so well and I don't know of any way this can
really be properly fixed, so the code I was working on I've commented out.

For now, users will just need to manually mark these types of notifications
as read. I cannot think of a way for this to be fixed without running
two additional queries on every viewtopic.

PHPBB3-11103
changement de saisie v2.1
Agregado hasta el punto 1.6 y Script de la Bd
rapport+++++++++++++++++++
Added a few global variables & subroutines

Also added some commenting.
Update readme.md, a change to git clone command.
Use regular expression
Use sshclient object
Merge from Perforce
Fix the incorrect prompt in exit_shell()
Merge branch 'bug/remote_login'
Removed devices, which I dont need, and added my repo
Code cleanup, added upvalues for Blizzard API functions.
Merge branch 'master' into mop
Fixed old names from merge.
don't look at me
cop out of programatically determining plurality
Short code iteration

Improved the Token instance (everything is now a Dictionary), added more
comparisons for benchmarks and added more numeric functions.
Merge pull request #1 from GZanmiller/master

Mark Needs to Update
Woo
Merge pull request #13 from gorionmark/master

New Stuff
Updated version to 1.3.2-R3.0 in pom.xml for RB.
Update Bukkit for Minecraft 1.4(.2) changes.
Add isHardcore API to check if the server is in hardcore mode or not. Adds BUKKIT-2707
Add default DifficultyCommand. Partially fixes BUKKIT-2671
Remove invalid tab completions from DefaultGameModeCommand as player names are not an accepted parameter.
Add default WeatherCommand. Partially fixes BUKKIT-2671
Expose setBedSpawnLocation with force option. Adds BUKKIT-2709
Add default SpawnpointCommand. Partially fixes BUKKIT-2671
Add setDocument to set document-related variables once per document
Add :target and :root selector support. Supplements gh-44.
Size optimization
Remove :active support until we have a comprehensive solution. Supplements gh-163.
Revert contains changes. Other minor edits.
Prefer window.document when sorting disconnected nodes in IE
minor bug fixes and size reductions
Use preferredDoc in fallback sorting algorithm for disconnected nodes
Only set document when it has not yet been set or the context is different to avoid the extra function call
|| null unnecessary
If context is null, don't call setDocument. Always assume window.document as the context for Sizzle.matches (not the last used document).
Initialize to the default document, stick vars at the top for compression
Remove unnecessary document check in the main Sizzle function
Merge remote-tracking branch 'remotes/jquery-original/master'
fix strange videos behaviour that adds extra data to videos json string from youtube
Added ipython to requirements
Update docs/devel/source/environment/windows.rst

Troubleshooting:
- distribute doesn't install (wrong python arch)
- virtualenv fails (old version already installed)

Added fork on github step.

I experienced all the above on my machine with ActivePython 2.7 installed.
Initial OS X requirements
Merge branch 'master' of github.com:hasadna/Open-Knesset
Specify ~/.bashrc
Better wording
Merge pull request #28 from jonmrjr/patch-1

Update docs/devel/source/environment/windows.rst
Merge branch 'master' of github.com:hasadna/Open-Knesset
Proper rst formatting for pull request #28
Complete OS X install docs
OS X isntructions in README
adding agenda description to agenda/vote page
Merge branch 'polyorg' of github.com:daonb/Open-Knesset into polyorg
Merge commit '9b79f7c' into upmaster

Adding astupidog's fix for youtube json
Make the CSV view search its own methods, so we can modify the CSV output before it's rendered
bin/django => python manage.py
Merge branch 'master' of https://github.com/Irish4/Open-Knesset
Merge pull request #30 from Irish4/master

adding agenda description to agenda/vote page
Merge branch 'master' of github.com:hasadna/Open-Knesset
Season orders and inventory tabs.
Renamed the files to what I originally wanted
some changes that i forgot to commit
add zoom and tap to scrollView
clean up
add Qwert.* (getLogicalDriveStrings getLocalDrives)
deleted obsolete commented ColonifyIP6()s
made playerlist scroll nicely
moved login page to index
uncoupled tap_features and moved tour content types into tap module
make modules drupal.org compliant by passing the coder module reviews
Fixed banner layout.
Added category method definitions.
oleg777
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/views/layouts/application.html.erb
oleg778
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/views/layouts/application.html.erb
oleg779
Merge remote-tracking branch 'remotes/origin/develop' into develop

Conflicts:
	admin/Lib/Action/BaseAction.class.php
Merge remote-tracking branch 'remotes/origin/develop' into develop

Conflicts:
	admin/Lib/Action/BaseAction.class.php
Merge remote-tracking branch 'origin/develop' into develop
添加underscore.string,并为它增加额外的工具方法
添加underscore.string,并为它增加额外的工具方法
Lorem Ipsum.
man thats a bunch of changes :-P
Initial transfer of scripts
Base Platform Game which implements sprite groups, collisions, and background. And Basic GameScroller.
Merge branch 'master' of github.com:JacenLakiir/Vooga
fixed hud widgets, added new dataproxy
merge fix
Disable natural hordes properly.
Updated CHANGELOG
Fix a crash with the boss spawn announcing plugin.
Patch for the jockey glitch.
Document more changes.
Use l4d2_direct to adjust tank flow.
Fix example
Fix issue #9, there was race condition in Cache
Add skeleton for DebugEngine
Small performance improvement in Cache
Yet another fix for concurrent instance cache
Make sure that JUnit does not complains about missing tests in TestUtils class
Skeleton of Maven Site
Skeleton of Maven Site
Automatic page generation
Final version of site deployment
Update CNAME
disable twitter
Fix google group url and issue urls

The issue URLs pointed to JMDB4 instead of MapDB, and the google group link suffered from the same problem :-(
Add Kotlin language support for Unit Testing
fix typo
Rename 'transaction' to 'journal'.
MapDB will get full MVCC transactions latter, but implemented at different layer. Renaming prevents confusion.
Introduce RandomAccessFile safe-mode
Some benchmarks written in Kotlin
Merge pull request #14 from rtreffer/master

Fix dead links in Readme.md
Small memory consumption improvement in Cache
add myoffice
finished function #6, and added notations
Changed light size, enemy run speed, enemy hit box.
New Tested for markdown syntax
Added logout packet event and mapping
Added secondary object action packet event and mapping
Made method names in Payload class consistent
Remove type aliasing and define new types where appropriate in
PacketDecodingService
Added style change packet event and mapping
Removed aliases in PacketEvents and created an object to define type in
persitent
csrf again
gui: Small style/usability fixes.

Add accelerator (F) to Edit->Find.
Add accelerator (N) and shortcut (Ctrl+N) to File->New.
Rename "File->New" to "File->New..." to indicate, that dialog will be showed.
gui: Fix crash on trigger actions without loaded trace-file.
gui/apitrace: findFrameStart(), findFrameEnd(): Do nothing, when passed frame is null-pointer.
gui/mainwindow: Add functions that toggle actions enables and use it.

Added enabling/disabling of few more actions.
Cleanup .ui file (set actions to default state).
Trying to change the logo
uhh vi kan spille spillet !!
added gunicorn
moved db
added procfile
moved routes external of main
added default index
added postgresql support
set heroku info
reduced workers
Merge branch 'master' of https://github.com/Kozzii/GoldStar-1
Merge branch 'master' of https://github.com/Kozzii/GoldStar-1
got from matt
setup for heroku
pulled from walt, changes
Update README

Change Type Number from 255* to -1
Teste funcao header ao inves de javascript.
lolilol
Merge branch 'master' of github.com:Labo-Web/Labo-Web
Commit modif models
merge gitignore code_verif
Changed maximum_limit to 50000 for SBCatDB + changes to match changes in SBCatDB module
Minor SYS\Module controller developments.
Core\CatLab->subListCombined() introduced.
\Webshop\Cart::deleteCart() fix.
Test de générateurs
Tests divers.
Creation de méthode de mise à jour de metablocks + SQL en cours ()
Updated mapping to initial (compiling) implementation of EBUCore 1.3 and the updated dictionary (part of the upgrade path to EBU Core 1.4).
removing readme so I can add it back to see if it works
will github be ok with this?
Added some question repositories as JSON files.
Minor rc improvements
Northern.tmTheme is now the actual output of the ruby call
mixed up pash
mixed up pash
remove preinstall of mysql
Fixed the search problem
cut out the black tile
Main panorama

Fixed the weird margin behavior.
Preview Form Added.
Add changes needed to make InkWidget function correctly.
Small layout changes in CLI module
Updated UserManual for CLI module to descript XML validation combo, and fix icon
Fixed stdout and stderr reporting
Close #712
Nathan Green - First Checkin

This checkin includes the first few extra credit including the solution
for finding the nth highest number.  It is a poor solution though
(nested for loops).  Would like to do this recursively.  Attempting that
next.
Worked on collision boxes and on rectangles
Update JSON Aktualisierungsfunktion
adaptari pt verificarea conditiei 4
Decode to text date on feedback
Ads randomized on Bookmarks
cursor
Merge branch 'master' of https://github.com/Minjammben/Exxile

Conflicts:
	client.html
	input/input.js
add mailer model and begin setup
add mailers
add forgotten view
heroku push problems, deleted rails and jquery versions
modified javadoc
Merge branch 'application' of github.com:Nagian/Roomanizer into dev
added some exception, if wished amount of rooms is to low exception is thrown, if only category is to low ui layer should call availablerooms function with all other categories
Merge branch 'dev' of github.com:Nagian/Roomanizer into dev
[BUGFIX] Proper context fetching on 4.5 - 4.7, SwitchViewHelper
[CGL] SwitchViewHelper
PEP8 fixes - list comprehension breaks
fix hFPI and hProfit bug
v0.0.6 [dev] 2012-05-15 re-calcu order lot, base pair and hedge paris.
fix typo
fix some small bug
fix smarttrader a big bug; update ta smarttrader.
Removed Venture.txt
Removed Warning
Fixed CMake
Finally adding ctrlp, fugitive, and powerline plugins to bundles on github. Were somehow added as strange linked dirs with no content
Start converting heightfields to deal with non-rectagular heightfields.
Generating terrain collision.
Collision work - detecting sphere over non-uniform heightfield.
Heightfield wireframe debugging.
Working new terrain collision.
Bullets now collide with terrain. Turned off some printfs.
Collision fixes.
Ship model and texture tweaks.
get_pointer in Sub
Testeo de requerimientos de programas, archivos y salida. Lógica de inferencia flexible en input. Algoritmo cut&Stack usando el paquete pdfpages de LaTeX. Escalado. Falta tratamiento de unidades, plegables y cuadernillos.
Parseo de unidades en el input
manejo de unidades con alchemist
logica basica de cuadernillos uno al lado de otro (cCXC=1), unos dentro de otros (cXC=1) o unos dentro de otros en grupos (cXC=n)
se saca archivo de gedit que se colo
orden de flujo para booklets unido con cut&Stack.
ademas sugerencia ultimo cuadernillo menos pliegos.
a mezclr con alchemist, reestructurar y ampliar sugerencias.
Merge branch 'units'

Conflicts:
	Impostura.rb
unidades en LaTeX de booklets y otros arreglos menores
Merge remote-tracking branch 'github/master'
Improved MD2, benchmarks,  &c. Tiger+DES broken.
Almost done MD4
First aired is output properly
Fixed Remove Root Dir issue in Chrome
Fixed: Episode Overview is trimmed down more to prevent being to large.
Merge branch 'master' of https://github.com/cago/tryocaml
Merge branch 'master' of https://github.com/cago/tryocaml
Merge branch 'master' of github.com:OCamlPro/tryocaml
Write script that write file into database
Reference implementation for validation in JS
Merge remote-tracking branch 'origin/master'
Async channel lock change to be the fair lock is reverted.

git-svn-id: http://orient.googlecode.com/svn/trunk@6181 3625ad7b-9c83-922f-a72b-73d79161f2ea
Adding in tests
Merge branch 'dev' of github.com:PHP-Hearth/hearth into dev
Further layer fixes to make testing easier.
Changelog.
Add tundra.pipeline:normalize
Add tundra.server:join to readme
Blueprint update for builder
Adding RoboGuice modules can be done via Closure
Finished moving tests to RoboSpock for TaskActivity
added minified 0.2.1
readded about me button to news.html
Added arduino file for clock program. Has hardcoded time pushed into DS1307 in setuploop, to be updated.
- Deprecated the TortoiseGit package.
a sponsors_randomized tag
Double colons messes up code blocks.
滚轮事件停止动画

滚轮事件停止动画
Added missing newlines in fprintf() statements.
Preparing to rename warplab_ofdm_* to ofdm_* for a more generic naming.
Added beginnings of data service
removed calendar picture with text (temporary bugfix)
added YankRing plugin and its vimrc
Skip kernel cache when x is pressed. That and some cleanups.
add release versions, new exe directory for 'stable' runtimes
ElementOther add. Fixed.
Fix the build image path
Clean fix for code index view and controller
Clean fix for user controller sigin and session
Upgraded Lusty Juggler to 1.5.1
Added the proposals controller and model, working on fleshing out the pages
Updating the old specs to pass with the changes made to the nav bar, also added all the attributes to the proposals migration and through it the proposals model
Added the destroy action to the proposals controller and updated the index to show a brief representation of the proposal and a delete button(that works)
Completed the basic proposals model and tests for validations
Removed the show action from the proposals controller and routes
Created the applications model and controller and established the belongs_to and has_one relationships between it, the user and the many proposals
Added the forms to make the applications work correctly
Created passing tests for the proposals_pages_spec.rb file, all green, go go go
Created tests for the application_spec.rb and applicaiton_pages_spec.rb files, they are both green to go
Added some formatting to the user show page in preparation for the student and admin dashboards
Got the employment_proposal working with its own controller, I hope to find a better solution to the new and create actions then five separate controllers, one for each type of proposal
Made the employment_proposal_spec.rb tests pass
Added the rest of the proposals 'sub-controllers', as well as their respective models, now it is just tweaking each form to accept to proer input and what should be said as instructions for each field
Fixed all the proposal forms to represent the propoer fields for each proposal
Duplicated the tests for each of the new proposal models and controllers
Fixed the specs, now all tests are green
Pass the config mapping to all module creation functions
Catch and display exceptions (yes, I'm aware of the security implications)
Add a custom web site class: Shining Eight Hundred
* cbx
refactoring upload video
add calendar to eventsgroup
fix test
refactoring
fix test
Merge pull request #17 from RubyGarage/calendar

Calendar
refactoring
merged from master
Update to revision 103
Change exec mod of script
fixing player arrs during disconnection #8
Converted tabs to spaces
Fixed some bugs with the long and lat
Merge branch 'master' of https://github.com/SLIPD/Basestation
Add extra columns for map_option_search and a query [#89 responsible:none]

Added system.map_search_option.min_search_str_len and
system.map_search_option.zoom_in_buffer.
These columns are needed to define the map search control.
Added query system_search.cadastre_object_by_baunit_id.
Merge branch 'master' of github.com:SOLA-FAO/database

Conflicts:
	sola-data-dictionary.pdf
	sola.sql
	sola.vpp
Refresh of the script and data dictionary

Nothing has changed.
Changes to database to include each service request as entry in AppRole
Table
Fix logging output.
Replacing all remaining ..._EX() macros with corresponding variadic versions
Added section headers
Added check for a config.cli.php command line mode config file.
Clarified To Do areas in the documentation
Update documentation for database class
Added a quickstart example
Merge branch 'master' of github.com:shutterstock/basecoat

Conflicts:
	README
misspelling
Added support for cache directive for routes

Routes can be specified as cacheable and an expires value specified. Cache headers will be defined and sent to the client.
removed extraneous ;
Merge pull request #3 from STHayden/patch-1

misspelling of parameter variable
Merge remote branch 'brent/master'