labofsahil/github-event-dataset-2012 huggingface dataset:
Forgot to put columns within a big span
Adding initial footer an lightening backround grey
Lots o changes

 * Styled search results, and when no recipes found
 * Improved 404 page for recipes
 * Formatting of some PHP parts
Sorting out link colourings
add test for compression
simplified to take raw shell input
fixed header for C/C++ linking compatibilities
vimとscilabの連携を強化(Windows)
included pbar and changing layout again
Local Settings File Removal

Removed machine-dependent project files. These are different on each
machine and platform and shouldn't be in the repo. Also updated the
gitignore file to account for more possibilities of files not needed to
be tracked.
Add Submodules

Set up ActionBarSherlock and Android NumberPicker as submodules.
Cleaned up for Libraries and Linked Code

Removed the android-support jar as it should be imported by the builder,
not stored with the project. Also cleaned the project properties to point
to the new third-party dependencies.
Building Instructions

Added instructions for using the submodule system and building Atarashii
with Eclipse ADT.
trying to fix my local workspace
my changes
fiba changes
tasks: add multibench task for testing pool creation

Also adds support for specifying a pool for radosbench
to create and then cleanup instead of "data".

Signed-off-by: Samuel Just <sam.just@inktank.com>
[Template method] Ersten Beispiele erstellt.
Fixed odd bug where has_content was returning false for nodes with children that had -20 results
bumped version number
Updated readme to include has_content usage
has bugs, but cleaned up much of last commit
Ips updated
update
Merge pull request #297 from tianlili/dev

update
update
Merge pull request #298 from tianlili/dev

update
[Change] baidu.js版本号修改
Merge pull request #299 from linlingyu/dev

[Change] baidu.js版本号修改
Merge branches 'dev' and 'dev' of https://github.com/BaiduFE/Tangram-base into dev
提交1.5.2.2release文件
Merge pull request #300 from tianlili/dev

提交1.5.2.2release文件
Merge branches 'dev' and 'dev' of https://github.com/BaiduFE/Tangram-base into dev
Hide item list by default
better definition lists, <code> tags
SOME

some
include.nmml
pulled bens code and fixed some errors
Fix indentation
Beter package detection

Beter detection for scoreboard (It missed quite a few last version).
Fixed potential reading forbidden memory.
[Build 100]
Score screen quasi fini. Reste à animer et à corriger certains points

Signed-off-by: Benoukat <ben.goze@gmail.com>
skin.xml: fix typo in device manager title
Remove raidframe updating as it shouldn't be necessary anymore
Small change to fonts
Level 1 Map angefangen
2D-Map fuer Level 1 fertig
Kommentarfunktion soweit fertig
Add README Again
Remplissage assez conséquent de la présentation
new encodeing & optimalized functions
Level loading basics

Only reading the width/height of the map works so far, but I'm working
on it.
fixed bookmark deletion
Update twython/twitter_endpoints.py

showStatus now can get status of a single tweet by id
Added support for Single Draw 2-7 Lowball.
VoteManager added. Used by Votifier.
Added review action in order lists
Added feature: restaurant user can review client now
Merge branch 'master' of https://github.com/ChengTian/EaBA_final

Conflicts:
	app/controllers/restaurant_to_client_reviews_controller.rb
	app/views/restaurant_to_client_reviews/index.html.erb
	app/views/restaurant_to_client_reviews/new.html.erb
	app/views/restaurant_to_client_reviews/show.html.erb
Fixed: "My reviews" of restaurant user
added add/remove submodule instruction to README
added merge/diff tools
Remove last reference
Cleaned up code and removed warnings.
Original US Constitution text

From http://www.civil-liberties.com/pages/draft.html

Need to research and find out if this is really the original text as it
was passed. Future versions will likely start with the first proposed
document then represent all changes as though they were pull requests.
We can switch maps now.
Adding serialize
Added serialization.
Merge branch 'karen4'

Conflicts:
	Sysc-Project/src/gameCore/Inventory.java
[cube_solve] fixes + test case fixes.
Coordinates fix.
Merge branch 'master' of https://github.com/DaanNiphuis/Jigsaw3D

merge
created workaround to infobar, still need to learn how to float that div all the way to the bottom
[DEPS] Updates to JNI bindings
v1229
finished off the work on DiagnosticsNode and BehaviorTracerNode
prep work to get ready to pull diagnostics out of FubuMVC.Core
removed DiagnosticLevel from the signatures of all the ToObjectDef() methods
eliminated some of the obsolete diagnostic code
bestand wordt volledig gelezen, zal nog wel een raar tekentje aan het einde, kijken we nog wel naar
read_line() basics
Merge branch 'master' of github.com:Dedge/ET4174-Sysproc
add min/max/avg to ping
I should be cleaning my place instead
Fix serious bug causing every condition to be performed
!
!
parser
Merge branch 'master' of git://github.com/DenisPanchenko/Dubno
gui
"gui"
Plugs for item and creature models.
added grunt and highlight.js
added marked as dependency2
added named_params in repr of invocation fixes issue #1
Вставил текст-уведомление о сроках заказа на странице оформления
Поправил путь
Merge remote-tracking branch 'origin/master'

Conflicts:
	apps/cart/views.py
