labofsahil/github-event-dataset-2012 huggingface dataset:
apply the implementation of akasaka-san did.
apply UI using bootstrap and change action methods in controllers to do it.
add js file for this application.
add texture and change conversation-area's color.
change some links on header.
add spec for top controller.
add spec on indexBt with some theme existing and change fixture_path in spec_helper.
fix bug on selecting user who mentioned and delete a comment.
add controllers specs
add spec on themes controller and change few routes on top controller.
add variables to show the form of new theme, and put link_to instead of button element on erb.
Merge pull request #3 from omusubiman/rspec

テーマリスト表示＆bootstrap適用＆Controller分のspec
Merge branch 'master' of github.com:babystars/babystar

Conflicts:
	Gemfile.lock
	app/controllers/themes_controller.rb
	app/models/theme.rb
	app/models/user.rb
	app/views/themes/_form.html.erb
	app/views/themes/index.html.erb
	app/views/themes/new.html.erb
	app/views/themes/show.html.erb
	config/routes.rb
	db/schema.rb
	spec/controllers/themes_controller_spec.rb
	spec/spec_helper.rb
フォーク元の変更をマージ
minor fix in algorithms.synteny.scan option to be more explicit
facebook page templ
Manual battle field for valitron
new build
Added live validation support
use 2a
Initial stubbing of VM monitoring server and misc clean up elsewhere.
started acceptance test suite using selenium
added acceptance tests for creating new character
Push to both
nose already installed on travis
Install crontab on deploy
Schedules route
Removed isLive clause
replacing quick builds with normal make which is quick enough
Don't require zsh, sh will have to do
Refactored network connection errors
added missed 'Aspect' class in last checkin
added gitphp library
made the menu trees work with a few rules
fixed output paths for debug builds
Update src/CreateReleasePackage/tools/Create-Release.ps1

Original script failed when called without any parameter
Merge pull request #33 from thoemmi/fixed-debug-output-paths

fixed output paths for debug builds
Merge pull request #35 from thoemmi/patch-2

Update src/CreateReleasePackage/tools/Create-Release.ps1
Renamed Darwin dir
release 0.4
improve readme
fix typo
more docs
Admin app login form should use swapped user model
Updated the version of the app
Removed the scroll view and replaced it by a WebView (for the change list)
Fixed a bug which caused that the application crashed as soon as the lock button was pressed on a tablet
Added a first version of the better layout for the Nexus 7
Added an empty HTML file which should contain the changelog
Changed the icon for the lock button of the app
Added a script to convert the README.md to a html file
Updated the README.md file
Updated the changelog for the next release
Updated the mappings for the next release of the app
Fixed a smaller layouting issue in the new tablet layout for 7 inch tablets
Done an automatic code cleanup
Updated the ProGuard mappings again
improved function initialization (not ready yet)
Added crossvalidation, online-evaluation.
Adding contributing file as per https://github.com/blog/1184-contributing-guidelines
Restructed test cases and added Tree and TreeTest for TreePipe.
added more methods to Tree and more test cases in TreeTest.
renamed Tree methods.
Handle additional return values, and update test case
kozos stap2
fixed C90 errors encountered on Ubunt Natty

error: ISO C90 forbids mixed declarations and code

Conflicts:

	ragel/lexer.c.rl.erb
Got temporary models going and made next game stuff work.
Fixed problem with datechanger
Pulled apart date+time selects
Allow explicit base_class => undef
documentation reorganisation
tests for interaction with Role::Tiny and Class::Method:Modifiers
support has \@attrs => ()
TSV serializer
CSV serializer
added DocumentUp docs page
updated gems
removed note in Readme about requiring eventmachine
updated requirements
removed image URLs from examples to make them more clear
Revert "removed image URLs from examples to make them more clear"

This reverts commit c2d1f97a549d2bb1ae0c5d8e6a8aaf2ffb8f1478.
documentation updates
escape carat in 'resize minimum height/width' regex
use 'debugger' gem for Ruby 1.9.3 compatibility
note removal of 1.8.7 support
fix bundler group requiring
add argument to thumb to specify crop focus
added link to blog post
fix blog post link
updated gems
fix github ribbon
Merge branch 'master' of github.com:afeld/magickly
Merge remote-tracking branch 'origin/master' into single-convert

Conflicts:
	Gemfile.lock
	README.md
Merge remote-tracking branch 'tolsen/single-convert' into single-convert
Merge remote-tracking branch 'origin/single-convert' into thumb_focus
fences caused error messages on install
merit example
フォーム送信ボタン系ユニットの実装を更新、他
Correction Note_Editor

Le champs envoi_visa est activé après 1 retour de l'adm si le montant est inférieur ou égal à 25.000 euros.
added node_modules to the fuzzy finder ignore
sexy slim and locales for active admin
fix image navigation wrap and preloading
fix wrapping and fix fullscreen
a
a
a
b
a
a
oops, dont wait 30 sec/noti
pushed change to make sure code compiels w/o USE_OPENGL
Allow white space to prepend colon after property name
Update devise.gemspec

Reverted change to use my own fix of orm_adapter
Update Monome.sc such that it now supports almost all of the new OSC protocol described here: http://docs.monome.org/doku.php?id=tech:protocol:osc

Renamed led_col and led_row to ledCol, ledRow. ledRow and ledCol now support xOffset and yOffset respectively.

port, host, prefix and rotation are now set with port = value instead of setPort(value) type syntax.
removed temp README from commit history
Adding @spheromak to contributors
Current helpers
empty command line after load another game
saving auto.png; kill'd tempbuffer in fileLoadFromArray.
Library.deleteFile method
almost done loading auto.png, but not showing yet... why?
autosaved picture shown
fix: erase picture on load another game
fix minor bug: gxf_fill sometimes worked after clear picture
add support for the following syntax constructs:
- @import-once
- @{var} selectors
- & directly after an arbitrary selector (ident, class, hash, variable)
- string interpolation ~"someText@{variable_name}someOtherText"
- interpolated strings as selecotrs (~".my-class-@{my_var}") { <rules> }
- top level mixin calls
merge
* orgmanual.org: Started work on Chapter 3
starting to refactor
remove ReorderArray.rb
backing out of module, leaving small refactor
Change copyright license from BSD to GNU GPL
Squashed commit of the following:

