labofsahil/github-event-dataset-2012 huggingface dataset:
92. Add a simple stats page

* total number of videos
* for category, speaker and tag:
  - total number
  - top 5 by number of videos
92. Add a link to the stats in the navbar
Merge pull request #94 from squiddy/92-stats-page

92. Add a simple stats page
Greatly reduce database query count on various pages

Make use of select_related (to avoid additional queries when accessing
related models via foreign key) and prefetch_related (to get all related
models in a m:n relationship at once for a given set of models).

While django querysets cache the results when evaluated, this only
happens on a instance base. When constructing the same query again,
e.g. 'cat.video_set.live()' a new query is executed. Use jinja's {% set
%} to store the queryset.

These changes have the most effect on pages where videos are displayed.
Each video issued two queries to get the category and all speakers. On a
category page with 100 videos, that results in 200 (+ 1 for the category)
queries. Using select_related and prefetch_related reduces this to a
constant 2 (+ 1) queries.
ACS API 20th July, 2012
Colosseum latest
fixed merge.
Public transport directions
Hijacked print to print ICS instead of PDF. Email Plans (both PDF and iCS) fixes
minor IUCN tweaks
gitignore and remove nbproj and disable readonly
problem mit Random() behoben
Oops, serve index.html as last choice
Implement a equals method that makes the new DB happy
SCM event rewrite, unfinished
Get rid of the obsolete OpenEngSBCoreServices
Some workflow refactoring
Move some event catching ugliness into subworkflows
Script bij uitloggen toegevoegd
Max-width voor td toegevoegd, omdat Chrome niet reageert op de max-width op een tabel
Twee functies gecombineerd.
Automatische refresh voor sommige pagina's toegevoegd
Tabblad verengigingsinfo hernoemt naar vereniging
Gebruik gemaakt van de functie in database.inc voor toevoegen groep.
db_adressenlijst vervangen door db_lidond
Prioriteit gegeven aan het verenigings-emailadres.
Logboek inschrijving, hernoemt naar logboek.
Extra eisen aan het wachtwoord gesteld om het systeem veiliger te maken
Voornamelijk herschikking van code.
Vele kleine aanpassingen. O.a. preview meer beschikbaar gemaakt.
Kleine aanpassingen als gevolg van andere wijzigingen
Logboek inschrijving, hernoemt naar logboek en strongpassword eisen zijn verplaatst.
Rename substitute_variables to end with a bang

It is a destructive method.
Indentation in README
Remove waiting for child processes in RunnerFork

No need for now, because reader.read will block.
Add skeletal tests
Adding fixies for lint
removed the crazy stuff to access current_user since it was in post.user all the time.
Wed Nov 28 14:41:51 CST 2012
win_py2exe : some documentation.
win_py2exe : some documentation.
Update requirements for Flask.
Use proper flask-wtf path.
Adding image and size dictionary, and estimated total cost.
Removing link to DNS mgmt, since it's not currently active.
Removed uuid column, added flavor, image (OS), and estimated cost.
added small test function
some completeness changes
pulled values from json respons
add 'set vb'
add .gitconfig
Update app/models/classification.rb
dont show empty fields on item and collection views; item/collection view display adjustments
Got tests to pass for collection view: with abstract; without Download.
Style form section headers
Fix thumbnailing when the thumbnail is a crop of an image

git-svn-id: https://gramps.svn.sourceforge.net/svnroot/gramps/trunk@20079 27f82ba3-fc0d-0410-9f6a-8f6d5e09c20a
Typo Media -> Event

git-svn-id: https://gramps.svn.sourceforge.net/svnroot/gramps/trunk@20037 27f82ba3-fc0d-0410-9f6a-8f6d5e09c20a
Fixed one small german translation error

git-svn-id: https://gramps.svn.sourceforge.net/svnroot/gramps/branches/maintenance@20547 27f82ba3-fc0d-0410-9f6a-8f6d5e09c20a
Add forecolor button

git-svn-id: https://gramps.svn.sourceforge.net/svnroot/gramps/trunk@19692 27f82ba3-fc0d-0410-9f6a-8f6d5e09c20a
Creating of setup.cfg is going well.  I can:
* pysetup run build,
* pysetup run sdist successfully now, but still working on getting the complete ecosystem.

git-svn-id: https://gramps.svn.sourceforge.net/svnroot/gramps/branches/geps@19302 27f82ba3-fc0d-0410-9f6a-8f6d5e09c20a
0006008: Can't edit citation record from source record reference. Explanatory warning message produced.

git-svn-id: https://gramps.svn.sourceforge.net/svnroot/gramps/trunk@20428 27f82ba3-fc0d-0410-9f6a-8f6d5e09c20a
More updates to setup.py.

git-svn-id: https://gramps.svn.sourceforge.net/svnroot/gramps/branches/geps@19174 27f82ba3-fc0d-0410-9f6a-8f6d5e09c20a
more json features
change defualt operator vendor from sprint to china telecom.
Org struct mode ++ in message mode
When updating a file, getGroups as you may create an undefined group
typo

Change-Id: If5e487de103a581ebff41b093f9a5637f73a4698
essai
essai
Merge branch 'master' of github.com:sylvani/sylrplm
removed unused attribute from routing.xsd
removed wrong routing xsd statement `mixed="true"`