Agregando un tamano que escale la imagen del afiche
missing lines in projectfiles
! Refactor placement of tests, to support magento based tests as well
Added Fennec as Firefox Mobile to config/user_agents.php (issue #1063)
Fix an erroneous variable name
Core/Player: Similarly initialize m_SeasonalQuestChanged

Fixes:

==8111== Conditional jump or move depends on uninitialised value(s)
==8111==    at 0xFB7C42: Player::_SaveSeasonalQuestStatus(Trinity::AutoPtr<Transaction, ACE_Thread_Mutex>&) (Player.cpp:19375)
==8111==    by 0xFB56BA: Player::SaveToDB(bool) (Player.cpp:18898)
Conflicts:

	src/server/game/Entities/Player/Player.cpp
[ICC] Added missing immunities to Festergut and Bone Spikes (Lord Marrowgar)
[Quest] Just a bunch of small fixes...
fixes some failing tests in api, removes validation of url attribute on submission, which is incorrectly rejecting urls with spaces - so lets ditch it altogether
Fixed solars not tracking. Made pAI recruits unable to manually close window.
Add SPAWNER_EGG spawn reason to allow for filtering.
add README
Merge branch 'master' of github.com:FMJansen/BDChallenge
Removed some console.log messages.
New speech bubble
Merge branch 'master' of github.com:FinnStokes/doomtower
Reordered BuildList Image
phpdoc fixes
city and pstnnetwork have property country
before git2
[aliases] added two aliases from fmuc
[no-html] add html to gitignore
[makefile] added makefile for markdown -> html
Movded expects header to POST calls only
Added Circle shape
add something

- systemcalls für die Console wieder auf Linux gestellt
- 2 nicht buchbare bookings hinzugefuegt
- makefile geupdated
The last Version of SVM

For Final Training:
%% Preloaded
addpath('libsvm-3.12');
addpath('libsvm-3.12/windows');
load('db/finaltrain');

%% Training
tic
model = svmtrain(yTrain, XTrain, command);
time = toc;
gatk pipeline type
initial commit of COD, Macros, SVG, WP7, and WIKI
Added basic find() function in DBObject;
Implemented load hasMany foreign relationship objects;
Created testing forloading hasMany foreign relationship objects.
Merge pull request #31 from GodOfWar526/master

New PC model
lol
Merge remote-tracking branch 'origin/master'
little fix
fixed crash on throwing pokeball
updated texture paths
does this work for you?
try this
added a check to see if the entity isn't null before sending
dev-util/jenkins-bin-1.480.1
Correction bug navigation controller
requirements for tdd
changing function name from test to AES128CtrEncrypt
added test for aes128-ctr
creating decryption metafunction
make install for nice installation
adding decryption test as well
throws exceptions for invalid input.  test for exception throws
Added Kickstart to the asset pipeline
Now succesfully connects to the bootstrap server
fixed ping/arg reader
started bot page cleanup, added stats.
BlockListener derp fix!
edit costumer virker nu
Fået sædebboking til at virke. 
Merge branch 'master' of https://github.com/Hparsig/MovieTheater.git
sædebooking virker nu :-)
lib & ex
Site updated at 2012-10-25 13:41:20 UTC
add logstash paramater to redis output template
Merge pull request #2 from ICTO/fix_redis_shipper_host

add logstash paramater to redis output template
uploaded version 3.4
Cut down the amount of code in any of the SetupPanels and just made one
SetupPanel class that implements ISetupPanel. (which I should have done
in the first place)
Merge remote-tracking branch 'origin/master'
add reconfigure to bulk clone
Remove already done TODO.
Revert "Readme Updated"

This reverts commit 6524cda67670a6b26d8ddbcaca32c9b4a7e0121d.

Conflicts:
	README.md
GUI and More...
Added Service1 folder
tsdkfjjdslf
Site updated at 2012-06-18 09:22:22 UTC
Fixed typo in Linear gauge and some cosmetics in DotMatrixSkin
HBox new API style
Third commit

Random shit happening
Syncing for my new hard drive.
Task F add a dash of ajax
Added support for an /errors request for debugging.
Minor changes to synopsis
[MOD-771] Refactored 'require' to work on Android
Ajout fonction ajouter modele et modifier modele
Ajout fichiers modiy listener et Dijkstra
Merge branch 'master' of https://github.com/Jissay/Robot-Pompier
add imdb such
Added the SQL file backup
Report time taken.
Added website copyright
added revervation print
enlarged title
added sf which is shortcut to symfony or app/console
Generator Hibnerate
stillworking well
delete users fixed

delete users fixed
Reorganizing to have a home for exercise solutions
Merge pull request #119 from marktabler/master

Add Tabler's notes to Drive
format files for generate script
refactor students datatable js to work after autocomplete search
Merge remote-tracking branch 'absolu7/develop'
Merge branch 'master' of github.com:Kagetsuki/GAKUEngine
Fix tabs, sorry bad commit --amend :p

Change-Id: Ia981edb520d7b5f91e0717f6b4d8180386c8a20d

Conflicts:

	core/Makefile
small light tweaks
update with some method calls to the controllers

both still need full implementation
Commented out some buggy lines for the moment
Changed local config
Merge branch 'beta' of https://github.com/KevinGregull/Vote4Me into beta
Merge branch 'beta' of https://github.com/KevinGregull/Vote4Me into beta
Filerights
Merge branch 'beta' of https://github.com/KevinGregull/Vote4Me into beta
Merge branch 'beta' of https://github.com/KevinGregull/Vote4Me into beta
Merge branch 'beta' of https://github.com/KevinGregull/Vote4Me into beta
Merge branch 'beta' of https://github.com/KevinGregull/Vote4Me into beta
Merge branch 'beta' of https://github.com/KevinGregull/Vote4Me into beta
Merge branch 'beta' of https://github.com/KevinGregull/Vote4Me into beta
Merge branch 'beta' of https://github.com/KevinGregull/Vote4Me into beta
Merge branch 'beta' of https://github.com/KevinGregull/Vote4Me into beta
Merge branch 'beta' of https://github.com/KevinGregull/Vote4Me into beta
Merge branch 'beta' of https://github.com/KevinGregull/Vote4Me into beta
Merge branch 'beta' of https://github.com/KevinGregull/Vote4Me into beta
Merge branch 'beta' of https://github.com/KevinGregull/Vote4Me into beta
Merge branch 'beta' of https://github.com/KevinGregull/Vote4Me into beta
Merge branch 'beta' of https://github.com/KevinGregull/Vote4Me into beta
Merge branch 'beta' of https://github.com/KevinGregull/Vote4Me into beta
Merge branch 'beta' of https://github.com/KevinGregull/Vote4Me into beta
.-..
bild für bildbutton
얼왕 피의 의회 검은구슬 유저 안따라 다니는 문제 순정코어에서 픽스
이후 문제 발생시 롤백하면 됨
Updated tracker usage
Now articles only show if feed turned on, but option is still shown
Added database functions too allow correct display of toggle switches
Erstes Einchecken des Moduls SharpProtect
Erstes Einchecken des Moduls SharpProtect
Initial commit
Firs commit.
First Commit
Merge branch 'master' of https://github.com/L4mbd4/sharp-protect
First Commit
Merge branch 'master' of https://github.com/L4mbd4/sharp-protect
tab1 ...
实现：音轨区左键单击定位播放指针
Fixed popup for external auth
Reenable library
Updated to newest version of shared-ui.
Added implementation of startManagingCursor/stopManagingCursor
Merge branch 'robo-staging'
WS
Added PackageManager#resolveService(Intent, int)
Merge remote-tracking branch 'upstream/master'
Merge branch 'master' into build
Exclude NotificationCompat in android-support-v4.jar from instrumentation
Add unit test for startManagingCursor/stopManagingCursor
Merge pull request #288 from zoodles/master