commit 14302183f6264df9b4d533ef6d463dd6d9824560
Author: Tim Ullrich <timothy.ullrich@gmail.com>
Date:   Tue Aug 28 22:04:28 2012 -0500

    fixing read bug

commit e2d462f1f048b4fb590053b94fe8a46ce3261ea9
Author: Tim Ullrich <timothy.ullrich@gmail.com>
Date:   Tue Aug 28 17:46:33 2012 -0500

    jpeg library now uses an object oriented model

commit b459386ae8e19c999b1c64633e2be846a4ea7353
Author: Tim Ullrich <timothy.ullrich@gmail.com>
Date:   Tue Aug 28 14:43:52 2012 -0500

    Fixing JPEGReader so that it correctly reads in .jpgs
added start/stop script of powershell
fixed padding issue in h1
Add the script and job description files to enable nightly build on the nesi cluster.
Merge branch 'master' of https://github.com/tyu011/examples
first commit
first commit
asdf
asdf
hello
Added shortcode and widget for profile nav controls
shortcode is now fully customizable
edit页面表单提交逻辑大改动

为以后改成全ajax做准备
fix for service being killed and restarted and draining battery #72
added import for GPX #39  WIP
Areas of interest and polygons
Add PUT and DELETE HTTP Verbs to CORS allow list
static text blocks

folders with language files
coisa bem vinda

ola ola
fixed up modal
srtm_riv: move common part to trace_gear.h
upload/img/tmp/ を追加
Adding numpy.fft to mock modules
city adn country fields
Move distinguished to colors and drop the submodule
add lock screen option in TabViews
final commit before writeup deadline
change # to . in --api
Release 0.4.1
toonnix: Add more test to check if to_roman(2)
info text color and size
readme

updated.
+ cleaning code -> "I feel like WALL-E"
+ fixing "debug_to_sd" ... exit
Clean up MacOS version method usage

The MacOS.version? family of methods (other than "leopard?") are poorly
defined and lead to confusing code. Replace them in formulae with more
explicit comparisons.

"MacOS.version" is a special version object that can be compared to
numerics, symbols, and strings using the standard Ruby comparison
methods.

The old methods were moved to compat when the version comparison code
was merged, and they must remain there "forever", but they should not be
used in new code.

Signed-off-by: Jack Nagel <jacknagel@gmail.com>
Add deprecation warning to non-DSL fails_with_llvm

Signed-off-by: Jack Nagel <jacknagel@gmail.com>
Audit check for old MacOS version methods

Signed-off-by: Jack Nagel <jacknagel@gmail.com>
smpeg: fix audit warning

Signed-off-by: Jack Nagel <jacknagel@gmail.com>
pass 1.2
Wireshark 1.8.2

Closes #14844.

Signed-off-by: Adam Vandenberg <flangy@gmail.com>
aqbanking 5.0.25

Closes #14828.

Signed-off-by: Adam Vandenberg <flangy@gmail.com>
Clarify that brew does not provide XQuartz

Reword the `X11Dependency` error message so that it is clear that an installer
must be downloaded.

Ref #14851.
Tighten post-install checks

 - Avoid ENOTDIR by ensuring that the directories we are checking are
   actually directories.
 - DRY up the check_PATH method; paths are already available via the
   global ORIGINAL_PATHS.

Signed-off-by: Jack Nagel <jacknagel@gmail.com>
Make mongod just work

Hopefully this is safe. I ran a full db against it, everything seemed fine to me.

Homebrew should "just work" no remembering to specify `--config foo`, that's just lame sauce.

Also cleaned up the caveats and removed the `skip_clean: all`.
qt: fix typo

Closes #14856.

Signed-off-by: Jack Nagel <jacknagel@gmail.com>
cleanup: allow --force to remove keg-only brews again

Fixes #14840.

Signed-off-by: Jack Nagel <jacknagel@gmail.com>
cleanup: skip rm_DS_Store during a dry run

Signed-off-by: Jack Nagel <jacknagel@gmail.com>
test: be less eager to set up the build environment

Signed-off-by: Jack Nagel <jacknagel@gmail.com>
Remove dead code

Signed-off-by: Jack Nagel <jacknagel@gmail.com>
Bumped version to 1.2.1

The OSX version of mktemp was not accepting certain GNU arguments.
This is now fixed.

Closes #14864.

Signed-off-by: Misty De Meo <mistydemeo@gmail.com>
pango: needs newer fontconfig on Leopard

Fixes #14850.

Signed-off-by: Jack Nagel <jacknagel@gmail.com>
PostgreSQL 9.2

As always a dump and restore of a previous (9.1) database is required to
upgrade.

Closes #14834.

Signed-off-by: Jack Nagel <jacknagel@gmail.com>
postgresql: use default optimization

We default to Os now, so we don't need to force O2.

Signed-off-by: Jack Nagel <jacknagel@gmail.com>
patches.rb: Generalize File recognition

Extend patch case statements for files to objects inheriting from `IO`, which
includes `File`, or `StringIO` which is used by the external command
`brew-unpack` to store `DATA` sections loaded from Formula files.
Removed some things in config.php
Change links to real Markdown links and add punctuation.
fixed ordering of comments
fixed delete button for comments
Merge branch 'master' of github.com:w7cook/OpenBook
Fixed some parsing problems.
Merge branch 'master' of github.com:waldheinz/bling

Conflicts:
	examples/cornell-box.bling
