labofsahil/github-event-dataset-2012 huggingface dataset:
add evnu & omongkosong
Add x86mem-bandwidth
Corrigido Defeito 5 - Modelo Conceitual;
reduced instantiation in floats manager
some methods was added
Fix: this field is for 3.3
Fix: Modify spanish VAT to new rates (Juanjo)
Merge pull request #367 from simnandez/develop

Fix: Bad assignation of const for pdf delivery module name
Add specific README.md for DoliWamp directory of sourceforge.
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
New: Add a test during upgrade if database version is too low.
Fix: broken features and uniformize code
Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop
Fix: broken features
Fix: compatibility between bureau2crea theme and multicompany module
Fix: edit of percentage
Fix: edit of percentage
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
Fix: percentage during creation
Fix: Avoid repeat of img
Works on larger screens
New: ECM autodir works also for files joined to products and services
Fix: error report when duplicate product
Fix: Some fix into ajax ecm.
New: The cache for nb of files into a dir is now implemented. By
default it is "not defined" and we refresh it when making a scan of a
dir for all subdirs.
Fix: strict mode plaza
Updated version number.
Fixed conflict.
New function to convert bbcode to markdown.
New option in the bbcode parser to disable oembed.
OEmbed: Don't output the width of images
Merge branch 'master' of github.com:annando/friendica

Conflicts:
	include/oembed.php
Merge pull request #349 from simonlnu/master

minor template tweaks
share RSS items
Merge https://github.com/friendica/friendica into pull
expand support for BB code-to-Diaspora conversion
cleanup lists and more comment signature stuff
Merge pull request #350 from fermionic/improve-bb2diaspora-conversions

Improve bb2diaspora conversions
cleanup mod/share
Diaspora: Messages are now looking better
Merge remote branch 'upstream/master'

Conflicts:
	include/bb2diaspora.php
liking comments backend
Merge pull request #351 from annando/master

Massive change in bbcode2markdown
like comments
Merge https://github.com/friendica/friendica into pull
typo
make feeds work with comment likes/dislikes
cokmment likes not propagating
fix base path again for installs into subdir of http root
Added file for hog features
Adding HOG extraction
Merge branch 'master' of github.com:sjavdani/statsproj
First addition of HOG feature extraction. Neads cleanup
source code formatting fixed
grouping: The expectation is that if there is a virtual clump of length N, then each iteration through that clump there are N elements available. This patch breaks that assumption.
Revert "change clump when the group size is greater than the sequence length"

This reverts commit baedb316c5e5c966400b903ac9bebd9bc70fbeba.

Conflicts:
	basis/grouping/grouping-docs.factor
	basis/grouping/grouping-tests.factor
	basis/grouping/grouping.factor
calendar: some minor performance improvements.
calendar: speed up >gmt.
xkcd: XKCD Literals. Duh.
cmd/6g: cosmetic improvements to regopt debugging.

R=rsc, golang-dev
CC=golang-dev
http://codereview.appspot.com/6528044
Разделение на базы
Мелкие исправления
Merge branch 'dev' of github.com:slowpokes/platform into dev
better than requiring backports, use our own require_relativish thing
don't allow the default project to build without snap-loader-static when no flags are specified
Driver program.
add system unify duration access
use last p-u 3.0.4
pre-pull commit
Merge branch 'master' of github.com:spartango/Anne-bot
work on nesting stuff
score threshold to 65%
lowered threshold to 60%
Removed pep8 errors.
update framework example
/icons endpoint
Fix a scrollbar bug on dialogs
Consistent style on image previews for features
Fix the asset selection for images in page content
Polish on the asset library: in progress indicators, 'upload a new file' prompts, layout tidy ups
Reorganising styles and separating the config, styling tweaks.
List positioning controls and behaviour
Merge layout.css.sass
fixes a KEND syntax error
changed check for if we are out of bounds
Dispatch user data from template to JS
interfaces/http.py: Don't bind port until starting interface
Revert back changes
Tracking back changes
Tracking back changes
Tracking back changes
Merge branch 'filling-in-layout'

Conflicts:
	app/views/layouts/_footer.html.erb
	app/views/layouts/application.html.erb
fixed an issue with ping timeouts
added admin plugin
Update notes for submitted changes

* Document state-path configuration option
5.0 toc update
subpath sorting working, *yay*
introduce <dl> for text formatting
i965/msaa: Implement GL_SAMPLE_ALPHA_TO_COVERAGE.
i965/msaa: Implement glSampleCoverage
Add tests pr3522653, complex_lidx, generate_case3
11 & 17
Changed the name of the GetStatusInfo function
shot handling fix
fees_payer is clearly set at this point, no need to check
Merge branch 'master' of github.com:stoffus/payson_api
test.c - adjust indentation
removed useless lib
corrected name of var
corrected name of vars
Moved FAST_MATH and FAST_TRIG defines to cmake
Merge pull request #34 from subcomandante/cmakefix

Moved FAST_MATH and FAST_TRIG defines to cmake
Merge pull request #35 from subcomandante/readability