Added implementation of startManagingCursor/stopManagingCursor, use native implementation of NotificationCompat in the android-support library
Merge remote-tracking branch 'upstream/master'
Removed "android.support.v4.content." from exclude list
Merge branch 'support' into build
27jun2012 : update QueryEvaluator
Some minor development and a start with implementing MachinaModel.
Did more level gen stuff, hopefully optimized group saving
-Added Forest type generator
-Added TreeGenerator class, more trees will be added soon
-Hopefully optimized group saving (not fully tested)
Merge branch 'master' of https://github.com/MCForge/MCForge-Core
Commented out action on right clock of TimeWatch

Just for testing purposes
Paths
[maven-release-plugin] prepare release FazioUtils-0.1.3
Javadoc change.
First Version of NDYMV
fixed a stupid bug in `resolve_url()`

there was a bit that stripped off the annoying `?utm_source` crap that
got stuffed on the end of URLs, I don't want it. But I was stripping it
off starting from the trailing / in the URL, which broke obvious urls
such as http://www.example.com/example.html?utm_source=yaddayadda
Tag form - prototype
1.Aktualisierung
Finished commenting the constellation class.
mise à jour pour le déploiement
NEED SQUASH

Signed-off-by: Ilia Maslakov <il.smind@gmail.com>
added the option editor_smart_home_end, swiched off by default.

Signed-off-by: Ilia Maslakov <il.smind@gmail.com>
updated the man pages of the mcedit.

Signed-off-by: Ilia Maslakov <il.smind@gmail.com>
importParser
Instalator włącza wszystkie panele przy instalacji
Remove strange extraneous .css~ file.

Signed-off-by: Christopher Morse <dignanmorse@gmail.com>
siirtojen toteutusta jatkettu
Overriding Bootstrap in a better way
Moving more styles into separate files from the core 'bizzle.css'
Renaming my stylesheets
Removing outdated erronea for cross-browser rounded corners
More hopeless CSS file renaming
Removing unwanted stylesheet
Refactoring out the selectors from 'main.css'
More-approvable handling of widths in top bar
Doing away with 'main.css'; you have been assimilated
Indentation fix in build file...
Derpy attempt at making SBT do cool things

I failed at cool things.
un-derpify resource-obtaining stuff
Ceasing to track 3rd-party libs; pointing to SBT-obtained ones

fixes #5
Samlet moviefactory testene
01_temperature DONE
Set pom.xml artifact version to 2.4.1
Funkcni nacitani
Translate docs
Translate doc, forums_categories. forums and finish header
Mail address with no domainextension not parsed

A from address having MailDeamon@POSTMASTER was not parsed correctly,
throwing an argument exception.
initial project import from KDevelop
some cleanup
Added Patches needed for Bitstreaming Audio on Intel Hardware.

4 Patches: 3 Kernel Patches, 1 ALSA Patch

I do not take credit for these patches, I only want to make them easily available.

Credit for the patches goes to Wang Xingchao and his collegues at Intel
Add install button.
Fix hook function name
We rely on tooltips being fetched fresh each time.

 They are not only used to display information, but also to show a
form that displays the current workflow state and allows changing it.

Revert "tooltip: stop injecting content continously"

This reverts commit a4f612cbf8d5e1b3cab08e17de193087d9e12e36.
added circos tools
Merge pull request #20 from Postmedia/vip

Refactored plugin for VIP approval
renamed timbits.php to wp-timbits.php
Merge pull request #22 from Postmedia/codefile-rename

renamed timbits.php to wp-timbits.php
utilize selected() for selected options
added widget area homepage-news-3rd-segment
Added the Game file
Added the Gameplay file
Added the Main file which serves as the entry point
Added the Menu file
Added the requirements
Installation:

- Now downloads Deadline 5.2 64bit

I really need to make this use the `uname -i` value.
Ajout formulaire pour ajouter un auteur / catégorie
Creado documento de obras
Added redis4you alias
call baclks work now
updated README
0.1.1
some fixes / improvements
Reberting Comands Ranks
Update README.rst

corrected rst formatting; moved footnote to foot.
v0.26.3 - added HTML5 compliant FillInForm.pm to inc/
updated graphics and positioning code.
added travis ci status image to build status

closes #2
Alteração de validações das combos
code updates from Scott

I think I left all the Cinder file paths as they were so this project
should reload in your machine.
Add MySQL configuration
Add Monit configuration
Added slideeditor on theme options (in both core, eng and ita).
Delen update.
Merge remote-tracking branch 'origin/master'
.
Merge remote-tracking branch 'origin'
Merge remote-tracking branch 'origin'
added, als Test
Updated target framework version
Renaming functions for latest MCP/forge
Merge pull request #309 from amezick/master

mcp 7.2 forge 287 updates
Написана функция загрузки статической страницы.
Reading PNG texture files
update add aokp
Fix the calling of the SpoutcraftBuildSetEvent
Made changes from bug 93114.
BIG COMMIT, finished xml parsing, started value matching for testcases
revert back to another walk around
Update openssl to 1.0.1
Add gmp
Add libsigc++
Add nettle
Add libxml2
Clean up
Added support for backbone
Removed ARC4 RNG