Minor RGB -> Spectrum cleanups.
update.
(mime-user-interface-product): Update to 1.14.7.
(mime-save-content): Return filename.
New file.
Add setting for mime-mac.el if running with Mac OS X.
(semi-modules-to-compile): Add `mime-mac' if running with Mac OS X.
update.
(Required environment): Modify for the new URLs of APEL and FLIM.
(Mailing lists): Modify for the new Emacs-MIME mailing lists.
Changed to UTF-8.
(Required environment): Modify for the new URLs of APEL and FLIM.
(Mailing lists): Modify for the new Emacs-MIME mailing lists.
update.
Remove descriptions about CVS and add description about the new Git
repository.
Remove descriptions about CVS and add description about the new Git
repository.
(Git based development): Add description about Gitweb.
update.
Added Evaluations Frontend
use prod not prod2
Make auth_user usernames unique before converting charset (bug 731639)
Run dupe removal in the correct migration (bug 731639)
sharpen up Marketplace consumer homepage (bug 740601)
cope with failures on instant refunds (bug 714907)
implement consumer Marketplace navigation widget (bug 744418)
start of crypto lib and passing stuff to the hsm (bug 734450 et al)
add landing browse page for /apps/ (bug 745323)
show error message if confirmation checkbox is not selected on Delete Account page (bug 744397)
bump elasticsearch timeout and upgrade to mozilla/elasticutils
now set ES_TIMEOUT for ESTestCase
show three authors max on app detail page (just for krupa)
fix support email links (bug 745346)
expose manifest errors (bug 711717)
add upsell to Marketplace detail page (bug 743895)
make Marketplace detail page more responsive
only check purchased once
pass src into record URL so it will get passed to metrics
remove install buttons (bug 744903)
Fixed regression by putting new code behind waffle flag (bug 745684)
Updated fluent reference
issue #6: add messaging to indicate feed is from twitter
added qwt plot
Trying to fix clipboard.vimrc
Login Page:

- Logout is working already.
services - fixed filtering services, WebYaST now uses nginx instead of lighttpd
Merge branch 'master' into after_beta4

Conflicts:
	plugins/services/package/rubygem-webyast-services.changes
Add wolfram script
Bang bang module
Pokemon script
Ascii
Abstract script
Fix pokemons script
Improved pokemon script
Hope after that heroku won't idle
Fix description
More scripts from public repo
More recipes
Add transcript recipe
Remove transcript script
create LoonTooth
proposal sketch
Minor change to keyword file location.
Learnt extending the contrller and view
remove unused plugins
clean up commit
clean up plugins & add comment for vimrc
Bug 767344 - Move --restart flag into Mozmill base class. r=jhammel
FedEx Web Services support via spree_active_shipping
把coffeui.fla移到bin文件夹下，在src文件夹下有bug
整理文件夹
Add sourceHost and sourceDir to StoragePool so we can use this with qemu-img
hz2py
modify exec.py
debug #!
Parital work on UserDefaults, created singleton, and wrapper around api, unit test.  Integrated it into with the one user default to AppDelegate
Working on the UI for KeyChain and displaying the dialing ViewController, still not complete
Added keychain support, and beginnings of a dialing interfase, still lacking all actual network support
rubymotion Hello initial commit
Merge pull request #1 from wisesmile/master

This is a test
getting proxy stuff in -- now provisioning and "up" working
removing print stub
New reports page
removing protocol from archive urls in comments to automatically match https
Implementing logout from all devices
FIX: bug.
Use spaces, remove gui settings.
Add configurations for tig.
Update Molokai color scheme.
Merge branch 'master' of github.com:niw/profiles

Conflicts:
	.gitconfig
	functions
conflict
pbcopy alias
increase java stack size
releases memory after use
fixup to README rst syntax AGAIN
Modified title tag on all pages
code cleanup
fixed broken StrokeTest
Update src/core/Camera.js
hh
Merge branch 'master' of https://github.com/wuminghello/WXY
Examples loop around.
copypaste credits from src/inject.js to options.js
finally fixed the database version
added some minor defaults (like remove hello dolly)
minor space changes
working on a filtered view
히스토리, QnA 조금 수정
library dir is now setable
added missing vars as comment (use properties of Ant in IntelliJ)
renamed idea.lib to idea.lib.dir
gemfiles7
net.pipes binding
Added more URL to block related to new tenants
pull hg 6026
Merge branch 'master' into azure

Conflicts:
	.gitignore
	generateHgRevision.sh
fix rev header name for case-sensitive file system
Fake to avoid build errors
CA-84688: log changes ("drift") between a monotonic clock source and UTC

This highlights when problems are being caused by the system clock being manipulated.

Signed-off-by: David Scott <dave.scott@eu.citrix.com>
Merge commit 'd22abcfeb916c79c29ef091f989acec9c06d5d54'
added suggestions and approvals of new topics
Merge branch 'new_topics_interface'
Merge pull request #2 from agreethepeople/topic_suggestions

Topic suggestions
touch up visual stuff
replace gravatar with twitter images
deleted some stuff that shouldn't have been there anyway
fix bug with admin? when logged out
[web] Add cake command for updating dependencies
add events end and collect and error
convert all types to jpg
add PIL package
#1181 Backend Trash menu: No item 
#1181 Backend Trash menu: No item 
Merge pull request #1186 from xillibit/bugs11

#1094 Regression : link missing part
Merge pull request #1187 from xillibit/bugs13

#1181 Backend Trash menu: No item
not allow to remove closed event.
test user/record.php
Fix copyright holder
Merge pull request #188 from semente/patch-1

Fixed copyright holder in baseconf.py.
Merge pull request #187 from evildmp/docs_typos

Added a missing \ in uwsgi docs. Thanks, evildmp.
Merge pull request #183 from rpedigoni/master

Fixed typo in 1.5 release notes
Merge pull request #176 from benspaulding/ticket_18521

Add reST role to templates named in some view docs.
Fixed #17257 - Removed outdated comment in syndication view

Thanks krzysiumed for the patch.
Fixed a regression in the user admin page introduced in a92e7f37c4ae84b6b8d8016cc6783211e9047219.

a92e7f37c4ae84b6b8d8016cc6783211e9047219 switched most of the internal stuff
to format_html. Using format_html in the `render` method of
`ReadOnlyPasswordHashWidget` caused it to generate `SafeString` instances.
Later these safe strings where returned from `BoundField.__unicode__` which
caused force_unicode to loose the "safe" information. This commit fixes that by
ensuring that the render method returns `SafeUnicode` instead of `SafeString`.
Fixed #18254 -- Added ability to the static template tags to store the result in a contextt variable. Many thanks to Andrei Antoukh for the initial patch.
Merge branch 'master' of github.com:django/django
Fixed #18587 -- Typo in management command example

Thanks Frank Wiles.
Removed Django 1.0-specific sections.
Fixed #18589 -- Typo in generic CBV docs.

Thanks cpthomas for the report.
Fixed #18164 -- Precised startapp template context content
Fixed #17978 -- Fixed a minor layout issue when an inline contains a filter horizontal widget. Thanks to Aymeric Augustin for the report.
Fixed #18374 -- Explained "corrupt image" error

Thanks fabian and charettes.
Fixed #18430 -- Use the FILE_CHARSET setting when reading from a file during post processing with the cached staticfiles storage. Thanks to Brant Young for initial debugging.
Merge branch 'master' of github.com:django/django
Fixed #18050 -- Fixed a rather glaring bug in the handling of @import statements when using the cached staticfiles storage.
Fixed #18487 -- Made sure that protocol-relative URLs aren't processed by the cached staticfiles storage. Thanks to LukaszBalcerzak for the patch.
Fixed #18590 - Reverted Python 2.4 workaround for Model pickling

Revert of 08d521efa0. Refs #10547, #12121.
Thanks Michal Petrucha for the report.
Move rainmap out of /nmap-exp and into its own directory
rewrote part of the hostname validation bug to remove the use of all() (which is not available in python2.4)
admin-related changes, notably the inclusion of the grappelli admin theme
admin-related changes, notably the inclusion of the grappelli admin theme
admin-related changes, notably the inclusion of the grappelli admin theme
admin-related changes, notably the inclusion of the grappelli admin theme
decided to remove grappelli for the time being, and stick to the Django-provided admin theme. updated INSTALL doc and example settings file to reflect that
page navigation should not appear if there are no scans at all
moved pagination <div> outside of <ol>, as it wasn't valid markup
various template changes, mostly to wording, though some of the structure has also been tweaked
bigpatch, includes some a new template for the self-hosted version of Rainmap. excuse the patch size...
GSOC'10
new template/theme for self-hosted version of Rainmap. this should be the GSOC'10 commit, didn't notice the mercurial -> svn conversion had issues before my previous commit
improved target-field validation algorithm and removed IPy dependency. tweaks to templates to make errors messages related to validation more clearly show which field they are tied to
removed from docs/INSTALL_NGINX the parts that were common to INSTALL; INSTALL_NGINX is to be used in addition to the regular installation procedure, as there isn't a lot of difference between the two.
a bit of SVN cleanup, admin-media got included accidentally in the latest checkin
updated TODO
added email-related options to the profile page
All asynchronous tasks are now executed outside Django, and scan setup is performed in the app controller (views.py). With tasks outside Django, we can properly deploy multiple workers that will only deal with scanning and converting results into HTML, then pass results back to the webapp server.

Tasks are now in src/celeryd/rainq/tasks.py. The settings.example file shows how RabbitMQ clustering should be setup, with CELERY routes. It is necessary to perform the `process_result` task on the webapp server (wherever Django runs) for now, so that's what we need routes for.
Added message on scan page notifying the user there are no results available.
update submodule
Merge pull request #148 from jrogelstad/master

Update orm submodule
updated to latest version of Sass, fixed deprecation warnings
Fixed “3rd party plugins” wiki page link

Signed-off-by: Brandon Mathis <brandon@imathis.com>
Merge branch 'master' of git://github.com/imathis/octopress

Conflicts:
	README.markdown
[Project View] Edit name directly after click on project name.
Migrated base files from apps/topology
merge local changes
add local modifications
Removed old argument parser
-moved LLDP related insertion to discovery management
- fixed wrong debug message argument order
- remove discoveries's initial block period
- merge topology/discovery option argument parsing
- add option structure for service mgmgt heartbeat ping
- unified startup process for {topology,discovery,service}_management
- moved openflow_application_interface initialization to main()
- renamed openflow_application_interface service name
- updated TODO comments
- add {Switch,Link} topology cache to Ruby API
- fixed debug log message formatting
- fixed property name difference between Ruby and C layer
- add to_s to Topology Cache related structures
- fixed format string bugs
- fixed hex formatting string
- fixed hex format string
- added a method to manually update Topology Cache on async {sw,port,link} notification
- simplified Switch,Port,Link constructor
- add show_topology
- add usage example to module TopologyCache
Add show_switch_status command
use multi_json gem
merge branch feature/multi-json
Reworded the user private message body.
@wip
Added mail helper to build first line of invitiation email.
@wip review feedback
Incorporated review feedback for a spec.
Removed parens from an if statement.
[wip] Change color of counter when negative
Convert Event to use new job
Added the .htaccess file and the main controller.
last version of atk14
reorganização + tonic + PHPUnit
reorganização dos testes
dao teste
instruções
cleanDB depois no fim dos testes
inserts para teste
show name in secured host
Content Entry classifications
Update teams page.
Introduce Analysand::Database#drop!.

Useful for situations where you can't proceed unless you know the
database is gone.
add shuffle and sort commands
add visualization setting of zenkaku-space
.zhrc
Merge branch 'master' of github.com:yo0049/dotfiles
link shopping item to amazon
updated config auth handling
Background corrected.
Update my location
Merge branch 'master' of https://github.com/yvg/soundsquare
add three color scheme, and set max windows in win32 mode
Don't use _reusableCells.allValues makeObjectsPerformSelector: because it doesn't quite do what I want, and add short circuits to failing when reload/delete/insert is called but there are no items to reload/delete/insert
rake task np
Bump gems; Abre links do github em uma nova aba
Manual merge from https://issues.apache.org/jira/browse/WICKET-4019 version 1.5.7.2
Some cleanup
ResponseState needs some decoupling and sanitation
updata thanks
add fclose at the end
BLACKTIE-399 update to fix socket sender shutdown bug
JBTM-1063 add hudson script
JBTM-1063 update the build
JBTM-1063 update sed
do not expand options when set
1，修改异常问题
optimized selection of map element rendering
added animation presets and optimized animation handling
doc: controllers and upgrade notes

Moved these over from the old database. Also addressed some more
warnings and removed the unused controller_home controller.
mod_survey: added 'date' and 'phone' validations for short answer questions
更改页面分页显示50条数据，修改分配顺序>0
Signed-off-by: loou <loou@vip.qq.com>
mark3.0
Signed-off-by: NameJun <122419795@qq.com>
优化
Signed-off-by: NameJun <122419795@qq.com>
Merge remote-tracking branch 'jj/master'
Merge remote-tracking branch 'thok-zxl/master'
Merge remote-tracking branch 'thok-zql/master'
库存历史明细（mark）
Signed-off-by: NameJun <122419795@qq.com>
mark0918
Signed-off-by: NameJun <122419795@qq.com>
Merge remote-tracking branch 'jj/master'
Merge remote-tracking branch 'zql/master'
1.修正了ExportExcel.cs的数据超出。2.添加了ProductTimeOut打印页。
Signed-off-by: NameJun <122419795@qq.com>
Merge branch 'master' of git://github.com/THOK-SW/wms_rfid.git
抽离、封装
Signed-off-by: NameJun <122419795@qq.com>
修正
Signed-off-by: NameJun <122419795@qq.com>
局部调整
Signed-off-by: NameJun <122419795@qq.com>
Merge remote-tracking branch 'jj/master'
修改Global.
修改Global. web.config 身分验证方式；
货位历史明细打印调整
Signed-off-by: NameJun <122419795@qq.com>
去掉虚线
Signed-off-by: NameJun <122419795@qq.com>
setup capistrano deployment
Merge branch '3.0-gem' of github.com:zurb/foundation into 3.0-gem
setup deployment of 3.0-gem branch
建议功能
去掉失败
Finished first cut of the User model
fdsfdsg
a
dasda
New functions for adding host header values to either a new or existing IIS website. IIS7 script supports multiple protocols; IIS6 does not
Specs for Trufflepig::FeatureList
More patterns
Set correct homepage in gemspec
Replaced complex web app plumbing diagram with two contrasting web page and web app
adding ey_config
Changed rotate key to become power key
init: Fix LPM for charging_mode_booting

Change-Id: I8093a9c265bdc2331235baa2c0294031b1b9c06b
Logging u. rudimentäre Config
Some city tweaks and interface
Using the simpler, shorter description from the website.
Crea el ejecutable en el directorio bin
- Upgraded to Bootstrap 2.0.2
- Fixed a lot of fixed-width issues and made the site more resolution independent
- Added Collapsable navbar
- Linked to online docs
Clean docs only as part of regeneration
Track build.xml again (use -- update-index --no-assume-unchanged to commit again)
Monte Carlo experiment
Trial loop and statistics
Bitmaps for MDA
Document philosophy.
Another dumb bid/uid/bpr/upr fix
remove jasmine stuff, it is not even used for the moment
[Fix #31062311] canvas width/height attributes are high-priority values
[Fix #31062195] do not show 1/3 preview for dynamic mode, it also fixes passing this time as first one for modifiers when duration is set to Number.MAX_VALUE
Relocating
relocating
Setting jquery and css attached to options
Allow Markdown/HTML in fit/preset descriptions.
Fix: important and stupid bug.
Version 0.2-rc3.
+ Readme update
+ Translation to Low Level Lambda refactored
+ Readme update
fix arguments
build
Merge branch 'master' of https://github.com/Berhell/Jurilink.git
Remove profiles and set skin settings back up
Merge remote-tracking branch 'origin/master'
glow fix for tripanelsquare
Settings conversion part 4
fixed video nowplaying widget
fixed genre for movies
added instruction notifications
defaultfolderback fixes
Merge remote-tracking branch 'origin/master'
pvr: workaround for ListItem.HasEpg issue
Merge pull request #433 from xhaggi/pvr

pvr: workaround for ListItem.HasEpg issue
thumb ---> art(thumb) + work for album widget infopanel
artistslideshow in musicoverlay (doesn´t work when starting music from widget panels without this)
small bracket fix
timing sync
add statics,Optimize the directory structure.
Add header. Try to improve distance computation.
Add some functionality for fading music properties and some additions to the logging output
Fix a segfault when loading of a module failed. Also added a very basic cmake setup
Remove old makefile
Cleanup, fix some memory leaks and add functionality for full reloads via the api
setup environment for branch qp
Gathering Res: citations on comments
edited asd files for :serial t. modified foreign library definitions for darwin.
edited asd files for :serial t. modified foreign library definitions for darwin.
added clinch-pango package, and a quickload macro to presentation.lisp
Added a few defvars to presentation to try to hush warnings, and a declaration to make-pipeline to silence warnings when w or h aren't used.
Merge pull request #18 from djuber/master

Looks good to me!
Todo removed from project; Rotation of pixmap now being tracked by a float; SLOTS and SIGNALS connected for clicking an event
Added to authors in README
Fixed a few bugs with IV drips.
Derp in previous commit.

Whoops. :(
Removed padding when ofp_instruction_header length <= 4.
testing more zIndex changes
Fixed breadcrumbar bug but not finished
Merge pull request #38 from AndyYou/master

Not fixed bug
sensor value interpretation
Update to Robotium 3.6
click was too fast
refactored assertmessage
added sleep for drag to work
Merge pull request #106 from Catrobat/RobotiumUpdate3_6

Robotium Update 3.4.1 to 3.6
* Speed improvements, tests are now 5 minutes faster
* Very minor changes needed
Update README.md
Merge branch 'master' into CatWall_Master
Merge remote-tracking branch 'origin/CatWall_Master' into CatWall_MajdaOsmic
testSpriteListDetails modified to identify the issue
issue 209 fixed
Issue209: acceptance - removed unnecessary spaces
Merge with Issue209
Update  Issue209
Status: MergedIntoDefault
update tags
Initial commit
Update README.md
Merge branch 'master' of github.com:Catrobat/Catroid
Deleted .hgignore file
Merge branch 'master' into MarkusHobl

Conflicts:
	catroidUiTest/src/at/tugraz/ist/catroid/uitest/ui/ProjectActivityTest.java
first debug changes
issue fixed, added test
Minor change
switched to dark theme, text on bricks now white on android 4 devices
fixed test
added a test
Merge branch 'master' into deleteUnusedPictures
Update README.md

Moved large parts of the description from code.google.com here.
Update README.md

Added all links from code.google.com to the readme.
Update README.md

Added GSoC 2012 logo.
fixed crashing tests
reverted changes, refactored test
Merge branch 'master' into deleteUnusedPictures
Merge remote-tracking branch 'origin/master' into CatWall_NativeApp

Conflicts:
	catroid/src/at/tugraz/ist/catroid/io/StorageHandler.java
	catroid/src/at/tugraz/ist/catroid/ui/dialogs/DeleteCostumeDialog.java
Merge remote-tracking branch 'origin/CatWall_NativeApp' into CatWall_Majda

Conflicts:
	catroid/res/values/strings.xml
added keys properties file
The simple parser of header and reflection tests
Added the tests in catroidFileTest to CatroidTest. Changed the parse
method to parse an input stream
refactored and removed comments
added the new test to test new headers
Implemented the new header parser, independance from the the header tags
enum. 
Refactoring
Reafactoring after feedback
Used reflection to set private variables. 
Added the XMLAlias annotations and changed the reflection object creator
and added the Map returning to the parser.
transient field check
Refactor and changes on feedback on 21-06-2012
Added the parse Exception
extracted a method to dynamically get a object with parsed values. Needs
improvement
Merge branch 'master' into XmlSerializer
Project class restoration
Merge branch 'XmlSerializer' of https://github.com/Catrobat/Catroid.git into XmlSerializer
Removed xmlvalidationtest from CatoidTest
Revert "Removed xmlvalidationtest from CatoidTest"

This reverts commit 107b4f7ce38f70e47b452c979d57d0e28f906955.
Removed xmlValidationTest
File corrections
Refactored StringsTest to be more accurate

Previously, StringsTest.java, when looking for a string like
'R.string.no', would also match 'R.string.notification'. Thus, falsly
thnking that 'R.string.no' was indeed a used string, when there was no
occurance of it.
I corrected it via a Regex pattern in the hopes to get more accurate
results in the future. A few strings were removed after the test found
a few of these cases.

values/strings.xml was modified as a whole, changing line endings from
\r\n to \n.

I added <!-- --> after string categories because it makes a much nicer
formatting, categories are now visibly separated from each other.
Merge pull request #92 from Catrobat/RefactorStringsTest

Refactored StringsTest to be more accurate
Refactored AboutDialog a little bit.

* Renamed resources where necessary
* Deleted test in MainMenuActivityTest because the same is already being
  tested in AboutDialogTest
Merge pull request #94 from Catrobat/RefactorAboutDialog

Refactored AboutDialog a little bit.
Merge remote-tracking branch 'origin/master' into
ProjectActivityForRealNow

Conflicts:
	catroid/res/values-de/strings.xml
	catroid/res/values/strings.xml
Refactored error dialog
added error Dialog test
small changes
refactored error handling in project manager
added InterfaceClass
fixed wrong error message string for version number
implemented errorDialogFragment
update robotium libs
from robotium.solo 3.3 -> 3.4.1
refactoring of solo scrolls
refactored testprojectnames
caused problems in some testruns
removed deprecated uitestutils method
refactored all method calls for click on actionbar item
small change
removed deprecated robotium method calls
refactoring BroadcastBrickTest
should be more stable now
refactoring of GlideToBrickTest
should be more stable now
refactoring of TouchAxisTest
should be more stable now
refactoring of MyProjectsActivityTest
should be more stable now
refactoring of myprojectsactivitytest
before (long)click in list, wait for fragment
refactoring failing tests in StageDialogTest
further refactoring...
Re-added junit.jar file.
Basic RPC communicator/router is added. Check Login button with Firebug
added gitignore for README3
wtf github, why you breaking my markdown?
Changed soem strings
New slap command, I will update the rest later
Made stuff look nice
Ajout des fichiers xml de test
VM inherits Operation
use cached string in TypeOf
Fixing fio script
FIO reads and writes
splashes added!
Remove the cache system because it's not necessary.
Also add a test in _dbg to switch between CLI or SERVER running mode.
Renamed OApi and OApiResponse.
Add method getNodesByTags($tags).
Fixing normal vector estimator weights functors
update news_detail
Cut off fpconst dependency.
Merge remote-tracking branch 'jonozzz/develop' into develop
a enlever
Revert "a enlever"

This reverts commit 31a3995f20c2d52ac021a499fc0921fe2e5fbeea.
Merge branch 'master' into damien
recup
plop
maj
Merge branch 'master' into damien
Merge branch 'bigodam' into damien
roc
p
Merge remote-tracking branch 'origin/bigodam' into damien
p
partie personalise fct
affichage complet
merge master
test echec
deplacement du roi
merging from master
affichage revoir
recup
Added autocomplete and dropdown tags
新增相册模板
More robust code around declared but missing nagios.cfg
- Fixed interprocess comm
- Register metrics
Fixing df test on linux
Remove a new style string formatter
Added python math
Generated template UI in MainWindow

Generated template UI in MainWindow.xaml and MainWindow.xaml.cs. Don't
have system so wasn't able to run and test code before check in. Worked
on trying to get the call backs working. So far it should turn orange
and print to console if selected. Debated between using grid or buttons,
ended up using buttons for now. Most likely will be refactored later on,
esp for better organization and efficiency.
Remove red background - only text red color; remove text if thex exits
add module simplenews
add module service_links
add module backup_migrate
Revy?
revamped tutorial, not fully tested yet
Simplify and point at dev site
Empty jobs need something in them
Input method NPE fix was merged.

Change-Id: Ibb1dc02f33490528bc1e9d2f24079a1c4da10e03
Removed Windows server batch file.
Create playground.coffee
Manifest: add vendor/asus

Change-Id: Icc1e590ee165230e79236ce0874f22ef76bd9c5d
§9a Die elektronische Mitgliederversammlung
Can switch between data reprensentations with space key
pts wrap, squash
Фильтрация тизеров\трейлеров
:trollface: updated at 2012-11-22T09:42:48+08:00
more texts and imgs for portal blog entry
Merge branch 'master' of github.com:FourSquad/portal
Get rid of pnUtSync and CLock.
Kill pnUtilsExe.
Fix hsThread_Unix compilation.
Kill as much of pnUtPath as possible.
Using CCmdParser here is ridiculously excessive.
Include plFileUtils in plUruLauncher.
Merge pull request #212 from dpogue/pr_murder

Code Murder
Build 912
Cmake scripts for MSVC precompiled headers
Precompiled Headers for pfPython

Also did some work on decreasing header bloat. No promises on a complete
job--this was just enough to allow PCH to actually help us out (and boy
does it!)

With an Intel Core 2 Duo (4GB DDR2 800)
With PCH: 50.51 seconds
Without:  4 minutes, 17.14 seconds

:D
Add pyMatrix and pyGeometry to pfPython PCH

This also includes some header debloat and const/reference fixes
(particularly in pyMatrix44). This will result in the generation of
slightly more efficient code.
Avoid truncated window size after going from fullscreen to a window of the same size.

Must set the window size after the display resolution, otherwise Windows may clamp it to a smaller size than specified.
Merge pull request #214 from cwalther/window-size

Avoid truncated window size after going from fullscreen to a window of the same size
Fix a bug that should never happen

This fixes a crash that occurs on systems with no Direct3D device
available. The device selector returns a NULL string, which is then
strstr'ed for some ancient nvidia card. For now, let's wrap that in a NULL
check. Eventually, when we scrub plClient.cpp and winmain.cpp, that hack
should just be dropped.
Merge pull request #215 from Hoikas/trollfix

Fix a bug that should never happen
Merge pull request #213 from Hoikas/pch

Precompiled Headers for pfPython
Display SO name in spawn list
Merge pull request #219 from boq/spawn

Display SO name in spawn list
Merge remote-tracking branch 'huru/master'

Conflicts:
	Sources/Plasma/NucleusLib/pnProduct/Private/pnPrBuildId.cpp
Merge branch 'master' of git://github.com/GehnShard/Plasma
updated markdown submodule
Manifest Market
Fixed Global chat not relaying some connected messages to the server.
Fixed Global Chat attempting to send messages once a kick / error occured in the global thread.
Added alias(s) /gc and /gl for /globalchat
Make frames contexts executable.
Handle subsequent loads in frames properly.
Looks like previous code was not triggering onReady event on subsequent loads, so do we do the same.
Use `iframe` instead of `browser` since location change in the browser
does not seems to trigger `inner-window-destroyed` notifications.
Use utility function to obtain innerWindowID.
v/Delta t -> Delta v/Delta t - meca q1
cleaned up indentation and cut at 80 characters - meca q1
pdf update - meca q1
Merge branch 'master' of github.com:Gp2mv3/Syntheses
QUADRI set to q3 instead of q1 in q3.mk - q3
non-libre -> lié on math q2
intégrales multiples reviewed on math q2
Pass composer configuration to VcsDriver
Remove redundant __contruct from VcsDriver implementations and move init code to initialize method
Store vcs repositories in composer home to prevent permission issues
eglibc: add libdir to configparms

Sometimes eglibc is installed into wrong folder lib64 instead of lib. I couldn't figure out why but setting folder in configparms helps.

linker error:
.../ld: cannot find crti.o: No such file or directory
.../ld: cannot find -lc
.../ld: cannot find crtn.o: No such file or directory

forum reference: http://openelec.tv/forum/64-installation/48318-error--libgccsso-error-1#48318
autoupdate: fix autoupdate script

Signed-off-by: Stephan Raue <stephan@openelec.tv>
xbmc-frodo: update to xbmc-frodo-0ff0d2e

Signed-off-by: Stephan Raue <stephan@openelec.tv>
xbmc-pvr-addons: update to xbmc-pvr-addons-388254a

Signed-off-by: Stephan Raue <stephan@openelec.tv>
xbmc-addon-xvdr: update to xbmc-addon-xvdr-42d78a2

Signed-off-by: Stephan Raue <stephan@openelec.tv>
projects/Generic: add installer config to install with partsize=255MB

Signed-off-by: Stephan Raue <stephan@openelec.tv>
xbmc: XVBA reduce needed memory, in particular during channel switching
Merge pull request #1290 from vpeter4/system

eglibc: add libdir to configparms
xbmc-theme-Confluence: rename settings patch

Signed-off-by: Stephan Raue <stephan@openelec.tv>
xbmc-theme-Confluence: remove not more needed patch

Signed-off-by: Stephan Raue <stephan@openelec.tv>
linux: update to linux-3.2.31

Signed-off-by: Stephan Raue <stephan@openelec.tv>
This patch ist take from kernel.org without any changes. It improves the handling of hd-channels exactly the dvb iso transfer packages. It works fine fpr my HVR930C
Revert "This patch ist take from kernel.org without any changes. It improves the handling of hd-channels exactly the dvb iso transfer packages. It works fine fpr my HVR930C"

This reverts commit 5e256123aef91e561fac96db68557d3bc3701666.
The Patch is taken from the linux-media mailing list

I changend only the path
Here is the original message:
+This patch adds a module-device-table-entry to the
+technisat-usb2-driver which will help udev to on-demand load the
+driver. This was obviously forgotten during initial commit.
+
+Signed-off-by: Patrick Boettcher <pboettcher@kernellabs.com>
+---

this fixes #1140, this fixes #1300

Signed-off-by: Stephan Raue <stephan@openelec.tv>
busybox: add applet 'nohup', this fixes #1259

Signed-off-by: Stephan Raue <stephan@openelec.tv>
xbmc: fix Czech translation, this fixes #1332, this fixes #1335

Signed-off-by: Stephan Raue <stephan@openelec.tv>
linux: add upstream patch

Signed-off-by: Stephan Raue <stephan@openelec.tv>
new package: add package 'iana-etc', this fixes #1336

Signed-off-by: Stephan Raue <stephan@openelec.tv>
xbmc-frodo: update to xbmc-frodo-9777cc0

Signed-off-by: Stephan Raue <stephan@openelec.tv>
Added before and after for Date Constraint.
add mysql db
增加article_schema,还须加入sso及session
add auth filter
add auth filter
Revised the signature of crossover
fix url to travis
dance with tambourine phase 4
加入，linear rand for test
Merge branch 'master' into gh-pages
Update database scripts for LibrePlan 1.3.2

FEA: ItEr77S03Community
Update Debian package for LibrePlan 1.3.2

FEA: ItEr77S03Community
Update RPM package for LibrePlan 1.3.2

FEA: ItEr77S03Community
Update NEWS file for LibrePlan 1.3.2

FEA: ItEr77S03Community
Bump version number to 1.3.2

FEA: ItEr77S03Community
Bug #1584: Fix corner case issue filling the advanced assignment pagination intervals

FEA: ItEr77S04BugFixing
Improved task name style inside gantt view popup

FEA: ItEr76S04BugFixing
Replaced comma separator on Task resourcesText as it was already used on each resource

FEA: ItEr76S04BugFixing
Add support to BaseCRUDController for automatically focusing first .focus-element component

FEA: ItEr77S04BugFixing
Add first input focus-element behaviour to BaseCRUDController subclasses

FEA: ItEr77S04BugFixing
Bug #1418: Focused worker firstname on creation

FEA: ItEr77S04BugFixing
Fix extra vertical padding issue on WBS tree rows

FEA: ItEr77S04BugFixing
Fix left padding issue on company view project names

FEA: ItEr77S04BugFixing
Make more compact advanced search criteria filter tree

FEA: ItEr77S04BugFixing
Fix vertical alignment problems on component to add new resource allocations

FEA: ItEr77S04BugFixing
Make more readable date constraint component on taskdetails

FEA: ItEr77S04BugFixing
Bug #1579: Add autodisable to save-and-exit button on all standard CRUD forms

FEA: ItEr77S04BugFixing
jwysiwyg images added
graph.py: Added an assertion in Slot.setValue to prevent users from using setValue when they should be using connect()
OpInputDataReader: 2D image files are now cached when read from disk.
add nursery docs
Fixed a crash bug in LeftViewController.m
Merge pull request #93 from Elegia/master

Fixes a crash in LeftViewController.m
Fix for license list now being a <tr> element
More profile bg removal stuff.
[QA] Minor grammar fix in feature file.
Use blessings for terminal support.

This is far cleaner than termcolor for our purposes.  Although we're not using
much of the functionality this is now the common dependency for terminal
handling on the systems I use, so it is more likely to be available than
termcolor.
Make blessings usage optional.

Thanks to Leal Hétu for the report.
Merge branch 'feat/blessings'

* feat/blessings:
  Make blessings usage optional.
  Use blessings for terminal support.
Game runs much smoother.
Zohledneno par Adamovych pripominek.
Added a package to hold the scripts
added WMS support officially
improved the organization of post controller, added the ability to edit
postings, add use of language bundles, added display of thumbnails on
posts
Type checking tests and fixes, constructor fixes
avoid default arguments on groupBy() by having groupByTo() if the caller wishes to specify the Map to group into. Also tidied up the sample code in CollectionTest
Fixed navigation to non-Kotlin classes.
Made checks for Kotlin namespace more robust.
Replaced assertion with returning null when class file contains several classes.
Removed unnecessary "abstract" before "trait" in DescriptorRenderer.
Added support for nested classes in decompiler.
Added better rendering for objects in DescriptorRenderer.
Added class objects support in JetDecompiledData.
removed unnecessary ": jet.Any" in class declarations.
Removed unnecessary /*compiled code*/ marks from abstract members.
Minor.
Refactored JetDecompiledData: extracted DecompiledDataFactory.
Replaced JetDecompiledData.getClsFileIfKotlin() with getClsFile() and isKotlinFile()
Added LibrariesTest (checking only one decompiled source yet).
Added test cases checking all decompiled files.
Moved WordSelectionTest to jet.plugin package.
Added checks for navigation elements for cls members.
Fixed JetFunctionParameterInfoTest. Replaced Int with jet.Int, Boolean with jet.Boolean, etc in test data.
final modifiers added
Report exceptions even when running under a release build of IDEA
Scripts/Icecrown Citadel:
* Temp fix heal player when Harvest Soul
Fixed Less css option so headers are sent properly
Change Figure from number to name reference
Split ToDo.rst into RSTQuickstart.rst and FutureWork.rst
Shout out to IO language for inspiring with_<dependency> pattern
dont set connection timeout on client
Updated API key structure
Keep global property color setting

Change-Id: Id66b443c310f2cc8d665a7208b7aa631da87c7c6
Merge topic '13064-fix-cube-axes-color-setting' into next

31d4c74 Keep global property color setting
Remove the Qt include that is not needed

Change-Id: I3755e67e9a111abc2d301e73c64ff32239c6edde
Merge topic 'fix-non-orthogonal-source-cmake'

4ade84d Remove the Qt include that is not needed
Fix management of animation scene creation

Animation scene creation was triggered in case of multi-server
when we were disconnecting to one of our remote server.
The first attempt to fix that issue was incorrect.

Now we check if the server/session is in a state that illustrate
that is going to be removed. If so, we simply prevent that scene
creation to happen.

Change-Id: I7e15f485ef9c8d6c1fd7ed972962c64f5e98b075
Merge topic 'multi-server-view' into next

281abe0 Fix management of animation scene creation
fb group button changes
STELLA FIXED BUGGY SCRIPT.pl
Changed test sequence for reverse_seq code
Update botmodules/strava.py
Changes to migration file
gwt bugfix
Fixed slight oversight in enemy attack text
Fixed stairway message oversight
Custom ignore for ctrlp
Add scoreboard link on home
scoreboard
scoreboard
qa_controle overzicht
Fixed full interface paths in definitions.
Tweak .travis.yml to get it building
Add missing test for ZMQ.Socket.bindToRandomPort
Fix typo in ZMQ.Socket.bindToRandomPort which results in invalid port numbers, <1024 and even <0