Readability
got buttons working again
fix template for leg_id
Fix css bug and add sidebar to bills.html
Merge branch 'master' of github.com:sunlightlabs/billy
Log an event at least, when pony fails
changes to base styling
Adds mini magick
Configures image uploading for fog/s3
Currently doing MVC for customers.
UNSTABLE: Still having a bug in the signin process.
Fixed the form action parameter in the new_account view of the login controller: added a route for the signin action of the login controller.
Used divs as a layout for the form elements in the new_account view.
Removed the new_account and signin methods of the LoginController class since the new/create method of the CustomerController does the same job.
Added several named routes for login/signin/logout purposeswhich are mapped to related methods in the LoginController and CustomerController classes.
Added some validations rules in the Customer model to:
- ensure the presence of a login value with at least 6 characters
- ensure the presence of a password value with at least 6 characters and a value confirmation check
- ensure the presence of an email value and its format validity
Added a migration to add an index on the login column of the Customers table to ensure the uniqueness of values.
Fixed the schema which was a version generated while working on the model branch."
Added comments in the Customer model class about the set of validation
rules.
Added two default entries as Customer fixtures.
Added unit tests of the Customer model class.
Added comments.
Added invalid password values to test.
Changed the test on the presence of customer attributes to be rigorous.
Changed the signin route to signup (not the same meaning).
Uncommented the admin item in the customer fixtures.
Deleted the second entry of the customer fixtures.
Commented functional tests of the customer controller (they are not
ready).
Added functional tests of the login controller.
Changed the style of the login page.
Changed the main layout of the website (not visually though).
Fixed the login controller.
Changed the rule checking the minimum login size in the customer model.
Changed the layout of the login/form partial to be horizontal.
Created a new migration to automatically add a default admin user.
Fixed unit and functional tests broken because of these evolutions.
Fixed a bug with the display of scrollbars through a CSS and precompiled all the assets again.
Based the style of the application on the twitter Bootstrap framework.
Moved some code of the main layout into new partials.
Specified the sign in / sign out link and implemented the logic to switch this link when the user signs in or signs out.
Removed the scaffolds.css.scss file.
Merge branch 'styling' into users
Added a controller and its views dedicated to static pages.
Specified the related links in the main layout.
Makes the _debug partial prettier.
Specifies a two column layout in the main layout.
Specifies a unique column layout for static pages controller's views.
Fixes a bug about a missing method.
Polished the left menu.
Removes a debug line in the authenticate method.
Specifies the layout for login controller's views.
new features & example implementation
actually removing the end
change path favicon.ico
Update the ANT_OPTS as higher memory requirements were needed for sucessful compile.
Merge pull request #77 from smsm1/master

Readme need MOAR ram to be able to compile on OSX.
Adding math and reorganizing
BOX Added
fix file find order
fix iterator distance checking
Implement character width-based cursor handling
kamemura
とりあえず
Merge branch 'master' of github.com:takyam-git/pjeuler
Fix issue #66 by adding greedy to the regex used for replace
Fix issue #65
Fix issue #61 by adding a QValidator to all the lineEdits
Fix issue #64, program error when <tb> in /P

The actual problem was nothing to do with <tb> but
rather an error when a section reflowed by lines,
/P or /R, had a single-token line whose length was
less than the firstIndentDiff. Fixed it by special-
casing any paragraph whose tokens fit in the first line.
Respond to issue #62 with html fixup regexes

Load find buttons extras/htmlFixes.utf to get:
  Superscript and subscript conversion
  Sidenote conversion
  Illustration conversion
proper server timezone for admin service_errors times
lock to nokogiri 1.5.0, xml namespace regressions
Alert the title only when the Textbox is out of focus
The backend is apprently suppose to be responsible for user permissions:
 * http://stackoverflow.com/questions/2081061/django-user-get-all-permissions-is-empty-while-user-permissions-is-set
 * Quick fix:
   * Inherit from: from django.contrib.auth.backends import ModelBackend
Merge pull request #1 from knight-lab/master

This fixes a user permission bug with django-pam (at least in Django 1.4).
Update Performance article.
no browser validation for scovalidated forms redux
Added CHSV and HSVTest
Removed some commented stuff
ipv6 implemented, need some optimizations though
Merge branch 'master' of github.com:teslaNova/RRLoader
changed loader to src
incorrect q2 (no e, f)
noglobals check mandatory for browser qunit and node runner
Fractal flames editor: integrated the jTransforms library of Piotr Wendykier into JWildfire for further sound processing
Fractal flames editor: Basic jLayer integration to play back music
Added logs view/action and add_log action, specifically for adding new log
information for a task
Move lat/lon to milli-degree long integers.
Move battV to integer.
fixed scientific notation and added ability to set number of hours to graph
put the palette size in a constant
add support for dim colors
Bid unit test skeleton
Added stubs based on design doc
Bid model: create and destroy, belongs_to topic and team
Assignment model: is_lottery field
Assignment controller: enable_lottery
Lottery controller: run_lottery
SignUpSheet controller: submit_bid and delete_bid
SignUpTopic model: has_many bids
Team model: has_many bids
Create bids migration
Add is_lottery column migration
Schema update
Test fixture and file stubs
Line normalisation and ignore update
New thumbnail
New icon
New Assembly title
Revert "New Assembly title"

This reverts commit dbd1c144cd8da530a259d187cbfde7ffc319c291.
rm test_pgsql
RegistrationManager
RegistrationFactory -> Registrations
WeightedArray (moved from flashbang)
Version 2-1, avoid running off end standard 88-key piano.
show status bar for nook tablets
assume TTS installed for Nook devices
minor update to build howto
minor update
Made the options menu of all the activities Tecla accessible.
minor cleanup
Nook customization to save books to Nook specific directory
Read to Me now speaks on Jelly Bean (without TTS issues)
updating version info for next release
Made changes so that the accessible options menu feature can be tested by developers who do not have Tecla Access installed.
Merge pull request #9 from thushv89/master

Pull request FBR thushv
Merge branch 'master' of https://github.com/thushv89/FBReaderJ
Merge branch 'develop' of https://github.com/rishabhjain08/FBReaderJ to get tecla compatibility
Working on merging new Sentence parsing and hightlighting code
empty keys
added step on editing BookshareDeveloperKey
Update HowToBuild

Added information about social network keys
fixed compilation error
Merge branch 'master' of github.com:benetech/FBReaderJ
Better sentence parsing and remembering of position in book.
Fill ECC blocks.
gitignore update
Modify the style of the search bar(step 1)
patching main.js
Add Tomorrow colorscheme for Vim
Add sbin to PATH
Ignore vendor/ in Command-F
added shortcuts for setting priorities for files in "todo" directory
updated version
readDirSync => readdirSync (wtf node)
Merge pull request #2 from tkdave/master