The ARC4 RNG is a bad idea, esp. if you use events to seed it. This
implementation would freeze the entire system if there was a computer
constantly sending messages via broadcast nearby.
Bumping version
Trying distutils
Attempted to make this mod be able to be disabled
Y is unsigned with the new height
latest changes to the css file, fixing icons still in progress
testing
(Xbox 1) Add BeginScene to gfx_ctx_clear
added family member model
fixed stupid bug
Update minimap.lua

5.0.4 fix
configure: remove all "+" signs from the Python version
Implementando campos dinamicamente
Adicionando testes para verificacao de necessidade de segmento
src/com/trollhammaren/odhinn/OnFolderSelected.java deleted
Avoid repeated queries when building tags
Identification for Plugins List
Added the Secretariat page and the Hotel page
Update BillSync/EditMember.xaml.cs
Initial Deploy
Merge branch 'master' of git://github.com/UmairJameel/PhoneGap
Now work..
fixed a bug on index
reworded the first sentance in the bit about the template slightly.
Moved black to be defined on its own, since it gives back a bottle
rather than a bucket.  Also commented out all wield/inventory image
lines by default, so stuff renders as cubes in those places by
default.
Remove :: macchiato demo page
v1.1-18.04.2012
Fixed typo in application info.
Sane grouping
hubs fix for chrome
play with re-shuffling
Added protection against placing a second sign next to other player's
PaidSwitch.

Signed-off-by: Wolf480pl <wolf480@interia.pl>
Adjusted serialization to named set field message.
D_NTF_Arc_01.fs2: rewrote some parts of the briefing.
aspov-SSM-wep.tbm: added tech description to all missiles
local changes - xeralux only
upgrade 2.9.2 and sbt 0.12
build remove
Merge branch 'master' of git@github.com:YinFeng-Guo/AWSEC201.git
Added syntax highlighting to README.me (plus minor text tweaks).
updates for production
undo changes for production
Added titles to example boxes
Upgrade delayed_job
TreeWidget broadcasts MenuSelectedMessage when a node is selected.
Determine node handle icon when root node is hidden.
Include WidgetConstructedMessage.js
'Automatic build of: ProcessPuzzleUI-DomainLogic-0.0.1.jar'
 'Automatic build of: ProcessPuzzleUI-DomainLogic-0.0.1.jar'
 'Automatic build of: ProcessPuzzleUI-0.8.0.js'
 'Automatic build of: ProcessPuzzleUI-0.8.0.war'
More reduction of network queries to find the content type of a document. Still more to come.
weekly snaps 9, little ipad, wildlife photgrapher posts etc
some updates to readme about testing and running the app
Do not syntastic ruby
Use relative instead of short
Css & nav
add db_model

folder model
Initial files for asynchronous message passing

stream - Asynch message passing abstractions for data sources
protocol - Object-oriented data structure around protocol and packets
gui - GUI tools
driver - state machines for extended control on top of IO streams
Factoring out serial_stream

Removed sensor cell specific activity from bus_pirate_stream. Adding
generic serial port stream
Adding FileStream

File stream included that exposes a message passing framework on top of
file reading and writing. Asynch dispatch now has a cleaner interface
for accepting messages, tuples, or lists to put. GUI_Stream now includes
a dispatcher.
Deleting .pyc files
bump apache-jmeter to 2.8
updating crawl.py
Fixed Blog CSS
Changed to link to CSS
README had some Markdown that wasn't rendering (in HTML tags)
default-serif example was incorrectly demonstrated as -sans-serif
Merge pull request #2 from ElijahLynn/master

The default-serif example was $default-sans-serif, corrected
added ruby autocompletion
Don't update settings.locale with our detected locale from OS to avoid the crash caused by CEF loading the resources.
Also remove the mappings that we put in before to fix crashes for Chinese OSes and Brazilian Portuguese.
Merge pull request #126 from adobe/rlim/mac-locale-issue

Don't update settings.locale with our detected locale from OS.
Shell script reorg.

- Move scripts into a new "scripts" directory
- Add package_www_files.sh script for packaging the mac www files into Brackets.app/Contents/www
- Add support to Brackets.app to load from Brackets.app/Contents/www/index.html (if it exists)
Windows: load www/index.html if present. Hold Control key when starting to clear saved launch file.
Merge branch 'master' into glenn/scripts-dir
Update README
Merge pull request #59 from adobe/glenn/scripts-dir

Add script for packaging www contents into Brackets.app
960px youtube
Only render pjax title for requests which set the X-PJAX header.  This eliminates the need to set the _pjax_skip_title param
Allow search select() to determine if event is canceled or bubbled
Fix enter key navigation in search results not working
Work around a pjax bug which doesn't properly ignore empty anchor hrefs
Prevent calendar next/previous month button events from bubbling up to the document
Merge pull request #78 from WizardOfOgz/fix-calendar-buttons

Fix calendar buttons
Also copy images.
Rename
Fetch from my fork
Remove comments
Add htop-osx
Add gems
edited Diamond Spire
edited articles
Added nerdtree submodule as git readonly
moved analyses and manips into seperate sections
IMPORTANT / Refactored localization design, work in progress
IMPORTANT / Refactored localized management
LOW / Fixed activity inspector
MEDIUM / Fixed bug where many localized dict were added to each widgets,
added validation rule and quick fix
LOW / Moved icons to utils
LOW / Moved icons to graphic utils
MEDIUM / Improved support for table columns
IMPORTANT / Refactored locales management and GUIs
Merge branch '1.4.4' of ssh://git@github.com/agilebirds/openflexo into 1.4.4
More timeline ish
Merge branch 'wave2' of https://github.com/agoln/FlashVolunteer into wave2
Added masspay signal
Updated: Made some changes
inversión de orden de carga de scripts

Al parecer si se ponen los scripts al final del cuerpo del documento la
carga es mas rápida.
Tiene lógica ya que el DOM a renderizado todos los nodos del documento
, de ese modo los scripts que se ejecutan y se vinculan al documento
(por datos o estilos) están ya en memoria, no debe haber un inpas para
su asignación en memoria.
added spacing after lists
Entity List renderer, dynamic model with entities
removing unused @Function annotation
18.06.2012 18:52 - version 0.2
Increase 'shake' velocity threshold
Added filesystem persistence support.
Merge pull request #31 from sdywcd/master