mixed="true" means that the element could contain both text and other elements, e.g.
`<requirement key="_locale">text <subelement /></requirement>`
But this wrong and such a definition would not even validate against the scheme as the xsd does not define which elements would be expected inside.
merged branch Tobion/patch-1 (PR #6164)

This PR was merged into the 2.0 branch.

Commits
-------

d5623b4 removed unused attribute from routing.xsd

Discussion
----------

removed unused attribute from routing.xsd
merged branch Tobion/patch-2 (PR #6166)

This PR was merged into the 2.0 branch.

Commits
-------

57edf56 removed wrong routing xsd statement `mixed="true"`

Discussion
----------

removed wrong routing xsd statement `mixed="true"`

mixed="true" means that the element could contain both text and other elements, e.g.
`<requirement key="_locale">text <subelement /></requirement>`
But this wrong and such a definition would not even validate against the scheme as the xsd does not define which elements would be expected inside.
Adding new localized strings for farsi validation.
Update src/Symfony/Component/Validator/Resources/translations/validators.fa.xlf

Adding missed localized string.
merged branch empire/patch-vadlidator-translation (PR #5955)

This PR was submitted for the master branch but it was merged into the 2.1 branch instead (closes #5955).

Commits
-------

c2955b7 Update src/Symfony/Component/Validator/Resources/translations/validators.fa.xlf
2dd87ae Adding new localized strings for farsi validation.

Discussion
----------

Adding new localized strings for farsi validation.

Adding new localized strings for farsi validation.
split out AsciiDataReader step by step
split out AsciiDataReader step by step
split out AsciiDataReader step by step
split out AsciiDataReader step by step
spit out ascii data interfaces
split out AsciiDataReader step by step
split out AsciiDataReader step by step
split out AsciiDataReader step by step
split out AsciiDataReader step by step

make _rowIndex a AsciiDataReader member
split out AsciiDataReader step by step

rename re_alloc
split out file buffer
344.13 Fixed square brace JSON problem
logs: Adapt interface in log-show.c (output_journal)

In preparation for adding more output switches, convert a series of
flags arguments into one flag variable.
logs: Adapt interface in log-show.c (show_journal_by_unit)

Convert more flag arguments into one flag variable.
journalctl: do not ellipsize when using pager

If a pager is used, ellipsization is redundant — the pager does
that better by hiding the part that cannot be shown. Pager's advantage
is that the user can press → to view the hidden part of a message,
and then ← to return.
bash-completion: update journalctl for recently added flags

Fixes a few minor bugs as well with flags which take arguments but for
which the values can never be known.
Updated version 0.2

Signed-off-by: t32k <ijok.ijok@gmail.com>
Implement the FactorList class
Encoding audio stream more explicitly
Taking destination
Colorscheme solarized moved in bundle; old solarized removed
Remove language files need to be fixed when english language files will be OK
Scumbag Markdown, are you serious?
Fudge 'now' 1ms to ensure timers fire properly
setup xstream
Add pagination to tutor#index
use netcfg
started work on dual lasers and exporting splines as json
QUICK LAUNCH
Update FactoryGirl support
Add more support for testing Sign up/in/out
[mongoのv1.6.3だとMongoDBに接続できずにtenginedの起動に失敗する]プロファイリングに使用するmongoのバージョンも1.6.2に固定します
DEBIAN folder
imprement integer operations
Add pimpl_good project.

Signed-off-by: Thiago Farina <tfarina@chromium.org>
Use Homebrew commands in /usr/local/bin instead of the ones in /usr/bin.
add rbenv to remote
Clients module
priority_queue: make to_vec/to_sorted_vec methods
priority_queue: make from_vec a static method
priority_queue: replace some copies with swaps
priority_queue: fix to_sorted_vec off-by-one error
priority_queue: avoid copy with top and maybe_top
priority_queue: fix siftup/siftdown naming
add a constructor for an empty PriorityQueue
pointing to lates fathom_engine
Minor refactoring
Added log library
Change how directories are made
Properly catch the exception
Forgot space
logging changes
Add uglifyjs to the dependancies
InputBitOrder function template
Change output to Tim Drahn
tim hates me
Many different user accounts.
Can be created, logged in and out of, everything working...
Remove ldap submodule after botched commit.
Add ldap submodule
slight change to the copy to desktop script
Move is_trap into Graft.jl, fix emission bug for type blocks
Make instrument() trap on :block entry as well
Use title fallback for IE
Merge pull request #27 from bruz/master

Force title fallback for IE
Now, THIS is a decent demo.
Added a basic version of my bashrc
Video uploading.
Diagnostic for temp jnidispatch file creation

Nesting underlying exception will provide more insight
on what may caused an error.
Changed convertQVariantToValue to use the JSC C API
Port convertValueToQVariant to JSC C API
QtPixmapRuntime ported to JSC C API (from Noam's patch)
Converted custom runtime conversion functions to use JSC C API in the signature
Port of the core QObject wrapping from RuntimeObject/Instance to JSClassRef and friends
fix for Twitter logger
version bump
Merge branch 'release/2.0.11'

* release/2.0.11:
  version bump
  fix for Twitter logger
Close sockets to prevent a traffic jam
added ag zip and dk jar
usage includes defaults, add # to irc channel
任务墙添加功能修改

根据批注
added filter for finding list of menus
refactored
refactoring of the design
added billing stuff
added billing stuff
More theming
minor fix
Minor fix.
Added support for packaging files for Mozilla Firefox user profiles in the English User Template. The source must be an individual file..
Fixed a coding style issue in Mozilla Firefox user profiles user template rules.
Modified /var to /private/var. Updated various location dependencies. Added convenience locations starting with l_private_var. Kept support for l_var locations to avoid breaking existing user Makefiles.
Added convenience locations for /private/etc starting with l_private_etc. Kept support for l_etc locations to avoid breaking existing user Makefiles.
Merge pull request #37 from Jaharmi/master

Mozilla Firefox user profile in English User Template.
remove the test config file.
add a sample config that will be used by default and should work with
travis ci.
add a load config file and reference it from the phpt tests.
ignore config.inc.php
add travis ci
Added footer mockup.
Merge branch 'master' into Ales

Conflicts:
	Updraft/src/plugins/turnpoints/tplayer.cpp
Fixing errored out tests
save login with multiple screens!
Merge branch 'master' of github.com:v2k/shell-stuff
generate with js fixed
Add other versions
Added new theme 'vaski'
Add : menu_part mobile
Fix : header_element_mobile conflict
Move python ctags cmd to vimrc
deleting ~ fikes
moved around files

moved css
added arrow to scroll
changed scoll size to 12
renamed files, menu, cufon^
added address to footer
added new content
menu css tweaks
added gitignore
lnked in, removed phone num
19th changes
changes as of 28th.nov,phone-conversation
deleted CNAME
adding contact information
adding a few more
add heading

- add heading
- add spans
Adding robot.png.
new robot file
Adding a veshi.css.
Changing the span.
added building N4
Adding popin samples
changed temp_data_schools.json (loaddata) to a more compact version
removing django-taggit
change autocompletes generic algorithm to a more efficient version.
(taking advantage of lazy evaluation)
school_to_string serializer  accepts a modifier to output string like str.title()
add a Tag model in order to help to categorize Problem objects
Separate choice consts inside of school.choices module; Modified problem.forms to contain problem.tags create/edit.
ESTADO constant was throwing  out nasty errors during DB resync.
implemented general autocomplete server-side code for navbar
implemented general autocomplete client-side code for navbar
tag autocomplete in searchbar at search page
removed old estados constant from schools.model; small refactoring of  template  problem.card
tag input in edit/create problem form powered by Chosen; Better popover helpers
merging
removing debug prints from search form
make updatedb work using crontab
A unit test for Merge render with external paths

Write a unit test which shows that external paths are ignored when using
the Merge render mode.
PreMinified and Minify rendering mode unit test.

Set rendering mode to PreMinified and Minify and verify the output of
rendered markup.
Clean up unit tests for combined rendering modes.

* Various unit tests for combined rendering modes have been written.
* Add a new FileUtil static method for comparing a registered resource and its cached data.
Attempted to fix warnings from generics; issue #6.

Eliminated all non-unchecked cast warnings by verbose declaration of
each type parameter in every class. The remaining warnings can be
suppressed with @SuppressWarnings("unchecked") or resolved by specifying
the Class for the cast.

Was unable to effectively use ? wildcards for types.
fix --api when ctx is missing
ignore module deps in --api
add Inputs#rebase/rebase_given

behaves like merge, but bases the merges the other way around
perform input conversion when requesting input

previously, values were converted at parse time, and ended up as non-strings
in the given values
Renamed the rest of the pages as well
Random recommendations
First test of coverflow plugin
Increased the size of the imported image from Gravatar. Fixes #235.
Merge pull request #236 from jtessler/gravatar_fix

Increased the size of the imported image from Gravatar. Fixes #235.
improved 404 page again
much more reasonable approach for addons.versions
Otimizations selection to avoid lazy apresentation.
Fixed the the refresh action to avoid send to first page.
added one more query test
fixed building
fixed example
patches - select patches by clicking a table row

no need to locate the small check box on the left side
- added hover effect so it's visible which patch will be selected
- filter patches by client side JS, no need to reload patches
  (much faster!)
patch fixes - do not hide table header when filtering patches

- global checkox affects only selected (visible) patches
Merge pull request #7 from webyast/patch_ui_enhancements

Patch module UI enhancements

Vlado didn't find anything during his review, merging....
Редизайн в процессе
Редизайн в процессе
Редизайн в процессе
Редизайн в процессе
Merge pull request #1 from welloffman/new_design

New design
Further refactoring of grammar

Refactored grammar so that it recognises and distinguishes expressions
and expression statements.
set timeouts on net stream
Dropbox works! Fixing frotz 3
内存管理 内容
Minified jQuery but stayed with v1.7.2 for now
Working scriptlet and declaration for jsp
run.sh -- not functional now.
reduce line-height and padding in output (fixes #33), remove output header (fixes #34)
Merge branch 'stringUtils'
stable version of adding left image
first commit
second commit
Merge branch 'master' of https://github.com/wonilsuh/k5_www
Add 'fake' names to initial commits. (In a hackish way.)
Fixed ruby-build installation.
Updated ruby-build version.
I like punctuation.
[#28315879] Bug Fixed: Aluno listado no portfolio do professor apenas se sua matricula foi aceita na turma
[#36479109] Validações para o campo de média [deve ser um numero de zero a dez]; Limitação no formulário para a média estar nos valores delimitados; Utilização de lightbox com ajax; Testes unitários para todas as validações de unidade curricular [não existia nenhum]; Correção dos testes, para unidade curricular, feitos usando o cucumber
增加自定义事件处理

三个方法 add fire remove
遮罩层bug

遮罩层iframe靠上，造成遮罩无法接收鼠标事件。修改方法：调整层结构。
video module added
server callback refactoring + bugfix
unlock na exicie, opcja wylacz i status do tekstu ikonki
CA-93559: Change code ordering within force_state_reset.

A VM's power_state and allowed_operations are now updated after its
devices are updated. This makes more sense for clients which are
watching for VM.power_state to become halted.

Signed-off-by: John Else <john.else@citrix.com>
Logging fix.

When we're updating the database value of VBD.currently_attached in
response to a xenopsd event, make sure we log the value we're putting
into the database.

Signed-off-by: John Else <john.else@citrix.com>
Merge pull request #923 from johnelse/ca-93559-clearwater

Clearwater - port fix for XOP-227 / CA-93559
HW#8
Merge pull request #318 from JoSunwoo/master

IaaS,PaaS,SaaS
[analyzer] Add BsonRecord for Country Statistics
FreeBSD: allow CC & FC to have different versions
FreeBSD: fix OS_FreeBSD -> OS_FREEBSD typos
Merge pull request #111 from nolta/develop

fix a couple of FreeBSD issues
add todoCount
disable csrf protect for logout and register
#994 Moderation Count Issue
update branch
Plugin Kunena search not detected in report configuration
Merge remote-tracking branch 'upstream/master' into bugs5
update
#1083 Language file xx-XX.com_kunena.menu.ini missing from many
languages
#1083 Language file xx-XX.com_kunena.menu.ini missing from many
languages
Merge pull request #1093 from xillibit/bugs9

#1080 Clean installation: Multiple warnings
Merge pull request #1092 from xillibit/bugs6

#1083 Language file xx-XX.com_kunena.menu.ini missing from many
Merge pull request #1071 from xillibit/bugs5

Plugin Kunena search not detected in report configuration
When the params.ini file isn't here, show correct message
some modifications to make this work in linux
vimrc: always show modeline and set cursorline
prompt_skwp_setup: modifications to work without ruby rvm
update nagios url module
change data states from past tense to present tense.
Merge pull request #62 from jrogelstad/master

misc.
Add hosts option to resetdb.py script to allow for remote access to web client.
Merge pull request #85 from bendiy/master

Add host option to resetdb.py script to support remote access to web client.
debug and test codes. fix all method
Fix `pkg set -a1` not confirming for every package
pkg-set: Rename -a to -A and add -a for all packages
pkg-info: Add -D for pkg_info(1) compat
Fixes #238
pkg.8: Add myself to contributors and link to github
Remove portupgrade's pkgdb when running pkg2ng

This fixes a situation where some packages may fail to register, but linger
around in portupgrade's pkgdb, thus confusing portupgrade if they user
tries to force-reinstall that package using portupgrade
Set repo.sqlite permissions to root:wheel 0644 in repo.txz
If there is no remote pkg to install, don't warn that there is a newer one.
Fixes #241
Cleanup redundant code in pkgdb_query_newpkgversion
Document current portupgrade usage
Update FAQ about portmaster
Fix the name of the portmaster patch
Questions should start with Q:
Update english grammar
pkg set -o now change origin for a port and everything that depends on it

pkg set -o now first change the origin or the port with old origin and then
update the dependencies for all packages depending on it.
fix crashing with pkg repo <non exist dir>

while here: unbuffer printf to avoid adding fflush everywhere
Remove the now unnecessary fflush
Document auto update for pkg-{fetch,upgrade,install}
Add -L flag to skip auto update for pkg-{fetch,upgrade,install}
Tell user that pkg-update is running
Fix typo in comment
Track .h to .h dependencies.
Reorder private methods according to use order
Tone down text shadow on gradient backgrounds
find atividades entre datas
Merge branch 'gereduca-dev' into gereduca-dev-y
Json feed de eventos marcados entre datas
add classe .invisivel para os icones de remoção
add link para o css da view de gerenciamento de usuários
mudança no tipo de comentário e handler para o evento de hover na linha da tabela
add css da view de gerenciamento de usuários
inserts de algumas atividades
merge gereduca-dev -> gereduca-dev-y
Added missing documentation
Refactoring on opening services in the installation proposal
Support for iSCSI in Linuxrc - returns whether used
Opening service for iSCSI target if installation booted with WithiSCSI=1
Showing whether iSCSI Target is opened in firewall (in proposal)
Changes file entry
Typofix
Updated changes file
Merge pull request #6 from kobliha/master

Added support for iSCSI Target into the Firewall proposal (BNC #766300)
add hotplug key for dynamite
frame specificity
implement the upload part of DropboxManager
layout changes
more scss changes
event show styled
Created officers page engine and updated 404 page
styled officers page
updated event ordering
Revert "a"

This reverts commit 502db0430cd6771c7081f9ad81b517b64ce85694.
Fish are back?
Add filter on home screen
Managing reading devices
Scripts and workflows for Mac
Device sync fixes
Quick and dirty fix to change all generated methods from underscores into camel case
Revert "taken down"
把首页的模板做好了.
下面要做的是大类的模板,还有中类的模板和小类的模板.
Updated: 2012-11-29 14:09:00 +0000
basics are nearly ready
Skip missing resources
Search popup. Spinner wrapper for drag threads. Hide user secrets from
debug output.
dodane dni wolne 2012
added legend
Use Qafoo build-commons repo as submodule.
Ignore the sonar working directory.
Remote updated to Qafoo build commons.
Updated to latest version build commons
Merge branch 'master' of git://github.com/phpmd/phpmd
change commandt height
Merge branch 'master' of github-me.com:zhelee/vimfiles
Parker Update
Changes to make Sonar happy
Merge pull request #25 from zinic/chadlung

Changes to make Sonar happy
moved stopping the audio thread from GLGame to Racesow activity
make the cucumber feature steps better, add failing scenario for incorrect pin
misc updates
adding vim and vimrc
Add command-t bundle for vim
added nametab function
add brew sbin directory and perlgem tools to path
fix up PS1
append to history file after every command.
move prompt functions into a separate file
Switched docs to OpenSans, added font to repo
Rebind event handler when call foundationTopBar repeatly
Merge pull request #1024 from ayamomiji/patch-1

Rebind event handler when call foundationTopBar repeatly
Fixed a typo in the grid docs
removed test
touched test again
dont print report if nothing was found
added flag for a winkstart-request resource to disable ajax events (which disables the loading popup)
added onClose event for winkstart.dialog, in place of the close event (that cannot be overriden). onClose should be used from now
cleaned up the config file
changed winkstart.request to allow other contentTypes
made fix to winkstart.dialog to prevent nasty bug (infinite loop!)
WINKSTART-644: Fixed myaccount whapp, it now uses its own winkstart.app object.
WINKSTART-642: New fancy welcome page.
WINKSTART-642: New login is now working fine.
WINKSTART-642: Fixed Learn More link in the new welcome page.
WINKSTART-642: Forgot to replace Username by Email in the Welcome page. Fixed.
WINKSTART-424: Work in progress for recover password.
WINKSTART-633: Devices List on the User now has the enable and the device type field.
WINKSTART-633: quick fix.
WINKSTART-633: Enabled boxes and Device Types are now displayed properly in the Devices List of the User Module.
WINKSTART-424: Recover Password is now working. On the first login, the user is now asked to set a new password on his account.
WINKSTART-639: Loose the cell phone number validation
WINKSTART-647: Cell phones are now displayed as registered.
Merge branch 'master' into WINKSTART-424
Merge branch 'master' into WINKSTART-633

Conflicts:

	whapps/voip/device/device.js
Merge branch 'master' into WINKSTART-647
OOB: Fixes for version v1.48
WINKSTART-649: Fixes the validation for Caller-ID (the front-end validation was not the same than the one used in the back-end)
WINKSTART-650: Changes Equipment tab to be displayed as Devices.
WINKSTART-651: Fix form alignment in ring groups.
WINKSTART-652: Fix tooltip background-color in callflows.
fix for borked codecs lists. this needs to be resolved formally by writting our own extend function.
WINKSTART-656: The rule selected is now always displayed properly, selecting custom will display the regex correctly.
WINKSTART-645: You can now set a timeout on a user callflow item \o/
Add Log helper.
Gesture implementation to mark todo item completed, seems a little ugly.
Added Signup and Cancel
Corrigido o spawn point do billy e z

-16 no respawn
Playing around with various CSS techniques.
New: [Wicket] add user account menu bar
New: [Wicket] add Signup and Logout pages
New: [Wicket] add UserLoggedIn control in NotzPage
New: [Wicket] refactor UserForm
New: [WS] add QueryParams to NoteResource (to be continued)
first test
second
g
third
iiii
ooooo
Merge branch 'master' of github.com:AlexChiu/GitTest
add env[swift.authorize_override] = True after get groups successed.
Fixed startup path bug.
Added Terryn's 2.84 help file changes and revised docs.
归档陆昭鸣的需求文档

Signed-off-by: AlphaHo <alphaho@vip.qq.com>
Signed-off-by: liupan2000 <912196781@qq.com>
Merge branch 'HEAD' of https://github.com/AlphaHo/training.git into liupan
详细设计说明书
Signed-off-by: liupan2000 <912196781@qq.com>
Signed-off-by: liupan2000 <912196781@qq.com>
工作日志+MVC/WEBFORM登录
Signed-off-by: zklscut <taitoubiyan1@gmail.com>
概要说明第五部分  6号，7号的日志

Signed-off-by: AlphaHo <alphaho@vip.qq.com>
Signed-off-by: Lummqxyx <tzjzlzming@hotmail.com>
Merge branch 'zhangkl' of https://github.com/AlphaHo/training.git
删除thumbs.db

Signed-off-by: AlphaHo <alphaho@vip.qq.com>
删除缩略图
Signed-off-by: hshucai <hshucai@163.com>
Merge branch 'master' of https://github.com/AlphaHo/training.git into alpha

Conflicts:
	Diary/Ming_Diary/杞?浠撹皟鎷ㄤ綔涓氶渶姹傝?存槑.docx
删除缓存
Signed-off-by: zhugino <zhugino@gmail.com>
Merge branch 'master' of https://github.com/AlphaHo/training.git
删除冲突
Signed-off-by: zhugino <zhugino@gmail.com>
Merge branch 'liupan' of https://github.com/AlphaHo/training.git

Conflicts:
	Diary/ZhuYizhou/绯荤粺姒傝?佽?捐?¤?存槑涔?.doc
Merge branch 'master' of https://github.com/AlphaHo/training.git
Merge branch 'hshcuai' of https://github.com/AlphaHo/training.git
Merge branch 'master' of https://github.com/AlphaHo/training.git into zhansf
6－11工作日志
Signed-off-by: zhansf <929707351@qq.com>
removed sqlite3 out of the repo bcoz of problems with windows and *nix versions of modules
project: new Make rule to setup cat (linux)
Revert "Core/Spellscripts: adding some things missing in patchports by whom ever did these."

This reverts commit 33deb1b972cde6fa4185fac417742b3542ce2af6.
Merge branch 'master' of https://github.com/ProjectSkyfire/SkyFireEMU
Core/WorldServer: Changed RASocket name (cosmetic)
Requested by sovak.

Signed-off-by: Bootz <bootz@projectskyfire.org>
DB/SQL: Drop already added sqls.
Core: Implement Conditions System from Tc repo.

+ Fixed most problems.
+ Cleanup code.

and some other Fixes.
Core/Conditions: Added missing code.
Core/Achievement: Fix typo, thanks cyberbrest.
Core/Spells: Drop not needed totem code. thx Cyberbrest.
Merge branch 'master'.
Move HexChat L10n to share\locale where it should've been in the first place
Prepare solution for Perl 5.16 VC build
Update Perl error message according to recent changes
Handle punctuation and upper case intial letter.

The interlinguish code couldn't handle sentences starting with upper
case letters, and ending in punctuations.
Added debug function for getting all knowledge.
Move some of the task functionality into property
Move startTask functionality into TasksProperty
Remove Character.clearTask wrapper

Nothing was using it, and functionality shouldn't be hard coded into
the Character class like this.
Actually return the Update op
Move clearTask into TasksProperty
Move tick processing into TasksProperty
Move task stopping into TasksProperty
Add required stub to test
Add note
Fix logic error checking if task is initialized
Remove unrequired reference to m_task
Add busy accessor to determine if a task is running.
Cut down direct use of m_task
Add flexibility to the client API
Update client related code for changed bindings
Start converting over to more flexible wrappers
Clean up the way editor is set up
Add wrapper for client.createCharacter
adding texture
Added assets
introduced user validation.
Working text file compressor
[TestCase] 增加ajax用例
Merge pull request #283 from linlingyu/dev

[TestCase] 增加ajax用例
[TestCase] event包测试用例
Merge pull request #226 from linlingyu/dev

[TestCase] event包测试用例
Merge branch 'development' into feat/feat2
feat1&2
Merge branch 'feat/feat2' into development
Merge branch 'development'
add support for spread to esprima
adds support for spread in args list, destructuring, and array initialization
build
fix up a bunch of issues with class decls, improve display of function params
fix Proxy functions in the debug API lacking isClass and isConstructor
fix object and key being reversed in GetMethod
build
fix StrictArguments
fix inspector output in Node.js for property lists
capitalize $StrictArguments
export System on the declaration line
build
Add unit test for SettingDialogViewModel class. Use the newest framework DLL.
moved pvr quicknav item to include
Add panel spot for wall panels
Merge remote-tracking branch 'origin/3.0.0-pre' into 3.0.0-pre
dialogkaitoast color fix
Merge remote-tracking branch 'origin/master'
Make sure there are no empty fanarts rotating
Make sure all audio flags fit the video info box
another tiny weather fix
integrated actors script
Merge remote-tracking branch 'origin/3.0.0-pre' into 3.0.0-pre
more fixes for navhelper bar
Add more FAQ to the list
Add speed icon to the pet battle ui, fix a few things
Extra action bar shit
Fix boss button..
Merge remote-tracking branch 'beta/master' into beta
I'll take display back...thank you
Fixed overscrolling
Added download and instructions for it
Use the flipped property instead of overriding -isFlipped
Updated invocationPattern
Removed the escape alone objective.
Fixed a problem with air exchange rates.

There was a lookup table overwriting the changed values. Silly me.
Added some real functionality to the driver
add: produkt design
gtalk bot disabled until migrated to appengine
Added index-final
Added walkcast app
Added walkcast app
Added walkcast app
Added week3 material
Added tests
Added tests
Removed
Removed pesky DS_Store, should add to gitignore
Removed spy
Polished up ReaDME
Added compass
Added compass
Added compass
m
fixed testcase testPutHoveringBrickDown
(at.tugraz.ist.catroid.uitest.content.BrickDragAndDropTest)
updated keyboard strings
Merge remote-tracking branch 'origin/master' into FormulaEditorFragments2
Fixed the catroid image used in the default project so that the belly
doesn't bounce around anymore when changing costumes.
Merge branch 'master' into MarkusHobl
Issue 114 & 123
Removing rickshaw stub
Rickshaw
Update src/client/contacts.py

It still crashed with encode, decode needed
Merge pull request #3 from funkycode/patch-1

Update src/client/contacts.py
travis now not building on jruby
tex: +definition des besoins
avancement du 8 aout
made sure license is also added to minified file
Now linting Redtape::Form for ActiveModel correctness
All tests passing again after linting and removing own_your_errors
added link to fiddle http://jpapa.me/T5LLcw
Same commit as earlier, User creation and all that
1.0 ready for public
1.0 ready for public
insert ASCII check
Model changes / UI effect
Fixed Bug : loading gif did not disappear
Moved all Ship classes to ship package
Moved all scene classes to scenes package.
IModifier methods updated to include types
Minor fixes to code
Complex commit

Fixed all console errors. Added pair of people. Changed photo styles on
mobile widths.
Camera Fix
Merge branch 'master' of https://github.com/DR9885/Possessed
preparing use PyBrain in letter detect
position et positionpossible
partie
Merge branch 'damien'
affichagelistepiece
maj
liste piece
listeneressai
zouz
ecouteur
Merge branch 'damien'
settableau
destinationPossible echiquier
merge bigo
deplacer piece
echiquier sans erreur
test
echiq
Merge branch 'master' of https://github.com/Damien56/Project
la fin
a
destinationpossible gestion sorties d echiquier
Add gems 'haml' and 'pg'

We will use 'pg' in production, so group 'sqlite3' into :development and
'pg' into :production. In addition, add HAML because I hate ERB.
Use 'haml-rails' instead of 'haml'

The 'haml-rails' gem does integration magic for us, so we don't have to.
Add initial set of files for Snippet

Add initial HAML, controller files.
Use form_tag instead of %form

Better to use the Rails helpers instead of rolling out own forms.
add -march=armv6 To compile on the RaspberryPi
remote string.format() from memcache tests
missing import of `signal` to kill subprocesses
remove another `with` from the nagios test
use backward-compatible isnan() in cassandra check
fix cassandra dogstream to use new parse_date func
remove a logging line used for debugging
Reenable the Jenkins Checks
source setup can take the api key as an environment variable.

workaround for DataDog/dogweb#390
Adding packaging comments.
Update pid file tests to use new interface.
Some step further
Fixed bug in UITableViewCategory.
Code modernization in DBCoreData.
Added berserk bonuses: Increased Fist damage, health regen, movement speed, and jump height. Berserk can be stacked 4 high, but is cleared on level exit.
Add actions Translate and Help && Update Translations
added flight mode image
Pretty cool scripts, mainproto.py runs everything.
Patch for a bad behavior after a pack of options
up module uuid to dev
Merge branch 'core'
up feat galleries : include terms by uuid
Added some missing nouns
Error message for unrecognized files

VVVVVV: use filename for validation.
Improved Constants.
removing unused feed fixtures
Add CM7 OC
Fix Readme
add emerald font to tex
get-parameters are now more important than cookies and change values in
cookies
I Hate Windoze!!
Strategy is now map/car independend
Fix for #80 - when a player attacks you in contract killer, the game tells you if they're allowed to kill you or not. But it only does this (at most) once every 10 seconds, unless your relationship with that player changes in that time (e.g. they become your hunter)
font fix

-case sensitive for the font format (.ttf .TTF)
Fix late-night coding error
audio: fix GetDelay for SoftAE
обновление версий
Password hashing and user login
Basic gift model
Allow selection by API Key
Merge branch 'v0.0b-network_user' into v0.0b-network_gift
Hotfix datetime json serialization error
Merge branch 'v0.0b-hotfix-json_date_serialization'
Merge branch 'v0.0b-hotfix-json_date_serialization' into v0.0b-network_user
Merge branch 'v0.0b-network_user' into v0.0b
Simple gift creation
Merge branch 'v0.0b-network_gift' into v0.0b
Merge branch 'v0.0b'

Conflicts:
	apps/network/models/User.py
add dia files
add network pictures
removed the console log
watCard
More documentation.
Merge branch 'master' of github.com:Fulkerson/FRTN01
fix: 修改一个判断是否支持快速行格式转换的bug,增加错误断言.

Signed-off-by: zhongliangkang <zhongliangkang@qq.com>
script daniel

script
tentativa
initial commit
this is the second attempt to commit
another late commit
Таблика называется books  а не  book
Added MidoMedium @font-face
Added Web Dev projects to public folder, Added ribbon banner, Added fonts
Added some new scripts, some changes to vimrc file

+ Added the brew_installs.sh file which will automagically install some
  things using Homebrew, and installs it if you don't have it
+ Added the set_osx_defaults.sh file which will automagically set up
  some OSX Mountain Lion settings for you, should always have these
~ Changed .vimrc file
~ Changed .zshrc file, adding a new alias I think
~ Moved the make_symlinks.sh and delete_symlinks.sh files to the
  scripts folder, which will now contain every script I make
Merging build-stage0 and build-stage1 into a single, general-purpose build-stage that can build both.

--HG--
rename : build-stage0 => build-stage
Added MA's deriviation of the average speed of a gas.
minor changes
My final plots
add: fix flipper
add: Rakete
Fix flot plotting on canvas

Fix missing ticks and labels on png from graph
Fix to thick axisborder

Update flot
Update jquery
Minify scripts
Fix axis label clipping
Match legend color to plot
Remove old jquery
Fix javascripts for IE 7 and 8

Remove trailing ',' in objects (i.e. a ',' before a '}')
Fix a for loop in flot, IE would go to far

Add minified version of OpenLayers
Add unminified version of flot
Improve dataset plotting

Improve points for plotting datasets by removing outline and filling
them
Improve speed of dataset plots on IE 7/8 by making them lines
Fix list layout of years and months for IE 7
Align image/source links to right axis of plot
Added basic terrain generation using libnoiseforjava. Escape now untraps the mouse, Escape + Grave (or Tilde, depending on keyboard) quits application
Revised to detect num_failures >= max_failures at generation level.
Detected addition_feasible, subtraction_feasible and crossover_feasible before doing the operation
Updated README.md
Updated package.json
Simplified web.js
Renamed LICENSE.txt to LICENSE
Starling Init
Fix http://www.dzcp.de.de
Merge pull request #133 from hammermaps/patch-5

Fix dzcp.de Link on Install
minor responsive adjustment
Agregando Proyectos de Pato
plugin model updated to return ctors
apidocs update
Added test "temp keys change after importing"
ruby app on ec2
Merge branch 'master' of https://github.com/Ideatorhub/hello
0 - static intro customer page
1 - bootstrap angular app
2a - data-bind customer form (test)
2b - data-bind customer form
3a - customer form validation (test)
3b - customer form validation
4a - customer model, localStorage persistence (test)
4b - customer model, localStorage persistence
5a - wire customer model with CustomerController (test)
5b - wire customer model with CustomerController
6a - customer route (test)
6b - customer route
7a - static routes (test)
7b - static routes (test)
8 - navbar selection
9 - empty restaurants route + redirections
10 - static restaurants view
11 - fake restaurants view data
12a - data-bind restaurants view (test)
12b - data-bind restaurants view
Issue 125 Remove unnecessary call
-Exported the defined css3 shortcut directives
getting ready for 1.2.0 release
build & commit
Hmmm…….
Urgh some stuff.
press enter for new comment
Merge branch 'master' of https://github.com/makrio/makrio
AccountServer Code entfernt, da dieser in ein extra Klasse verlagert wurde.
Do one thing in methods.
more sponsor logos
remove sponsor mockup from assets
updates/changes to parser
frg output box
fb tweak
Fixed OmniMap, now it is properly zooming.

Found many bugs with grid.
Grid, OmniMap, all seem to be working properly.
Put pause in code for visuals.
added an example of moderated mediation
Overhaul of script, including support of Clay

Still a little buggy with clicking the Clay Widget, working on it
throws error from observeError() when it's running or not started
Реализованы и дописаны методы работы с версиями.
Реализован метод для запуска документа внешней программой.
Merge branch 'MainFormPerfomance' into Develop
AVF week 3 commit

Added Addition functionality for cross platform phonegap
test commit
Revert "test commit"

This reverts commit 5623541f162cb972a594d83cb8366b6d43fc090e.
Animation for difficulty images
Persistence for Context.
added better diagnostic messages
Replace prefix matcher completely to supply on typing filtering (Leda only)
Intermediate major refactorings for lazy resolve - test fix (order changed)
Renamed test methods.
Not writing fake parameters of enum constructors to generic signature.
Removed unused code from NamespaceComparator.
more tests for resolve order
Reverted explicitly specifying visibility modifier while override
KT-151 Inherit visibility when overriding
 #KT-151 Fixed

Visibilities.INHERITED constant added (occurs only during resolve), changed after overridden descriptors resolve
Fake descriptors are created for invisible properties as well (is necessary for better error reporting)
test for KT-1805 Better diagnostic for access to private field of parent class
 #KT-1805 Fixed
some unmotivated uses of typeMapper.getBindingContext() replace with use of local field
enabled more tests now that KT-2520 is fixed
Revert "Mejora del sistema de transfigurar."

This reverts commit ab42c2680eb51b52e4cd99acc6ca3dfdaeb71c54.
field config changes
CubeSense Version 1.0.704.1 (06-Aug-2011)
- made System.Drawing namespace available to scripting engine
- added getColorR, getColorG, getColorB functions
- changed all error return codes to negative values
- fixed minor logic bug
- updated "CubeSense User's Guide" documentation
version number 1.0.1 to 1.0.2
Created the BidIntoMarketRole and added to a couple of related agents
Add UglifyJS as a dependency
Added new aproach
Improve progress bar

Count the first and last characters (the 'limit' characters) as part of
the progressbar. Removes the need for the 100% hack, improves behavior
near the end of the file since the floor()'s error increases with progress.
- Updated LWJGL
- Changes in world management, waiting for editor to continue
development.
Tag v0.8
Next is 0.9
Disable cherrypy autoreload

currently cherrypy is crashing when we try to redownload the bot or
change modules due to the autoreload, so disabling for now
A test to try get NNF's submodule to link here in GitHub
Begun adding in items/potions
added this is the difference
Code that does not work
started the implementation of the Polygonizer, but it is not working at all for the moment
overzicht scandirectories met solr
This is for testing purpose, cannot find enough people to test with 10 wow clients, 5 will have to do for now.
Disable trading in BG's crossfaction bgs are enabled

Implement group queueing (this needs testing)
Make people speak the language they belong to in bg's

Todo:
Make people understand their belonging language
Added colour codes and styles.  This addresses Issue #6.
Removed some useless files and fixed map so it works
Remove extra "\n".
Contributions section + minor corrections
Am rezolvat transferul de date intre ferestre (in principiu).
Added admin control interface
User control panel and access control for admins
Change __init__ in lib to use local library path

Change db to use unix style path endings since they apparently also work
in Windows.
Use 'L', not 'l', to indicate a long value
classpath: fix hardcoded jar location
dropped PDFBox, print pdf directly to printer
Added code for displaying text in DefineText and DefineText2, although still rough and edgy....
Merge pull request #12 from kuu/master

Changed TextProp.
playing with randomize cpoints
Removed > Illustrator file
Added raw caster data
Merge branches 'master' and 'casters'
Gradle Release Plugin - new version commit:  'astyanax-1.0.10-SNAPSHOT'.
Added basic documentation for DataSource
Fixes #2602: clean-up path for generated promises, especially in configuration.properties
[ticket/10678-develop] Rename helper class file

PHPBB3-10678
Actif/Désactif pour cours et groupe (ds le code)
Ajouter les pages gérer de session/catégorie etc.
Liste d'attente modifications
Merge remote-tracking branch 'origin/Cours' into dev

Conflicts:
	App_Code/Model.Designer.vb
	App_Code/Model.edmx
	App_Code/Model.edmx.sql
	App_Themes/Default/default.skin
	connection/inscription.aspx
	prepose/ajouterCompteClient.aspx.vb
add A10S datasheet and A10S-OLinuXino-MICRO preliminary CAD files
Merge branch 'master' of https://github.com/OLIMEX/OLINUXINO
vytvoreno dpo2
Fourth commit (test from PHPStorm)
Change state_update() to call from functions described in __new.c. Next, move those __new.c functions into filter.c and filter.h. Try not to lose anything.
Fixed board flipping bug
readme update to include URL of live example
update text color to test git pull onto server
Cleaned up some of the code, began preparations for HDD support... still very buggy, though (crashes on backspace!)
update demo wp db url
implement reusable standard browse page
Removed page property from being validated as it is no longer a required field
AbstractAI.SelectBestZug entfernt
FourConnect: SetField aufgeräumt
Faltacursar seems to be working good, but without optativas
Almost done with faltacursar
Falta cursar is working without optativas
Add clickbox
some change
tip catalog
tips catalog done
add tipscatalog
some change
added text in helpWin
This is a combination of 3 commits.
added helpWin text

sadf

aRevert "Merge branch 'master' of https://github.com/Q115/elevatorSim"

This reverts commit 9fcf93bdec1cb1b0e9281d67be041a38875cd325, reversing
changes made to f4f279292578d4e9bc61ddb1d65346022ca89e6f.
added text in helpWin and fixed the memory leak problem
Sprite generation
Trying another work-around.
toc 1.03
I need to replace my memory with something better
Checagem se o tunel esta certo e chega na saida agora esta correta;
Cursor fica azul em cima de algum lugar ja cavado (aberto ou tunel);
cosmetics: new documentation.
cosmetics: more documenation.
feature: moved tests into cabal test-suite.
added and deleted some files from the branch while i thinking about howe to get EMMA code coverage to work
Added Gymapp.apk
Tweet Answer
MainActivity: Avoid needless Bluetooth activation

Don't ask to activate Bluetooth if the device is incompatible with this
app.
Updated processor.py to store circle and obstacles before printing them and fixed bug with buttons
Descreases font size and increases linespacing for gvim.
fix load_cache()
Fix for other large if() block in Dave's plugin
may as well update things here too? biggest posters caching.
ignore schemes.
milestones.php and avatar.php
improvements to profile.php and ranks.php
Resea completa sin formato
cleanup and explosion converted to an entity
deleted old explosion file
alignment of consts
score added
Merge remote-tracking branch 'upstream/master'
Add PEAR package extractor that honours package.xml formats
Update PearDownloader to use PEAR extractor
Add 'include-path' option to PEAR packages
Mock ProcessExecutor
Test for detached heads yielding an invalid version
Update PearPackageExtractor for package.xml 2.1 support
Add '<>' operator for Version Parser
Add '!=' handling to VersionConstraint::matchSpecific
Make problem report messages more readable

Added pretty strings to constraints
Merge remote-tracking branch 'naderman/error-msgs'
Typo fixes
Merge pull request #814 from shama/patch-typos

Typo Fixes
Merge pull request #812 from Seldaek/recover-refs

Recover to an older commit if a locked reference is not found
Merge pull request #798 from cs278/dev-hash-detached-head

Ensure composer works with a detached head
Basic usage: lock filename fix
Merge pull request #817 from gajdaw/lock_file_fix

Basic usage: lock filename fix
Add autoload example to the package repository docs for clarity
Add update <package> example to docs of update
Merge pull request #775 from palex-fpt/PR-746

PEAR Packages extraction based on package.xml format
Add FAQ about committing deps
Added ability to turn off caching for withOnShow
Common User Data Done
Merge remote-tracking branch 'SmartFIS/master'

Conflicts:
	DDDWebSite/Cachecallback.txt
	DDDWebSiteProject/DDDWebSiteProject.suo
Solution for problem 20.
abandoned each @array b/c of old perl on server
Add authors table to DB
Added transcript model, view and viewmodel. Tests red
Fixed some bugs in Orchid Vaadin