fixed error in config after editor renaming, change template copying behavior to preserve existing files
checkout old, working version of Feed.js
Merge branch 'master' of https://github.com/tobyk100/403-kamal
added basic request to google view
moved debug check into twitter api
added google api urls
added functionality for requesting code and requesting token
fix bug
removes dangling url (google_signin)
問題起こるのでとりあえずコメントアウト
コメント追加
追加
A couple bug fixes for git-try
set PATH so it includes /usr/local/bin, if it exists
Implementation of scroll
Replace white-space with tab
Re-opening classes.
Start working on aucuba JSON parser.
Checkpoint.
added more test coverage
Merge branch 'master' of https://github.com/trajano/maven-jee6 into emerging-technologies
Nitpick commit

git-svn-id: svn+ssh://svnrepo/projects/nitpick/trunk@5639 561c3618-0fe6-0310-b5d6-fc65c73fee30
Nitpick commit

git-svn-id: svn+ssh://svnrepo/projects/nitpick/trunk@5665 561c3618-0fe6-0310-b5d6-fc65c73fee30
Change the Web title to be more useful when there are multiple tabs opened.


git-svn-id: svn+ssh://svnrepo/projects/nitpick/trunk@5666 561c3618-0fe6-0310-b5d6-fc65c73fee30
Think I need this for heroku push
Better NumberSpinner drag UI

Now fades in a popup after a short time, prompting user to drag to
adjust and also displaying the adjust value as they drag. JavaFX 2
animations really aren't bad - quite simple to make a nice non-glitchy
fade in/out animation.
+ hehe
added plugin updater and bitmap ident hover viewer
Download raster composite as PDF.
Support user agent exceptions
Merge pull request #15 from infbio/user_agent_exceptions

Support user agent exceptions
extracted names and dates
Merge with new Ken version
Reorganize changes to Ken
assign the list key for queues to be queue_members
assign the list key for members instead of queues since it's members that are special
make sure the dequeue method can take an optional http method
workflow: Adds error handling for input and output.
Removes option for default input and ouput files.
exec
Regenerate gemspec for version 0.0.11
Da error de validación al tratar de convertir la fecha de event.date
github
Merge branch 'master' of github.com:tylerball/dotfiles
removing itunes song from tmux statusline
grunnnnt
Fix old links in the API docs
[BUGFIX] INTincScript_loadJSCode() causes PHP warnings

This function uses implode() on several variables without properly
checking if they are actually arrays.
This might cause PHP warnings.

Change-Id: I83d2de074a49f1d724f95ee0def6b3c8a170317e
Fixes: #32278
Releases: 6.1, 6.0, 4.7, 4.6, 4.5
Reviewed-on: http://review.typo3.org/7042
Reviewed-by: Dmitry Dulepov
Tested-by: Dmitry Dulepov
Update notes for submitted changes

* [TASK] Editors do not have rights to edit file metadata
[BUGFIX] Pass $fieldName when processing FlexForm DS in t3lib_transferData

This change simply adds $fieldName to the "real" call to process
the FlexForm's DS. The argument is already supported on the target
class and the value of the argument for the dispatching method in
t3lib_transferData already is properly filled with the correct name.

Change-Id: Ief2f07bca064ae4eed248bb058b4884bcdc7ed96
Releases: 4.5, 4.6, 4.7, 6.0
Fixes: #39527
Reviewed-on: http://review.typo3.org/13473
Reviewed-by: Jigal van Hemert
Tested-by: Jigal van Hemert
Update notes for submitted changes

* [TASK] Remove superfluous parenthesis in sysext frontend
Update notes for submitted changes

* [BUGFIX] Fix broken logo file in Install Tool
[BUGFIX] Instance properties are defined statically

Instance properties are defined statically in t3lib_PageRenderer

Change-Id: I245d8a73e9abca8ac3bdef141605b91a09c845e0
Resolves: #35159
Related: #27694
Releases: 4.5
Reviewed-on: http://review.typo3.org/9815
Reviewed-by: Philipp Gampe
Reviewed-by: Oliver Klee
Reviewed-by: Oliver Hader
Tested-by: Oliver Hader
[TASK] Clean-up PHPdoc comments in t3lib_PageRenderer

Back-port of clean-up that was introduced with #27694.

Change-Id: I089c9e47ace839722a532e807949f86dde6917ec
Resolves: #35158
Related: #27694
Releases: 4.5
Reviewed-on: http://review.typo3.org/9814
Reviewed-by: Oliver Hader
Tested-by: Oliver Hader
[BUGFIX] Wrong margin calculation for Text/Image

This patch fixes a wrong calculation of margins for Text/Image
items with the properties "Beside text, left" and "Beside
text, right".