jshop
Merge pull request #105 from alextao/master

jshop
Merge pull request #106 from alextao/master

jshop
android_jshop
Signed-off-by: erdai <peachorchard@qq.com>
Merge pull request #32 from sdywcd/master

合并了bb的代码
project jshop_android from jshoperv2

Signed-off-by: erdai <peachorchard@qq.com>
Merge pull request #107 from kalaikaqu/master

jshop_android from jshoperv2 
1
project jshop_android from jshoperv2

Signed-off-by: erdai <peachorchard@qq.com>
Merge pull request #108 from kalaikaqu/master

jshop_android from jshoperv2
1
Merge remote branch 'origin/master'
Merge branch 'master' of https://github.com/alextao/ostocy-jshop into
alextao-master

Conflicts:
	ROOT/WebContent/js/mywebsitemsgjs.js
	ROOT/src/com/jshop/dao/WebsiteMsgTDao.java
	ROOT/src/com/jshop/dao/impl/WebsiteMsgTDaoImpl.java
	ROOT/src/com/jshop/service/WebsiteMsgTService.java
	ROOT/src/com/jshop/service/impl/WebsiteMsgTServiceImpl.java
1
增加了广告和商品二维码关系表
修复了radio 的bug
Merge pull request #22 from sdywcd/master

radio bug fix
团沟模板
.classpath confilcts

Signed-off-by: "tao" <"tao"@aasdfasdf.com>
import new data json tool working
Added superpick option
changed to copying blocks as opposed to setting them through worldguard
Update event-move to keep track of -ms-touch-action property
build event-move
update manual test for event-move
Add support for documentElement, control -ms-touch-action on per-node basis, add Y.Event._DEFAULT_TOUCH_ACTION
build event-move
add unit tests for recent event-move changes re. ms-touch-action
Store msTouchAction counts on Y.Node instance & change feature check to SUPPORTS_TOUCH_ACTION
build event-move
revert back to SUPPORTS_POINTER check, since it has been better tested
build event-move
Merge branch 'touchaction'
update event-gestures HISTORY.md to reflect 3.7.3 changes
Updated ScrollView.TRANSITION to properly reflect Transition's vendor prefix changes.
Centralized access to vendor prefix in scrollview-base
Added comment to investigate alternative approaches to access private property in Transition.
Build ScrollView
add event-gestures docs
add some YUIDoc comments to event-gestures. No min files were harmed
Merge branch 'docs'
updated application helper
Metadata 7.0.4.Final
[AS7-5297] IronJacamar 1.0.12.Final
AS7-3736 Purge EL cache on undeploy to prevent class loader leak
AS7-5299 cli logging (disabled by default)
removed directgov logo cruft
Merge pull request #3 from tomski/patch-2

removed directgov logo cruft
Dummy commit to show Ed git
added project spec document for 4-1
initial work on Statistics class. complexity for the class will be contained in two private structs, RelationSet and RelationStats
change int to round to account for rounding
integrated mail sending functionality
Implement new scheduler API. Adds BUKKIT-836

The implementation for the new methods mimics the old methods. The final
call for the old methods now maps to the new methods with an additional
call to get id.
Sanitize input
chnaged version of package.json
What bullshit.
Update AfricaQ2010A.py
init commit
init commit
inputs coded, giving strange output. To check in a little
usricm inputs working
n-body molecule support
added more compat checks
signup page links div end fixed
caching stuff
Implement Edit and delete record
gitignore, hopefully
rudimentary CRUD + cacheing :)
more specs
2. Move query out of controller into offer moder named scope.
2. Bug fix: partial was displaying the offer as many times as the count of bids on that item, instead of the bids.  Split up partials to avoid automagic-bug
Move pragmas
For #250 - Maintain initial forward slash when normalizing paths
Added direct child fetching line.
animation for webview fade in.  moved webview up for resume.
media test now passes
Refix #13844 -- Made FloatField aggregates work on Python 2.6 + Postgres

Fixed a regression introduced in 59a655988ee95e4b4e4646cebea88b620d8fcdd2.
[py3] Removed filename encoding in file_uploads test
[py3] Fixed content encoding in test client

Thanks Andrews Medina for the initial patch.
[py3] Fixed admin_scripts tests
[py3] Avoided comparison with None value in formsets
[py3] Made csrf context processor return Unicode
[py3] Fixed encoding issues in cache key generation
Consistenly use _ as alias for ugettext_lazy in the i18n docs.
Removed binary flag to open files for writing text content
Replaced pickle by json in form_hmac calculation

Refs #18340
[py3] Fixed iterlists usage in QueryDict
[py3] Fixed contrib.formtools tests
Reverted pickle-json replacement form_hmac calculation

This reverts commit b109ff8062f4bb225181ec462d69c9dd79339567 and
complement test cases. The change was too hasty, as some form
values cannot be json-serialized as is.
[py3] Ported django.http according to PEP 3333.

Perfomed some style cleanup while I was in the area.
[py3] Favoured unicode strings in assert(Not)Contains

In Python 3, HTMLParser does not support bytestrings.
[py3] Compared response.content with bytes.
[py3] Ensured the template tests run.
[py3] Fixed egg template loader.
[py3] Removed unnecessary calls to .keys()

when computing the length of a dictionary. This fails on Python 3.
[py3] Fixed invalid use of dict.items()

An ordering test had two problems related to dict.items() usage:
  - It assumed the order of the dict was non-randomized
  - It indexed to the dict.items() which is py3 incompatible.

I fixed the test by using dict['rank'] directly, where rank is the
column tested on the values queryset.
bin: improvements to utils
build static pages
Switch back to CM for opt/telephony
boot
Merge pull request #3 from phplion/idea

boot
buttons, feedbacks
.bsa.csv
reformat only
fix phonebook_exim.php import should check uid
fix phonebook_exim.php export should check uid
added indes
added req resp elements
new images for loon app
svn merge -c 1425167 FIXES: MAPREDUCE-4833. Task can get stuck in FAIL_CONTAINER_CLEANUP. Contributed by Robert Parker


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1425168 13f79535-47bb-0310-9956-ffa450edef68
fix jenkins url

git-svn-id: https://svn.apache.org/repos/asf/maven/release/trunk@1421021 13f79535-47bb-0310-9956-ffa450edef68
Add webintent.js file
let Match implement index
add Regex.name2index
add Match.groupn
add Match.{boundsi,boundsn}
updated twitter bootstrap and fixed mobile
Added designer plans

Moved workload files from vldb-mar2011 directory

Add TPC-C 100p and TPC-E workloads

Copied 'tpcc.100w.large.trace.gz' to 'tpcc.100p-1.trace.gz'

Added stats files

New ParameterMapping for TM1 that includes string fields

Renamed 'correlations' to 'mappings'

New files for the Airline benchmark

New airline/auctionmark stats files

All new physical plans generated from the various designers for our VLDB paper...

Working on condor testing scripts. Re-running VLDB experiments

New airline workload/stats/mappings for the new benchmark

Not sure why these airline files are corrputed/out-of-date

New airline files. Stats file is now for a 100GB cluster

New plan/hint files

New design plan files for Airline/SEATS

This is a combination of 20 commits.
New TPC-C Skewed workloads and PartitionPlans

New and improved AuctionMark workloads

New AuctionMark mappings+stats

AuctionMark LNS PartitionPlan

Slightly tweaked TPC-C so that Payment picks up the secondary index. Ah jeez, I did some other stuff to, but it's 3am and I just can't work anymore...

New TPC-C files

New TPC-C temporal skewed workloads

Last time\! New skewed workloads

New TM1 workloads. Thank goodness I made that script to make this easier...

More PartitionPlans

Schism is the same as LNS for AuctionMark

New TPC-C 100 partition workloads

Removed InsertSubscriber

Removed InsertSubscriber

New files for running scaling experiments

Fixed scaling job scripts

Cleaned up some workloads no longer needed

New condor job scripts for VLDB experiments

Tweaks for TPC-E design hints

New TPC-E stuff

Finalized condor scripts for SIGMOD paper experiments

New script to collect data for paper experiments

New collect-data script for putting the costs file data into a gnuplot ready format

New collect-data script for the condor jobs

Minor tweaks to collect-data

Checking in new H-Store research files from our experiments

Two minor fixes to the TM1 PartitionPlans

Forgot to commit these fixes

New condor job to gather cost model information

Two small fixes for the condor scripts

A bunch of stuff that we need for SIGMOD...

Updated fig8 script

New skewed workload files.

Forgot to add these plans

Minor tweaks. Making sure everything is all there for SIGMOD stuff....

Not sure how this got flipped

Busted TPC-C PartitionPlan. Doesn't load in the EE

Renamed the 'Airline' benchmark to the 'Stonebraker Electronic Airline Ticketing System' benchmark (SEATS)

Renamed the 'Airline' benchmark to the 'Stonebraker Electronic Airline Ticketing System' benchmark (SEATS)

Submodule test

Submodule test cleanup

Cleaned up h-store-files repository.

Minor tweaks. Added ignore file

Minor update to gitignore
Fix some register constraints; specifically, the "port" operand,
if not an immediate, must be in a 16-bit register.
x86_64 doesn't use the "new toolchain" but it doesn't really use the
old one either.  The "new toolchain" environment is closer to what we
want, however, for using the external toolchain currently required for
x86_64, so set USE_NEW_TOOLCHAIN for x86_64.
Always provide alloca() as __builtin_alloca().
Add -ffreestanding to CFLAGS.
Don't put CPP flags in CFLAGS.
Add PPPoE to all generic kernels that should be able to use it.
XXX TODO: do this for INSTALL kernels too, add sysinst support and make the
XXX needed binaries available on the ramdisk root fs.
Move this figure to more suitable place:
  http://www.netbsd.org/Documentation/Hardware/Chips/C-Media/cmi8738-mixer.fig
Add Pause/Play key.
vnconfig called incorrectly - it wants either a simple "vnd0" or a full path
to a raw device, not a full path to a cooked device.
Introduce an extra driver level for HID devices, uhidev.  This uhidev driver
attaches to the hub, and HID drivers (ums, ukbd, and uhid) attach to
uhidev.  The reason for this change is that some HID devices report multiple
components (like a keyboard and a mouse) using the same interface, but with
different report identifiers.  The report identifier can be specified with
a locator for the HID drivers.
Furthermore, change the ukbd driver to handle other formats than the boot
protocol.
Update for new uhidev device attachment.
Update for uhidev(4).
Add uhidev(4).
Update for uhidev(4) changes.
Also rename libusb to libusbhid (which is a much better name).
Update for libusbhid(3) changes.
libusb(3) is obsolete.
usb(3) is dead, long live usbhid(3).
s/usb/usbhid/
Clean up the C_ and S_ constants. We don't really need two sets of them.
Also make the interrupt handler for older 3com cards look like the xl one.
I.e. don't ack the interrupt latch bit before checking if it is set.
At the same time, introduce constants for the watched interrupts, so that
we don't copy them all over the place.
Update for rename from usb to usbhid.
use the user of the event to calculate the price.
zmena v zadratovanych testovacich datach - boolean to int
Fix apache config with unique WSGIDaemonProcess names
Changing model.
Tweaks for notebook
pushed to Heroku and added some notes
Remodel model and Fixing view theme
Remove reference to draft
Fixed flaw in `drupal-major-version'.

`drupal-major-version' will now return nil if the Drupal version is
unknown. Previously it would fail.
fcython_mesh/ is for the illustration purpose of http://fortran90.org/src/best-practices.html#interfacing-with-python