Change-Id: Ie484685aa2839123c42338862c241403614e7f7a
Fixes: #36541
Releases: 6.0, 4.7
Reviewed-on: http://review.typo3.org/12328
Reviewed-by: Steffen Ritter
Tested-by: Steffen Ritter
Review handling of Layer filter by RenderContext and BasicFeatureRenderer
Ignore transitive dependencies (in the hopes of ignoring org.eclipse.ui.ide which is mentioned by emf edit
Require tracing before listing GetMap requests in log
remove duplicate entry for console
A couple documentation fixes
sort new functionality to the top of the list
add jshint config file

The jshint package from node now requires a config file, not accepting
options anymore. What stupidity!
Initial commit
Merge branch 'master' of github.com:ubuntu56/first_app

Conflicts:
	.gitignore
	Rakefile
	app/helpers/application_helper.rb
	config/boot.rb
	config/database.yml
	config/environment.rb
	config/environments/development.rb
	config/environments/production.rb
	config/environments/test.rb
	config/initializers/inflections.rb
	config/locales/en.yml
	config/routes.rb
	doc/README_FOR_APP
	public/404.html
	public/422.html
	public/500.html
	public/index.html
	test/performance/browsing_test.rb
	test/test_helper.rb
katie helped!
My intial repo
Signed-off-by: Udaykanth Rapeti <udaykanth.rapeti@gmail.com>
made RdfService returned xmls fully compatible with doap.rdf by using lxml
Add visual indicators of 72nd and 80th cols in vim
Merge branch 'master' of github.com:ultranaut/dotfiles
pristine-tar data for libdr-tarantool-perl_0.12.orig.tar.gz
messageexchange
404 vs ayarla. Clode #12
Rewrote from Scratch. No more nasty Netbeans window maker.
Moved to Java 1.7
Added a small console webserver.

… and optimized bulk signaling.
Added a small console webserver.

and optimized bulk signaling.
Merge branch 'master' into feature/80chars_in_comment_are_errors

Conflicts:
	lib/puppet-lint/plugins/check_whitespace.rb
Merge branch 'feature/80chars_in_comment_are_errors' into develop
Change theme, define structure for theoretical part
mockito and test added
Site updated at 2012-10-08 00:10:15 UTC
[ISSUE-#29] Add ArchitectureLoader tests
Some minot fixes
helper class
commiting the account auto login if there is only one account
Initial commit
Merge branch 'master' of github.com:vicmaster/TodoList
cadastro usuario + login

- mudei a classe de conexao para classes
Merge pull request #1 from lavarini/master

Cadastro Usuaro + login
kanso config
create initial gitignore
add jquery 1.7.2
list posts from the database using a view
rename view to titles
create simple structure for the application
Merge branch 'release/0.0.1'
Some cleanup.
Adding ODKScan-core as a submodule.
Updating to account for some changes I'm making to the backend interface.
Merge branch 'master' of https://github.com/villagereach/mScan
code for 100% test attacker set added
Reintroduced looper support, added a way to see if a Story finished during last think(), reset transitioned flag on deactivation of a Story
Stiffles the div by zero error.
Screensaver working, pattern handling better, Story and other things becoming increasingly bloated
Changed java script to handle two sliders
added proper access control on folder for hermes
* Merge branch 'hotfix/rakefile'
Regenerate gemspec for version 0.0.0
* Initial working version
Merge branch 'release/1.0.0'
Regenerate gemspec for version 1.0.0
fixed something in config gen
fixed bug in cert passwd handling
Merge branch 'feature/cfg_pkging' into develop
Version bump to 1.0.1
Merge branch 'release/1.0.1'
Merge branch 'release/1.0.1' into develop
Regenerate gemspec for version 1.0.1
Version bump to 1.0.2
Merge branch 'release/1.0.2'
Merge branch 'release/1.0.2' into develop
Regenerate gemspec for version 1.0.2
Merge branch 'hotfix/deps' into develop
Version bump to 1.0.3
Merge branch 'release/1.0.3'
Merge branch 'release/1.0.3' into develop
Regenerate gemspec for version 1.0.3
fixing the write to file
update initialize playlistview and added render methods
2012/7/1 Modified by DarkTheCross. Header files.
exporting analytics id
Handle 204 responses correctly
Add tests for contentEditable and designMode attributes
新規追加

テキストのカラーローテーション用プラグイン
Now playing with modifying the grammar. Hamsters!
Limit the category feeds to the 10 most recent.
My wife says these are redundant, so they go.
change option name for interface
remove too many calls of getpid
remove too many calls of getpi
add mutex for multi-threading
fix dead lock
fix dead lock
fix the seg problem
fix pool problem
fix pool problem
fix pool problem
fix seg problem
add one more thread for netlink sending
fix thread problem
add thread choice for intercept
change macro name
change size for pool
modify pool_destroy!
hehe
Added cylinder ray tracing capability.

Cylinder, OpenXCylinder, OpenYCylinder, OpenZCylinder Surface
subclasses. Added XCylinder, YCylinder and ZCylinder Region subclasses.
Removed more volatile quantifiers
fixed issue with open/closed elevator
Railsプロジェクト設計内テスト環境整備
made window closable (whoops\!)
Make infowindow update when store info updates

 - Infowindows now update when the infopane renders
 - Infopane updates cause a slight flicker :(
 - Fixed "opens in" information
Change hours template, change #infopane div

 - Changes template for store hours, so stores closed all say say "closed"
 - Changed "#infopane" to "#infopane-container". Container holds info divs
   that are displayed in the map infowindows
permissions...
Fix infowindows to use #infopane node, not html

Infowindows now consume the #infopane node, which means they will change
with the div without needing to redraw the infowindow itself. In practice
this means the displayed time-until-closing will update accurately without
causing a flicker as the infowindow is redrawn. Additionally, the logic
for checking if a store is open was changed to account for stores closed
all day.
Search for SAQs based on lat/lng, not postal code

Instead of looking up stores based on postal code, the PHP script now
searches based on latitude/longitude. This allows results for every
query, fixing the bug where no stores were returned because Google
was returning only the postal code prefix. This change also allows
returning more than just 5 stores in the future, but that is not
implemented in this commit.
Change CSS
create Box folders.
update from server at Fri Sep 14 12:13:43 MST 2012
Wireshark Rebuilt and Added C-Ares
Minified using UglifyJS
fix for PUT requests
Mon Dec 10 04:01:01 CST 2012
Mon Nov 26 01:01:02 CST 2012
tiny change

blah blah
merge online features
add xml config file support
More better!

* Shortcuts for git
* Better location for backup files
* Support for LESS files in git
use edit button instead of button click
Accessing buffer data at last!!!

Thanks for the hard work of Roger Allen, Markus Gustavsson, and Joel J., we've
now got direct access to buffer data from our internally booted SC server.

Now that this works I'm sure there is more work to be done to integrate some of
the other buffer communication mechanisms, but this is enough to at least start
using the scope again.
Added tagify.
Correction et création de la V.O.8
gtst
完成出库单明细删除功能。
完成出库单执行功能。
refactor project to use bootstrap .  originally use the foundation
Merge pull request #2 from yiqing-95/wip1.0.0

refactor project to use bootstrap .  originally use the foundation
remove definitions for Arduino board and added for Propeller QuickStart board.
Delegate repo.Reset() to libgit2
Disable inconsistent naming warnings
Use params for LambdaEqualityHelper
Simplify consumption of _foreach methods
Hide Blob.Size setter
config: Update git_config_xxx bindings
Simplify Configuration.Get() usage

Contains two changes:
1. Remove the firstKeyPart,secondKeyPart overload.
   Having a three-part overload is useful because the middle part
   is often dynamic, but it never is for two-part keys.

2. Make defaultValue optional, and update tests/usage accordingly.
Return the level along with the config entries names/values

The level can be retrieved through `ConfigurationEntry.Level`.
All `Get<T>` methods now return a `ConfigurationEntry` (previous Get methods have been made obsolete)
Add tree to tree Diff feature
字符串连接
モデル変更、各種調整
Design Changes Pt.2
contextMenu加new,edit等。
only show dirty if in a git directory.
removed triggers and placed flagpoles for new system
Adjust bottom CSS spacing
fixed bug in set_dispatch_handler/1
Working out strokes in gimp. Better anti aliasing.
Working out strokes in gimp. Better anti aliasing.
Trivial update
better directory structure for spark projects
work on user_availability
Adding vagrant files to build
config fix, core module fix
Mark test @wip

- Mark test intended for future pull request
  as @wip
Merge branch 'origin/LeftPane' into AutomatedTests

- Conflicts:
    public/stylesheets/scss/search_materials.scss
Merge SearchInstructionalMaterials >AutomatedTests

- Merge branch 'origin/SearchInstructionalMaterials' into AutomatedTests
Merge 'origin/ZeusStaging' into AutomatedTests

- Conflicts:
    public/stylesheets/scss/search_materials.scss
Merge SearchInstructionalMaterials >AutomatedTests

- Merge branch 'origin/SearchInstructionalMaterials' into AutomatedTests
Merge AutomatedTests into ZeusStaging

- Merge branch 'origin/AutomatedTests' into ZeusStaging
Added a little more padding to the bottom of the main section on the website.
缺货查询及建议值查询页面显示做了调整
Update from latest coverTunes
Try js syntax highlighting..
Whisper v0.3.01

Updated for craftbukkit-1.2.5-R1.2 and bukkit-1.2.5-R1.2.
"安心院なじみ"
optimized percentage of pie slices
fix Dynix for some multiple views and add multiple callback
Potential fix for photos
Potential fix for photos
Potential fix for photos
Potential fix for photos
Potential fix for photos
Potential fix for photos
Potential fix for photos
Potential fix for photos
Potential fix for photos
Potential fix for photos
Potential fix for photos
Potential fix for photos
Potential fix for photos
Potential fix for photos
Add a forward slash for images
Fix up picture when it's a picture type
Uncomment cachefilename var
Trying to fix images
Trying to fix images
automation/de-automation popups
fixed error with the templates
Merge branch 'master' of github.com:10layer/10Layer-CMS
new section management
move adding server header to response intercepter
add posts in home.html
added RedisList example
Fixed major bug with repeated commands
Linked up header to go home
Merge branch 'master' of github.com:9milesdigital/jobsy
Update blobs

Signed-off-by: Roman Birg <romanbirg@gmail.com>
Update notes for submitted changes

* hercules: build hostapd from source
changed chip colors
More tinkering with the temp db setup to get it to stop complaining.  Sigh.
Assignment listings.
That thing Josh said, seconds ago
Just some more testing stuff, I'll get something started eventually I'm sure
Added an 'All' list.
remove country_preference
Big update! Added mob and new blocks!

changed world size

added cursor selection box
added mob (Iggy!) with basic AS (artificial stupidity)
added solid air on the sides of the world to prevent falling
added bedrock to the bottom (it can still be destroyed though)
added wood and leaves
added trees (with variable trunk height, and leaf width/height)

fixed window size bug
fixed window focus bug
Changed wrong named class
Add submodule to the project
Drawer com Manifesto.
[code] Use array for ini values
[add] DEBUG constant
[code] Missing dependencies for Debug
[mod] Missing dependencies for Mail
[add] Default build parameters
[fix] currentCSS/currentJS if no scripts or styles
[code] Store built pages in an array
[fix] Use an Exception if file of page not found
[add] Build::getHTML gets the DOM of a page
[fix] No idea what this commit commits
[mod] Take into account unique tags in the head
[add] head::getTitle fetch the title for the current page
[del] Remove old unit testing stylesheet
[mod] Start separating the admin area from the rest of the website
[fix] Try to sort up the mess in the title attributions
[mod] Directory restructuration and encapsing of all classes in a Cerberus namespace
Adding problem USP
Merge branch 'master' of github.com:AndersonQ/IA.2012.2
Changed Location Activity
Add note in update notification about restarting Chrome if there any issues.
Testing
Merge branch 'master' of github.com:ArlecksHunt/TestRep
beginning to add user input features
worked with different arguments as input
Use stack for UI elements instead of hard-coding.
forgot to add github link

:
Added json_tool.h to project.
Minor modifications to build.py
added NBTXML
finished some writing code for nbt xml
got mc-read-world to build for xml; still buggy
fixed text rendering; added more realistic floating-point formatting
added index to list elements
Renamed TeamsUtil to TeamUtil
Added new HelpCommands class
Implements 3 commands:
/m help, /m info, /m rules
very simple compile script
Add user logins
third jshangout
For large images, now conserves memory by deallocating framebuffers the instant they are no longer needed. Somewhat experimental, so things might break.
removed some debugging messages from the saveload function
server autosave code - take 1
Merge branch 'master' of github.com:Briefcase/Briefcase
Reorganize
Renamed to conform to standards
Standardized readme, reorganized directory
Initial commit of Truecrypt Slackbuild from slackbuilds.org.  This is in
reference to issue #54.

Signed-off-by: The Doctor <drwho@virtadpt.net>
The cryptoki package is a pre-requisite for TrueCrypt (thus sayeth the
entry for TrueCrypt on slackbuilds.org).  Initial commit n'at.

Signed-off-by: The Doctor <drwho@virtadpt.net>
Added more debugging instrumentation to NetworkConfiguration.index().

Fixed a bad variable name in a loop.

Signed-off-by: The Doctor <drwho@virtadpt.net>
Merged Sitwon's changes which set a BSSID for compatibility with Commotion
Wireless.

Merge branch 'master' of github.com:Byzantium/Byzantium
Updated the mail production environment for heroku.:
Using QWERTY
Added to oflib respective OpenFlow messages.
    - New messages
    - Modified Messages
    - Pack, unpack and free of async_config message.
Fixed copy/paste mistake
Add kaminari gem for pagination
Generated Kaminari config
Fix for admin_header_action helper leaving spaces in the url of
underscored controllers
Generate kaminari views
Add paginate partial

It accepts a model local variable which will be the returned instance
variable from the index method (e.g. @users, @klasses)
Add paginate partial to the bottom of the Admin::Users#index view
Add page method to the Admin::Users#index query
Add a search partial

Render it to the Admin::Users#index view
Merge branch 'master' of github.com:CTSATLAS/life_cycle into classes
adding Class Types to the admin navigation bar as a child item of the
Classes menu item
[otf: 125]
adding a divider to the Classes dropdown menu
[otf: 125]
adding validation to the user_id and class_type_id fields
[otf: 125]
adding a before_save callback to save the duration field value to the
credits field
[otf: 125]
formatting code for readability
changing the user field lable to instructor
[otf: 125]
Ok
Merge branch 'master' of https://github.com/Cadynum/sommarstuga
Merge branch 'master' of github.com:Cadynum/sommarstuga

Conflicts:
	report/tekniskrapport.aux
	report/tekniskrapport.log
	report/tekniskrapport.out
	report/tekniskrapport.pdf
	report/tekniskrapport.toc
Added reputation tracking functionality
changed rendering back to contours on orig image, instead of label images on black
Updates per rupl's suggestions
Added new empty email field for duplicate contact
TODO comments.
[Specification] Rename exclude_headers to exclude_header_search_paths.
Adding SDI and VFW repos to main MDV Repo
Update Roslyn to CTP3
UI updates, tools options and js modules

1. Add expect reply date display to message header view.
2. Add one preference entry, indicating wheather the user wants to
create calendar events. The button that toggles this preference is added
to the tools menu.
3. Add two javascript modules handling gloda queries and calendar
interaction.

Lightning is broken on my Daily build so I can't test the calendar
interaction code. But the code is directly imported from my extension
that was tested working properly so it should work fine.
osd notify meta port
Moving get values function out of every option to the group instead

First try for bottom bg
do not test presence of attributes required for gem functioning
bump to 0.0.17
Added ssh config
Added .gitignore
Added layouts for each tab.
DAWN-UI: plot image actor - make it work if no x and y axis parameter
Removed tools which exist in subdirs now from top level.
Thought had done so, somewhat confused.
forgot to commit pathfinder changes
FIX: Adjust default declaration formatting to delimit submitter name
Added configurable directories.
Added automatic config loading and options to plugins.
Removed remains of old user system.
Adjusted some plugins for new config setup.
Fixed redmine plugin to have the cookie in config instead of hardcoded.
bugfix

getColで結果が空の場合にノーティスが出てた
add facebook authentication with devise and omniauth
update styling so prevent nav bar from cutting off content
update DOM classes to include padding and show map full screen
Merge pull request #11 from Fanmapper/user_authentication

add facebook authentication with devise and omniauth
made the entirety of post_model plugginable and added comments to every function header
Version updater for the SRL Lj Fletcher Script
Added $data->permissions to inside of startup function
Replaced " with ' where possible - I'm all about the CPU cycles, baby\!
NPC loop fix met humeur half klaar
Starting moving the user manager over to a persisted object
Continuing to convert the UserManagerHandler over to serialization
Continuing to remove SQLite
Continued trying to update UserManagerHandler to use serialized objects
UserManagerHandler.cs compiles, the rest of the class doesnt
Now everything builds
Got a lot of the unit tests to pass
Fixed problem with duplicate user exceptions being thrown due to requiring uniqueness of private groups
Most of the disk unit tests pass
ObjectCloud.Disk.Tests passes
wtf
Got things working
Code builds without references to the old SQLite system
maj css + script.js pour 'nos offres'
whitespace policing
Confirm mysql password selection
Remove sqlite3 mutexes handling code

Not necessary since SQLite does it for us internally.
Blacklist broken versions of SQLite.

SQLite 3.7.7 & 3.7.8 have a FTS bug that can cause a crash during
database upgrade. Ban them and embed the latest safe version if they are
found on the system.
Ensure DB schema is updated consistently across versions
Strenghten query builder with explicit parentheses - harmonize case in SQL statements
Use left joins for text search

Needed for accurate results but considerably slower
Enable parenthesis FT3 syntax in SQLite compilation options
Merge remote-tracking branch 'upstream/master'
Fix package generation on Apple
Remove obsolete translations from ts files
Update language with obsolete strings removed
Add back QT i18n files

These files were not ported from the old MacOS X deploy script as they
were not needed by QT 4.6 Carbon. Now that building is done using QT
4.7 Cocoa, they are required to have proper translations.
Prepare for codesign
Tune SQLite compilation options
Restore text search performance
Merge branch 'axel'
Update Changelog
Use default compiler

Since Xcode 4.2, gcc and g++ don't bear anymore a version number so
compilation was broken.
Add more warnings and optimize generated binary
Fix warnings produced by new flags
Fix warnings produced by new flags (take 2)
Added crop count to Crops page
Added member count to Members page
Added update counts to Updates page
Merge pull request #67 from cephLpod/count2

Count2
Modif n°1

Modification de Form1 :
- Fenêtre maintenant "non redimensionable"
Mise à jour n°1

Fichier .suo à jour suite à la fermeture de Visual Studio
Add config disable file sync
adding jenkins build.xml
Update the fmac scalar patch. Instead of a workaround, apply the fix from Libav, so that the patch can be dropped on the next bump.



git-svn-id: svn://localhost/HandBrake/trunk@4943 b64f7644-9d1e-0410-96f1-a4d463321fa5
Merge branch 'master' of git@github.com:HandBrake/HandBrake
Edited README file with some info on how to 'install'
skipping stagin area
opa for smartchr and smart-compile
Call not right
Change galaxy_type collation to utf8-bin to make the searches case sensitive.
Update of tracking list
Replace all instances of the StringBuffer class with the StringBuilder
class.
Merge branch 'master' of git://github.com/IanWraith/DMRDecode
Changing the Play Now link to github
Fix bugs that delete the old file produced by creating new photos
start handling public messages
Komponent
Merge branch 'devel' of github.com:Jank1310/aquila-pse into devel
Junit hinzugefuegt und Gitignore bearbeitet
update mysqli to use our class variables
Added the default HelloWorld class
added some GUI elements
Updated and polished index.html, style.css, and database.js
Adds full support for custom connections
Corrected wrongfully called function
Limpiando todo
added open street map to sidebar and optimized css stuff for mozilla, opera, chrome
added quaternion to server
Added axiom dependency
прекрасный бат файл ;)
2ю1
monobook support
msgplace var
Update the version number to 0.3.0 (Dev)
[Dependencies] Update to Athena-Math 1.1.5 and Athena-Core 1.1.4
Remove the possibility to compile as a static library

This would cause issues when scripting will be used in a later version
Update the README file
Update the version number to 0.2.1
Version  0.2.1
word-problems: shuffle the arrays incrementally

Before, it was impossible to add new word problem categories or even to
add to lists within a particular category without wrecking all the seeds
for every exercise that uses word-problems. This changeset will
unfortunately break all the seeds once but should fix it for the eternal
future thereafter.
Oops, var
Not enough Bens
Merge pull request #22528 from Khan/incremental-shuffle

word-problems: shuffle the arrays incrementally
updated README for nucest
TA: fix in StrategyHandler
Merge branch 'FIX-DMS-refactoring' of github.com:KrzysztofCiba/DIRAC into FIX-DMS-refactoring
Add some notes about linux command line 'find'
Insulated space:draw() from colors set by child draws
2 enemies GFX added.
Implement deal_with_closing_brackets method
[Lecture] Add getVideoObject to get either flash or silverligth vdo player code
[Lecture] Add getThumbnailUrl
add player code
Merge branch 'master' of git://github.com/LarngearTech/Zelfer
Method for getting configuration keys
basic HTML interface, css and hackjack console version
Added Kick Off Souce (3pickillz)
Updated the so called glade folder.
folder holds glade files, tag files (*lib.json),
a configuration file, and whatever else I throw in here.
log.d now catches os/posix signals.

Used to flush the log file then exits.
Also changed -gc flag to -g flag in makefile
temp change to document.html (probably change on next build)
and added some personal notes to .mynotes
(.mynotes is too unprofessional / too personal)
lol "unprofessional"
Add documentation to dcore.d

Not particularly good documentation.  More as a test for
assistantui.d.
Plan on documenting all modules at least to some extent.
Fixed crash on looking up templates in symbols.

Also added some admittedly crapy documentation to symbols.d
Adjusted some documentation in symbols.d

Looking for bugs, but mostly just small cosmetic changes.
Catch File exception in SYMBOLS.Load

Log error and return if fail to load a given symbol file.
Small changes to log.d

Added mLockEntries to save initial log entrys until logui can show them.
Added SetLockEntries to publicly allow setting mLockEntries
Added mEchoToStdOut option.  Determines if entries go to std out.
(obviously)
Use std.string.format to format log messages.
Incase of abnormal termination try to log the signal.
Are these notes specific enough?
Update src/logui.d to use LOG.mLockEntries.

Now can show all log entries made before logui is engaged
no matter what the log buffer size is.
Also go rid of an extra space shown in some entries.
Catch exceptions for PROJECT.Build()

Also rearranged BuildCommand so user can see dmd flags, versions
and debugs first.  Possibly avoiding scrolling to see commonly
changed items.
Do not attempt to build project tags if project build fails
Reset ALL project member variables on project close.
Cleaning up functions in project module.

Dealing with potential exceptions, simplifying some parts,
fixing stuff the user sees (kinda).  General clean up.
Changes to inform user which dmd version is expected.\n\nNot finished.
Failed attempt to get rid of zombie.
Put colors for search hilite texttags into config file

Still need to add an option for it in gui.
Use std.process.shell vs std.process.system

Can't remember why I did that... sorry thats kind of sad.
Consolidated check for Case sensitive searches

Same check done in two places (so two places where search string was changed <see, I've heard of DRY>)
Improved search interface (slightly at least)

-Search either project source files or all project files
-prev and next buttons start new search if search text changes
-comment out unused(old) functions (will delete later)
-No garbage collection while modifying results liststore (causes errors)

Small changes big improvement (imho).  Closer to what is in my mind
but not complete.
Consolidate code

Config.Disengage duplicated Save code
also conformed dcore log entries.
Silly comment
Might help if I imported it.
Vote casting implemented.
Allow Controls to be attached to the screen.

Signed-off-by: Kyle Repinski <repinski23@gmail.com>
Fixing infinite loop errors, and adding in delete logic
buildbib: added some journal name abbreviations
qsim-long.bib: rebuilt
Further mods to dungeon, updated paper.
Failures:
1) RailsAdmin::Adapters::Mongoid#build_statement supports string type query
Failure/Error: @abstract_model.send(:build_statement, :field, :string, "foo", "like").should == {:field=>/foo/}
expected: {:field=>/foo/}
got: {:field=>/foo/i} (using ==)
Diff:
@@ -1,2 +1,2 @@
-:field => /foo/
+:field => /foo/i
./spec/unit/adapters/mongoid_spec.rb:690
here is some stuff
Class Renames.
dns/hosts.asc: moved to Dropbox
MODE-1711 - Updated projection storage so that aliases are stored as well.
MODE-1711 - Updated schema validation mechanism so that items from the "additionalProperties" section are validated if they have a schema defined.
MODE-1711 - Implemented the ability to specify projections via the repository configuration file
MODE-1711 - Removed block of code used for testing purposes only
(#12466) unset X-Forwarded-For header

Without this patch the handling of
X-Forwarded-For headers is insecure in a
default apache conf supplied with puppet.
This patch ensures X-Forwarded-For headers
are dropped.

Signed-off-by: Moses Mendoza <moses@puppetlabs.com>
Fixup debian artifacts for 3.x
Fixup for different source paths

This commit adjusts the packaging artifacts for the difference
in directories between 2.7.x and 3.x, which doesn't have sbin
and test. Because of this we also switch to using the packaging
gem task and remove the existing one.
remove old tasks and pull out of rake subdir

This commit removes several tasks that as far as
I can tell are no longer used, and the remaining
tasks out of the rake subdir in tasks.

Signed-off-by: Moses Mendoza <moses@puppetlabs.com>
Move all packaging artifacts from conf to ext

This commit moves all packaging artifacts out of the conf dir and into
the ext dir. This is generally a move to align packaging across all
puppetlabs products and make the directories more sensible, e.g. conf
should have config files. The redhat spec and install.rb are updated
for the path change.

Signed-off-by: Moses Mendoza <moses@puppetlabs.com>
expected value procedures and mixture added
Local Repo Move
Latest batch of updates from Database, Routing and Boilerplate
Abstract health and mana
Merge Healther/TakeDamager interfaces
Add spell/mana-based mage spawning entity
Buff healing spell (twice the healing now)
Add more benchmarks
Core/Arenas/Dalaran Sewers: Fixed waterFallKnockbackTimer and set more blizzlike values
Core/Arenas/Dalaran Sewers: Set more blizzlike waterfall warning timer value. Thanks Souler
Moving a commands around eliminating a unnecessary file, and porting the "demorph" command
* moved the "wpgps" command into the cs_debug.cpp because it seems more fitting
* organized the "modify speed" commands into a table of their own
* moved the "gps" command into the cs_misc.cpp
DB/Spells: Fix Honor Among Thieves proc
DB/Spell Bonus Data:

- Set 0 values for some spells that should never scale with spell power. If some have been left out please report an issue.
- Set 20% ap coefficient for Howling Blast
Closes #6163
Closes #4166
Closes #436
Core/Spells: Corrected Rupture critical hits, it wont make other dots (incorrectly) crit any longer

Signed-off-by: Subv <s.v.h21@hotmail.com>
DB/Spell Bonus Data: Fix more spell power stacking exploits (items & enchants)

Thanks Hitplusone, amort and SignFinder for the list
Closes #1701
Merge branch 'master' of https://github.com/TrinityCore/TrinityCore
DB/Creature: Fix the fly/land animations for Invincible
Core/Commands: Remove recently defunct .hover command. All this spell did before hoverheight changes was .cast/.unaura spell 11010. And since we do not have .autoattack, .steadyshot, .heroicstrike, .shootwand etc. either, there's no place for this command in the core (there never was).
Merge branch 'master' of https://github.com/TrinityCore/TrinityCore
Spells/Scripts: Allow OnEffectAbsorb to call PreventDefaultAction in AuraScripts
closes #6172

Signed-off-by: Subv <s.v.h21@hotmail.com>
Core/Spells: Fixed Lifebloom's final bloom benefit from Empowered Rejuvenation
closes #244
Signed-off-by: Subv <s.v.h21@hotmail.com>
Forgot to stage SQL from my previous commit. (.hover command)
Core/SpellScripts: Fix crash caused by 6cb8d607ceb1ef5e902bed4b144f4db76f628f32
Removed unused file
Core/Script: Use DoMeleeAttackIfReady in default ScriptedAI::UpdateAI method (fixes offhand attacks if not UpdateAI is overridden)
Core/Spells: Fix Unrelenting assault proc only on players.
Merge branch 'master' of https://github.com/TrinityCore/TrinityCore
Core/Spells: Apply Lifebloom's final bloom bonus from Empowered Rejuvenation also on expire. thanks @3kids for noticing
Fix 'ZXDev/Libs/Basic' to switch parameters in 'ZXDev/Libs/BasicCfg.h' on-the-fly. Some minor fixes.
Refactored bootstrap.lua.
Fixed unix start script to determine working directory and busted directory and pass them in, like the windows batch file. Common interfaces ftw!
Add GITOSIS_KEY environment variable for hooks to use.
Working plugin system. Huray!
carte pont en H V2.1

mais elle a toujours le nom
creation d'un controller dédié aux requetes ajax
Updated array_map() function.
Break line in css view .class