fcython_qpck_1/ is for the same goal, but one need here to wrap a function written on python/cython and called by the quadpack fortran integrator
(also the code from http://people.sc.fsu.edu/~jburkardt/f_src/quadpack/quadpack.html was put here, which seems to be a more modern version than on
the http://www.netlib.org/quadpack/ one)

f90_vs_numpy_arrays_5.f90 is the version of the source code from http://people.sc.fsu.edu/~jburkardt/f_src/quadpack/quadpack.html rewritten
in to a modern fortran explicit interface style according to advices from http://fortran90.org/ (but gfortran still warns with debugging flags from
http://fortran90.org/src/faq.html#what-compiler-options-should-i-use-for-development)

fcython_qpck_2/ is for another C/Fortran wrapping style due to kleinert.pdf

testIntelMKL/ is for relative benchmarking of array and matrices operations, because fortran and python/cython integration is viewed as
very perspective especially on the array operations speedup http://technicaldiscovery.blogspot.ru/2011/06/speeding-up-python-numpy-cython-and.html
It is also interesing whether some speedup would take place in direct fortran usage in the way given in http://fortran90.org/src/best-practices.html#interfacing-with-python in comparison to f2py wrapping.
Merge branch 'master' of https://github.com/arrghb2012/fortran90
082212
djangokata - imageupload - model-level cache for Tip.tags.
djangokata - imageupload - Finish CUT for model/view level for collaborators. Templates will come later.
Use & create a dedicated thread for NettyServer startup & shutdown to prevent addition Executor which needs managed shutdown to release resources
Merge branch 'master' of https://github.com/s1monw/webbit into s1monw-master
Attributions
Added GA to chess
git test mac
agrego patrones y algo de refactoring
Getting some result :-/
ready to parse column constraints
TitleImage should draw something (doesn't though)
updated Arma2NETMySQLPlugin to latest version
trying manually adjusted Arma2NETMySQLPlugin.dll to restore compatibility
repacked updated pbo
remove old SQL files
added initial import of db_migrate.pl and 0.01 schema (Sanctuary 2.0 equivalent)
make upgrade version a parsed argument
initial import of 0.1 schema
add schema migration from 0.01 to 0.1
add dead player cleanup to insUNselI procedure for 0.1 schema
added port option to db_migrate.pl, improve formatting
add profile table, clean up field names further
fix db_migrate dupe p option, fix me up kthx
remove definers for procedures (causing problems on import)
some fixes to the 0.1 schema
refs #37 (preliminary merge of 1.7.2.5 changes)
refs #37 (merge in cfgdayzDEFAULT.zip changes)
clean up custom loadout code
Added fetching of user pictures from google plus and facebook, for some reason they dont get transported to the browser
Временно убрано оповещение о необходимости инициализации сеанса связи.
2012-09-09: fix issue with devel-tools/python-distribute/PKGBUILD
xmobar: swap multicpu and netstat
zsh: update comment of zshaddhistory()
Update readme.md in .vim/; modify mkdir command
Update weechat's notes
Use element in each, move global to js, rename geb to gme.
'remove OverFlow log output'
Organized imports

After an update to Mercurial 2.3 the module 'repo' was removed and the
program crashed when trying to convert a repository. I checked the
imports with 'pyflakes' and removed all unused ones, repo (among
others) was never used.

http://www.selenic.com/repo/hg/rev/1ac628cd7113#l9.1
Merge pull request #6 from aried3r/master

Fix for Mercurial 2.3 compatibility
Update debian/git-hg from https://github.com/cosmin/git-hg/tree/c1fabd7b9ae5f557e61206aec9774019cf670f4a
Merge branch 'upstream'
Bump Standards-Version:
Update debian/changelog.
MDL-33218 Filemanager and Filepicker IE issue
MDL-33218 fixing filemanager/filepicker look in IE

now all YUI dialogues are under the div with id #filesskin. This way we can avoid using !important in CSS and use #filesskin instead. It will have priority over YUI skin in all browswers including IE (!important does not work in IE).

Conflicts:

	files/renderer.php
	theme/base/style/filemanager.css
MDL-33218 Filepicker repository and toolbar aligned for IE
fix timebar bug, add target miss
Added debian-style setup script.
DTCoreText use submodules on master branch
Updated 404 html
hosting naming
Remove the duplicate paragraph.
Set reply-to to be the sender of teh contact.
Tabs to spaces.
Don't require QtGui for regserver.
Switch to #pragma once
Log to file.
Align comments.
Update todo with regserver issues.
remove pinax stuff from requirements.txt
fix bugs with photos
converted to project 2
Remove extra gsettings line in configure
Link to extension
Modified vim-python-mode ftbundle
Modified vim-python-mode ftbundle
Migrated all low level attribute management methods to the CAttribute class as static methods.
Thinking of implementing standard attribute management methods in a subclass of CAttribute ad use those in all other classes.
improve technical overview
Described git workflow
Android Inception proyecto base.
Full on Bakery installation minus mcrypt library
Removed duplicate STL import post
added athlete and scoutreport models
..
test perf
apply 0.8
serial request
build
SRZ: add proper GUIDS and instantiation macro for long long and unsigned long long array types
SRZ: save functions return values via temporary variables
reformatting ieshiv.js
try to fix the Gemfile
Add social media in footer, add hovers in various places, add menu_attributes module to allow rel attributes to be added to the menu items (needed for lightmodal)
abstractDao added new overload
data xml created new namespace
added basic heal mechanic
added continuous motion
fix bug found by static analyzer
add helper to properly format a version string

- CFBundleVersionKey will only be used for the app build number.
- CFBundleShortVersionString identifies the app version.
move node modules:
Added Heroku's Flask app
Make sure that we only perform validation if the GW name is filled as well as a IP address
Allow for atleast 15 seconds before considering it a timeout, 60 would mean try once, since it would immediately hit the 60 second timeout
Fixed HTML tag.
Merge pull request #89 from bcyrill/patch-3

Fixed HTML tag.
Added mode selection options for PowerD.
Merge pull request #90 from vizvayu/master

Mode selection options for PowerD
カメラ撮影の時にScrollViewの背景が透過になっていなかった
[issues] #3 Exifデータに情報を入れる

フレーム番号を追加
https://github.com/bugcloud/FrameCamera/issues/3
日付の色を全部白に変更
Merge branch 'develop'
Updated by jahir
updated again
Merge pull request #1 from jahirhstu/master

yes
use_ok() is considered harmful (and pointless)
TrackGlobalScalar needs an import parameter.
FS-4349 try this, it should be a minimal wait since this will poll the socket for 20ms only when there are no events at all and no log data at all
FS-4313 --resolve
ftmod_libpri: Move service_change_status_t down into #include guard area.

Signed-off-by: Stefan Knoblich <stkn@openisdn.net>
ftmod_libpri: Add MSN/DDI filter for incoming calls.

This feature allows ftmod_libpri to ignore calls with non-matching destination number.

You may want to use this on BRI PTMP lines (Point-to-MultiPoint),
to avoid conflicts between your FreeSWITCH server and other devices connected to the line.

The filter is disabled by default (all calls will be accepted),
setting one (or more) "local-number" parameters on the span configuration enables it.

Example configuration snippet:

   <libpri_spans>
      <span name="example01">
         <!-- ... other span settings omitted ... -->
         <param name="local-number" value="123456"/>
         <param name="local-number" value="654321"/>
      </span>
   </libpri_spans>

Signed-off-by: Stefan Knoblich <stkn@openisdn.net>
Tweak phrase_en.xml
Added moderator editing
Revert "Demo"

This reverts commit bcec69e71bdc17ec38e7d28989b5a479d7f3c36f.
ajustando los ignore
ajustado los ignore
add another problem from codekata
add another problem from codekata
Fix syntax error in binary
Bump (v0.3.1)
バッファの順序と定義バッファ名を変更.
ウィンドウとタブをUniteのバッファに表示するようにした.
Update twitter Bootstrap 2.1.1
First commit.
Files moved here from my EERF repo.
asdf
page layout twitterize
Initial support for plot/preview of 2D slices in 3D data, added basic sanity check for window coordinates
Fixed semi-embarrassing attempt to modify contents of a tuple in new window coordinates sanity check
adding travis badge :)
added gradient button css from www.webdesignerwall.com/demo/css-buttons.html
updated to use gradient css butons. added placeholders for future websites on home page.
Rename the lldb/gdb command page.
Remove 'Customization', 'Documentation', and 'FAQ' pages from the sidebar's "USE AND EXTENSION"
section.  These pages have no content.  If someone ever wants to add content to them, we can
re-add them to the sidebar.
[PathV2] Add mapped_file_region. Implementation for Windows and POSIX.
DECL_CHAIN doesn't exist in gcc-4.5.  Replace with TREE_CHAIN, which does
the same thing but with less checking.
SchedMachineModel: compress the CPU's WriteLatencyTable.
Add missing test cases for ARM VLD4 (single 4-element structure to all lanes)
instructions.
Fix a FIXME: DwarfRequiresRelocationForSectionOffset is the same as
DwarfUsesRelocationsAcrossSections.
Add MachineInstr::tieOperands, remove setIsTied().

Manage tied operands entirely internally to MachineInstr. This makes it
possible to change the representation of tied operands, as I will do
shortly.

The constraint that tied uses and defs must be in the same order was too
restrictive.
Add testcase for pr14088.
Unbreak cmake build
(fixup for r164790)
[ASan] Move error reporting code away from file with interceptors
Treat f16 the same as f80/f128 for the purposes of generating constants during instruction selection.
Now that ASTMultiPtr is nothing more than a array reference, make it a MutableArrayRef.

This required changing all get() calls to data() and using the simpler constructors.
[Sanitizer] llvm-symbolizer: enable accessing symbol table (libObject is fixed in r164365) and replace string with std::string
- test Action
Add option to always write to output file even if it already exists.
Also allow deletion when E325 message is given
Clean up dependency view in tasks
Fix case sensitive issue on element
Fixed issue #33 by adding logging to UsersController
making enrollment user list editable
Misc fixes (ran through all unit tests)
Some cleanup of using
removed debug code and line spaces
updated extend function, still ended up not needing it
Updated for Bootstrap Workshop
initial commit
something
Initial commit
Update reademe. RDD FTW
glorious clickbeetle updates

merged:

  gentoo: a26232b7d77a2a9ac756a8afda78def1b85ea328
  cb-overlay: f5ed9e06e70649d0781cb6a74a6cf5ecd51e4875
  foo-overlay: 4b4489fab11d7f99874f91d5c7269234f58d9d72
  bar-overlay: fb087c5a693ccc4195a2b824a60290a724802b2c
  flora: cdd353877f1a3c8497a4bca95c9bb3aedf9b74ad
Score storage

added
Item: replace arrays by vector.
Merge branch 'master' of https://github.com/clintbellanger/flare
Merge pull request #794 from stefanbeller/master

Item: replace arrays by vector.
change README to conform to contrib standard.
Adding get all bestfits to main
Update notes for submitted changes

* fix v1 non-UAA create_user expecting JSON response
Update notes for submitted changes

* bump to 0.4.13
node v0.6 fix
Streamed data printing
Updated published binary
Added support for Android resolutions
Updated to latest version of cocos2d, fixed project and resolved merge conflicts.
Updated project with android device image files
Removed Fragaria sources (will add submodule instead)
Removed Fragaria sources (will add submodule instead)
Updated Example project to cocos2d 2.0
Added allow config.
added a location list to the home page
did a little refactoring
added the locations controller
added the fetch of locations from Rails
started styling out the locations
styled the location list on the main page
added console logs to start on check in events
adding gedit backup files to .gitignore
Add subclassing section
Change some examples
Adding index to created_at

And also removing sleep from show.js
13/07/2012 17:10 - Added blank service with Toasts to test New Service
13/07/2012 19:38 - SUCCESSFULLY IMPLEMENTED LOCATION SERVICE! (:
Change SQL libraries to one that is more sane
[DEBUG BUILD] turn on debug
new files
Merge branch 'master' of github.com:conchobair/bp-dvbapp
Added percentages to woot and meh counts on the sidebar.
Improved the custom post type function.
Updated docs and added an example.
CBES-4: Basic RestConn support for ElasticSearch

causes any requests made to ports matching 909[0-9]
to use ESRestConnection Object.  all other default
couch ops remain unaffected

Change-Id: I419f9e044f221d60509dde71f7c5102be112ca99
Reviewed-on: http://review.couchbase.org/23330
Reviewed-by: Pavel Paulau <pavel.paulau@gmail.com>
Tested-by: Tommie McAfee <tommie@couchbase.com>