labofsahil/github-event-dataset-2012 huggingface dataset:
Skeleton for the base Mailer class
Basic progress on Mailer

Get some of the basic methods implemented on the Mailer class.
Outstanding issues include shoving attachments in to the message
and splitting out the different versions of a message, provided all exist.
Completed Mailer Implementation

This could work really well...or it could suck...but in any case,
have the base mailer class working as it should, ideally with attachments.
Basic Mailer class capable of multi-part html/text emails
a bit of parallel development in preparation for using Mail instead of Mailer
actually include fixed headers
mechanism for adding attachments to emails
fix the way that attachments are named
remove the mailer.php file that isnt as cool as the working one
split multiple attachments up properly
move the mail class from framework to util...Mailer belongs in framework, not the tool it depends on
add the mailer class back in, but this one will be used for the right purpose
Implement base Mailer class

Fortunately, this is a fairly simple class that essentially relies upon magic
in the inheriting classes to make it work. Still need to work out template
inclusion, but that will be relatively simple.  Included html2text to render
text versions of HTML emails.
pre-emptive change to the view template and mail view template...and create mail_view_template
add in some magic to allow template rendering in mail views
add a note to do some testing...and get a console file
why add more work where its not needed? Stole console from previous version of dmvc
executable console
make a few changes to accomodate console, but watch out for the possibility that this will bork other things
fix shebang line
Merge pull request #52 from jingai/slideshow

Add SlideShow.xml
prevents touch mouse events with right click
fixes specs for right click prevention
Merge pull request #206 from stravid/bug/zombie-car-on-right-click

Bug/zombie car on right click
add notes for building
Modified to support dynamic cache creation using spring ehcache
abstraction
remove tanyao
still switching to 3d, added user/console/ for user scripts, e.g. defaults.txt for controls
move hello.dasm from examples/ to test/
Comments system draft
first commit of all changes
Add git aliases
Update ZSH nocorrect behavior

- Remove aptitude alias
- Do not correct sudo
adding backbone-memory plugin
tweaking build script

we want to make sure text templates are inlined.
minor changes in color, drop shadow, level xp ranges
Most of the create event layouts done, working on back-end now.
Merge remote-tracking branch 'origin/Layouts' into MenuDesign

Conflicts:
	RedPheasant.PlannerApp.Page_SplashScreen_2/AndroidManifest.xml
	RedPheasant.PlannerApp.Page_SplashScreen_2/gen/RedPheasant/PlannerApp/R.java
	RedPheasant.PlannerApp.Page_SplashScreen_2/res/layout/event_create_checklists.xml
	RedPheasant.PlannerApp.Page_SplashScreen_2/res/layout/event_new_checklist.xml
	src/RedPheasant/PlannerApp/CreateEvent.java
LAWD

PLEASE WORK
Updated version to 0.6-SNAPSHOT for development towards next release.
[#45] - Typo with the mobile JS.
Revision of help page for completion.

Change-Id: I863a9f1152314591137d64d5ea85c0805a041a26
Russian localization of the completion help page

Change-Id: Id66e941252105b0839d80b08853c86c54c27dac5
Remove pubdata and empty lines

Change-Id: I60ded568c5400fe59b62b8ffe8fc6ebdd98d1e15
* Bug #11398 fixed - newest() produced an incomprehensible error message when
                     called with a string vector as second input argument.
Known Incompatibilities
=======================

* In previous versions, the newest() function could be called with a string vector
  as second (up to last) input argument. In these cases, only the first string of
  the vector was taken into account. These calls now return an error. See bug #11398.

Change-Id: Ibeeee785691698a5192ca11c4114ea1bbf4449dc
remove blink cursor setting
fix show todo command
revert deleting number-rectangle, because original behavior is strange
bags# => mail->address->responce
cursor:pointer
Fix the catalog.

o When threads expired, we never removed them from the catalog.

o Images were being set to the incorrect thread because
  Gtk::TreeModel::Path becomes invalidated when you change the model.
ImageCache: Don't use a static VariantType in get_cvariant()
Use a stdClass wrapper around the data in the before_combine and
after_combine events so that event handlers can modify the data.
Fixes #1789.
Merge branch 'master' of github.com:gallery/gallery3
Automated update of .build_number to 176 for branch master
Last update: 5639ff342195ec80f125f4b09ccc5ae5932c2197 (3 commits ago)
Work around a JS bug in IE9 that breaks the organize module.
Fixes #1790.
Merge branch 'master' of github.com:gallery/gallery3
Automated update of .build_number to 177 for branch master
Last update: 5639ff342195ec80f125f4b09ccc5ae5932c2197 (5 commits ago)
Fix the standard and REST uploaders to use a callback function to
delete temporary files during shutdown.  Fixes #1788.
Merge branch 'master' of github.com:gallery/gallery3
Automated update of .build_number to 178 for branch master
Last update: 5639ff342195ec80f125f4b09ccc5ae5932c2197 (7 commits ago)
Follow on to 7f62f09cf377b92b615e456ec4539300b331fd4b for #1663 to fix bad
query syntax, pointed out by Singularis in http://gallery.menalto.com/gallery_3.0.2_feedback#comment-383135
Merge branch 'master' of github.com:gallery/gallery3
Automated update of .build_number to 179 for branch master
Last update: 5639ff342195ec80f125f4b09ccc5ae5932c2197 (9 commits ago)
gzip stream problem on Google Chrome
Fix a bug introduced in dc21cf36b606048dc24532407d39bc8f5b4211fa where
we're basing the thumb proportions on the album's thumbnail, but this
will be messed up in the case of the root album which may not have a
properly update thumbnail, so its proportions may not be
representative of the album's contents.  So instead, base the thumb
proportions on the first child of the album.
Automated update of .build_number to 180 for branch master
Last update: 4f370b6c237e85d5daa84edcc7d46990ea473b19 (1 commits ago)
Revert "Fix a bug introduced in dc21cf36b606048dc24532407d39bc8f5b4211fa where"

It doesn't work for search because there are no children.  And this
just feels clunky to me - we should arrange for the root album to have
the right dimensions of thumbnail instead.

This reverts commit 4cb49b9152e82d0ab53b1038c7a7d7203c8bf97d.
Better fix for dc21cf36b606048dc24532407d39bc8f5b4211fa - let's just fix up
the root album thumbnail when the proportions change so that we avoid
this problem altogether.
Automated update of .build_number to 181 for branch master
Last update: 7b65a292ce991c676899ac1e4920b8ce1534c3bd (2 commits ago)
In get_position() don't try to truncate the score if it's empty.  Follow-on to ce43f29e2ceaac3d638061f81dc6037b5e0018d3
Automated update of .build_number to 182 for branch master
Last update: 8a88a64b9a953ec810514df772c8ba877afb6768 (1 commits ago)
Settings view mise en place
Bug #1056

-Complete the fix of #1056 by having CmdSummary print abstract parent
 names and not prefix children project names with parent project names.
-Unit tests for above.
Markdown config in .vimrc
If a CSV::Row is passed to Column#values_in then the value of the row will be in the last position of the array
Revert changes to Column.
`Schema#conform` takes option to skip first row.

Eg: Header in a CSV document.
README and CHANGELOG.
update benchmark links, added templayed.js
commit before changing algorithm in fetching statuses.
started writing the world parser & related tests
NEW: add small preliminary version of a 2D magnetic vector potential solver.


git-svn-id: https://elmerfem.svn.sourceforge.net/svnroot/elmerfem/trunk@5948 35e42291-063b-0410-a9f9-998d8d6728aa
Added motivation in README
spring mvc is ok
spring mvc is ok
should not commit lib folder
*Add default optimization groups for GNU compilers
*Remove wrong define that should not have been there
Better explanation of the --all option
no need for commented non-existing icons
Initial Commit
Merge branch 'master' of https://github.com/tgkouras/plotter
Added another example and graph end condition.
Return a random integer within a range
Updated Vala version (I think?!) and added details to keyboard shortcuts message. Built and submitted to Software Center.
Added week4 material, which builds upon week3
Modified movies.sql
added tic tac toe example
added tic tac toe example
Added startup icon and appicon to tic tac toe
Added startup icon and appicon to tic tac toe
Lab4
Added applying bonus action on equity transaction
trying to get MyGet compile this stuff
A couple of helpers for git clone
Ignore files that aren't mine
Restore all previously-opened projects when the app is launched
Flash Builder project: link to the aspirin src
Added Slots.NOOP.
Fixed up the ugly old html mailer, next up is the text mailer.
Merge remote-tracking branch 'origin/master'
Refactoring ciphering class.
Added encryption.
Twenty Twelve: better fix for #20469 and comments closed messages, also load the comments template in single.php template regardless of whether comments are open or closed (consistent with page.php). Both props kovshenin. 


git-svn-id: https://core.svn.wordpress.org/trunk@22615 1a063a9b-81f0-0310-95a4-ce76da25c4cd
Twenty Eleven: in comments template check `get_comments_number()` instead of using `$comments_by_type` for showing a comments closed message. Props kovshenin, see #20469.


git-svn-id: https://core.svn.wordpress.org/trunk@22616 1a063a9b-81f0-0310-95a4-ce76da25c4cd
Twenty Ten: move the "Comments closed" text outside the `have_comments()` conditional, props kovshenin. Closes #20469.


git-svn-id: https://core.svn.wordpress.org/trunk@22617 1a063a9b-81f0-0310-95a4-ce76da25c4cd
added link to meals page on rsvp form
Don't highlight numbers
Rename app start module
edts-start tweak
Impemented javaesque threading primitives
Update Readme to describe the included script.
added google map link
Started work on parsing set commands.
Borrado de ficheros desde cliente y desde admin
avance en promotores
Update grid.base.js fixes bug with autoscrolling (if response doesn't provide page number, every time page number 2 is requested)
Merge pull request #338 from robsteinde/patch-1

Update grid.base.js fixes bug with autoscrolling
Pass some basic AST building tests... still missing mixin-definition-conditionals
twitterlogin 途中
Twitterログイン
an 'all in one' example that will work with single C&P (hopefully) for developers to test cross-site requests using Django
use forked Gallery2

Change-Id: Ied1c2c26863deec2fcae402ee98825c51a0c61fa
Fix an internal link (I hope)
Now also removes workunit info on delete
updates to summary report
updates to summary report
Attempting to fix a crash in Dock Menu that happens at weird times.
It's possible that the bug is in Mono, but for now I've been able to
reduce the occurance of the bug
Merge branch 'BrokenDockMenu-CausesCrash'
Still some issues, but appears to be better
Ensure filters are using the correct format with a regex instead of explode.
ahbmalloc routines actually tested, and inevitably tightened up
se agrega la clase package states necesario para la clase paquetes
update freetype to version 2.4.10 to resolve issue #768
update the source of all the build.xml files to freetype 2.4.10
don't pass NULL buffer or 0 capacity to env->NewDirectByteBuffer() as CheckJNI and maybe other parts of Dalvik crash on it
Merge pull request #36 from kichik/master

Fix FreeType crashes (issue #768)
updated freetype natives. we should seriously consider ivy...
compiled all the mac natives, oh god, we need ivy...
shoudn't return an indirect buffer in FreeType
regenerated all native build files, trying out the compiler check
fixed AudioTools, got fucked by ermagerdformattingmagic
fixed android build script generation, compiler check searched for ndk_build
added --static-gcc and static-stdc++ for windows 32-bit build...
fixed all the natives, we are super up to date now. or so goes the theory
Fixed 1053 again, FileHandle readBytes allocation.
Merge remote-tracking branch 'origin/master'
Touchpad, fixed get percent methods.
Merge remote-tracking branch 'upstream/master'

Conflicts:
	demos/invaders/gdx-invaders-android/libs/armeabi-v7a/libgdx.so
	demos/invaders/gdx-invaders-android/libs/armeabi/libgdx.so
Not needed, use ']p' or ']P'
Initial revision


Fixes to admit control rejection pages.

Fixed app numbers to match the new erlang otp release.


System deps updated.


Version # updated.


Fixed URL etc.


Added needed empty directory.


Added empty build directory.


Versioning fix.
Updates to compile with OTP R7B-2.
Updates for R7B-3 release.
A bunch of changes for R8B-1.
Small change to make Eddieware compile flawlessly on Erlang/OTP R9B-1
Compilation with Erlang R9B-1
Compile now works with Erlang/OTP R9B-1
Updated components versions for compliance with Erlang/OTP R9C-0.
Changed components version to make Eddieware compliant with Erlang/OTP R9C-0
Merge branch 'master' into original_code
formatting mad tweets, front end beauty
changing node_module node-markdown to marked. because is marked supports github-flavored-markdown
Track dwb configs for cookies.
Ignore random x crap.
Allow elevation to be null --> some post treatment will be required.
Fix code regarding existing activity.
show link to images on index page. Heading title. Styling. Couple of model validations
default number of fucks given to an image during upload should be 1. Someone uploads only when someone gives a fuck
model relation between wtfornot and image
form styling and misc
文字を数える必要があったので文字数のカウントを追加
fix trouble with session
Got some basic functionality going

im still trying to figure out how to use jquery.
made the DescParser more tolerant for missing db entry fields
more database filling options
added websocket example files
Put null into primary key. Change 'Order' table to be named 'PizzaOrder'
in order to avoid reserved keyword usage
Merge branch 'master' of git@github.com:varokas/jpaQuery.git
Fix type
[#6] Updated source to reflect current emuLib changes
Fixed context interface name
Replace missing square bracket in title RegExp
Merge pull request #13 from jcartledge/patch-1

Missing square bracket in title RegExp
sync CVS
Added expiration date to the fundraising table
added support for javasript, haskell and erlang
Adding some things to awesome
Fixed rc.lua
Fixed envelopes and added FB to home
adding all files
Merge branch 'master' of github.com:vishalkumar/Test
changes in test1
lots of stuff - static layout- grid change 60%
added foundation js files
Some more help
bump
Revert "fixing string interpolation escaping #731"

This reverts commit b47d9ccdffb2209587affd3ea269b4b0011b7d81.
revert
Customize default dzen
Get screen width from xinerama
Make the big screen the primary one
Detect screen as soon as possible
Merge branch 'master' of github.com:vjousse/dotfiles

Conflicts:
	xmonad/xmonad.hs
fix timetrack form
Git modules.
add dvdrdata, k3b went crazy today
gdb: whitelist anything in my home
Adding pattern-matching over records defined in another module
调整layout和全局css控制
Make layout wider and inline code narrower.
mailer fix and template tweak
Merge branch 'develop'
Cleanup
Placeholder image
Add redirection response
Merge pull request #329 from walmartlabs/user/eran

Add redirection response
Allow empty line between comment and single line of code
Space in {}
Changed newline after { rules
Fixed formatting
No empty line before comment following {
Restore empty line for segment comments after {
Merge branch 'develop' of github.com:walmartlabs/hapi into user/eran
Fix tests
Fixing issue where message was thrown instead of an error when using hoek in test env
Merge pull request #1 from wpreul/master

Fixing issue where message was thrown instead of an error in test env
Added Angle and Utilities -- both not yet done
Merge branch 'master' of https://github.com/walpen/pan-prime
Get the dev environment working for ruby 1.9.3, bundler 1.1.3, and Rails 3.2.3.	
Precompile mercury_overrides.js. Fixes Issue #192
Use sprockets-rails for building assets. Issue #210
Getting cucumber passing again.
Latest static build of assets.
Ignore powenv
Attempting to run with Travis CI.
Make mercury more compliant to Rails engines.

* See http://edgeguides.rubyonrails.org/engines.html
* Assets are all under app/ instead of vendor/
* There is a dummy rails app under spec/dummy for dev and testing envs
* Routes use the standard `mount Mercury::Engine => '/'` now
Merge pull request #228 from jejacks0n/3_2_style_engine

[In Progress] Make mercury more compliant to Rails engines.
Fix the paths for the build task.

* remove redundant html file that now live under spec/dummy
Now that we have a dummy app let's make it more clear where the non-Rails distro is.

* renamed gem public dir to "distro".
* fixed path references throughout Rakefile
Update lib/generators/mercury/install/install_generator.rb
Update lib/generators/mercury/install/install_generator.rb
Merge pull request #229 from branch14/master

fix paths for install task
Move images backend into a generator.

* Added cucumber coverage for generators using aruba
* Removed images backend from engine
* Removed paperclip dependency from gem spec
Update read me for updated handling of images backend.
Merge branch 'master' of https://github.com/jejacks0n/mercury

Conflicts:
	distro/javascripts/mercury.js
	distro/javascripts/mercury.min.js
Add configuration for ruby-1.9.3-p327
Change forgotten patchlevel config
Merge pull request #1305 from ab9/ruby-1.9.3-p327

Add configuration for ruby-1.9.3-p327
Fixed: volume increase/decrease
Added new photo and made profile linkable (dmarjanovic)
ZetaCiv testcases
Merge remote-tracking branch 'origin/master'
rounding issue fixed in gross profit
support ticket listview
get_query for invoice in c-form
default purchase taxes and charges master will be automatically fetched in pur transactions
Merge branch 'master' of github.com:webnotes/erpnext
cdt not defined fixed
adding a really viewsource button for phones
category done; MediaController need to be rewrite
Decreased WiFi scan timing
Fixed up alert for soulengine.
Merge branch 'master' of github.com:wfsdev/robotomod
add traffic light in front of text summary
add traffic light colors to ranges data structure
Private and room messages never occur
Transcode all messages into UTF-8 -- Regexp Exception fix

ERROR -- : incompatible encoding regexp match (UTF-8 regexp with ASCII-8BIT string) (Encoding::CompatibilityError)
Nokogiri UTF-8 bugfix

For whatever reason, open-uri's open doesn't always return a correctly encoded string, but calling .read does. Nokogiri behaves better when passed the html from .read.
Merge remote-tracking branch 'origin/linux-extpack'
bla
Merge branch 'master' into aanpassingen1

Conflicts:
	test.txt
Merge branch 'master' into aanpassingen1

Conflicts:
	test.txt
slide modify
Update README.markdown to give simple build instructions
Ignore file added
Removed application id check to cause it to fail, logged it instead
add new branch phx
Filter_array: added filtering by string
Exec_array_out: eval params so that piping for example works
Added Pyesno yes/no prompter
Added volume detacher
Merge pull request #1 from wpreul/master

Adding initial lout implementation
Cleanup
Adding tests to lout
Move latex folder to ~/.latex
My poster, Dennis
faster venv discovery (thanks jacobian)
closes #93
finish all the section
fix #59 Installer
Wolf will leave minecart on /wc
add some css for tags
added genCyclists
Merge branch 'master' of github.com:xdanx/le-cycling
BandSaw initial development
- Fixed issues with how threads were handing the event log object
- Fixed minor issue with sending email messages
- Changed how the event log gets initialized
BandSaw initial development
BandSaw inital development
- created MsgBuilder class for handling all message related methods
- removed message handling from the worker calss
Fix error variable issue in the MsgBuilder class
Fixed variable error in the msgBuilder class - missing attr_reader parameter for @mgs_data
Updated database.php and compiler logging functions
added some tests of the utils object
update proguard configs, comply with sdk tools r17
mov updated
top by obj
added DOMException class
added dom exception
bug fixes to match js api
bug fix in node.appendchild
bug fix :no more error when reading width height of cross domain pic
minor bug fixes
removed class instance
refactored HTMLElement base class
refactored htmlhtmlElement
refactored html image element
refactored htmlinputelement
removed browser package
refactored adapter style
unit tests for css style conversions (string to enum)
Merge pull request #13 from lexoyo/develop

unit tests for css style conversions (string to enum)
updated doc
Merge branch 'develop' of github.com:yanhick/Cocktail into develop
Merge pull request #14 from yanhick/develop

Develop
made independent on yast2-all-packages (bnc#712052)
made package arch-specific due to different set of YaST packages on different architectures


svn path=/branches/SuSE-Code-11-SP2-Branch/schema/; revision=67067
typo

svn path=/branches/SuSE-Code-11-SP2-Branch/schema/; revision=67096
Encapsulation will always save your soul.
musescore 1.2 , qtscriptgenerator was removed, the musescore can compile
and installs without it.
plugins updated to compile correctly, and now default to clang++
fix index.php display error.
Merge pull request #21 from nsonline/master

fix index.php some display error.
Add ManageCurrency intent and route to it
Added AddCurrency intent and prepare SQL
Add routine to create currency entry, load using AsyncTask
Stats init when round begin in CTF.
Improves zeromq dependency building (don't rebuild it if it was already built)
return ZCONNECTIONLOSS when disconnected for longer than session timeout
fix htnoll for sunos
pid_t is a long in sunos
redo config
add field in config
load files
config (still need to add config protocol in srtcenter)
Merge branch 'back' of github.com:yuyichao/srtctrl
cmake fix
config coor
Merge branch 'master' of github.com:yuyichao/srtctrl into back
add helper modules, error handling, init helper
zwicky helper
test client
error handling + correct typo
Merge branch 'back' of github.com:yuyichao/srtctrl
plugins names must be identifier
add unread cls on demand
fixed chk ua bug in productive app launcher
fix merging conflict
Merge branch 'master' of github.com:yyfrankyy/marked
DONOT rewrite default option
use access module to replace footer filter and refactor the themis module
try permas with /webcraft/ again4
updated alias for htaccess scp for zanshin.net to use new host ssh info
Clean up README.
Merge branch 'master' of ssh://gh/zeekay/requisite

Conflicts:
	README.md
Merge pull request #6 from sntx/master

Clean up README.
Kaikki muut tehtävät paitsi bonus-tehtävät.
Generating diffs of array based values.

The module Zen::HTMLDiff is now capable of generating diffs of array based
values such as those used for multi select dropdowns or checkboxes.

Signed-off-by: Yorick Peterse <yorickpeterse@gmail.com>
defined print-object of trimesh and vector3.
added fill-hole.lisp
Merge branch 'master' of github.com:zeptometer/clstl
implemented weld-vertices (seems to need fix)
小改动!
for match-class
Renamed resource store doc to follow the same naming convention as the other topics.
Fix the localstorage tests to spend less time in string creation, more time in what we're testing.
Fixing character error preventing /shopfor from working
adding code to zero-out enchantment prices, and limit to 40 for free enchantment day
Adding /bounty command to see a player's bounty. Updating to 1.3.1. Bug 22:resolved
working on basic sign shop support
sign change perms
selling xp after enchanting now works properly bug 21:resolved
buying health now restores food, updated version
sign change tweaks
fixing playerinteract trying to read non-craftys signs
Merge remote-tracking branch 'upstream/master'
Added Kits (Warning: incomplete)
[#48] escaping javascript, important for functions containing single quote
Merge pull request #52 from szemek/master

escaping javascript, important for functions containing single quote
flexigrid renamed hDiv to titleHeaderDiv
removed horizontal resizer
clearer print-vals to see what transactions are being committed
Raise exception when invalid models are passed to crud methods
test dx9 conf file
restructured the ini files, implemented and tested new DXReader
moved options to top
read masks with config
compute union mask moved to own file, renamed conf files
documentation
example run configuration
automatic test SKIP if reader configuration does not have relevant section
fix for ddx9
fixed merge
read mask util
smoothing var if IQU
convert fwhm to radians
halfrings and bpcorr log fix
compute union mask task
testing surveydiff
update
Merge branch 'master' of https://github.com/zople/365Project
update
Added aes key exchange
add more spaces in README
Merge branch 'master' of github.com:zveber/qnonogram
Show more information about downloads and keys with --dry-run
Fixed use of raw_input with Python 3
Fix padding frictions
change routes due to REST API constraints
Merge branch 'master' of https://github.com/111minutes/iodocs
prepare for S3 upload
admin images settings
fix error
Fixed slim doctype.
Added some flow
Removed norm.css, going to replace with a css reset.
small change in home.jsp - added one line (test)
changed size page
Fixed bugs in not login mode. Fixed display picture in about me. Correct display all view
Revert "Revert "ccc""

This reverts commit 8f83c0c975329db262dbab349a3d57ed5bbfb66e.
Add pusher to GithubNotification

start deprecating GithubCommit
added excempt days seeds
rutracker Various Artists fix
Fixed derby SQL, removed some noob code.
Merge remote-tracking branch 'upstream/master'
tidy up fonts, add taxonomy browser
Merge pull request #45 from travisward/master

Job List Tweaks
.gitignore возвращён.
Мелкий фикс.
Merge remote-tracking branch 'origin/master'
added a NuGet install task
added an RSpec test for the NugetInstall task
fixed bugs with NuGet package install and its associated unit test
Fixed a bug inside the NugetInstall execute command.
Merge pull request #13 from Aaronontheweb/dev

Created Albacore Task for installing arbitrary NuGet packages during build
add hashcode method
fixed sonar rule violations
Merge pull request #113 from wenshao/master

修正sonar规则检查中发现的违例警告
add sql wall suppport
Merge branch 'master' of https://github.com/AlibabaTech/druid
Add Helpers::translate from Cerberus
Merge branch 'master' of https://github.com/Anahkiasen/former
faq finished, faq/news domain text limit change
Added MyPage/Profile
Added User section
Signed-off-by: mxzjzj <mxzjzj@gmail.com>
Merge branch 'zhujun' of git@github.com:App-coder/xmaicrm.git into zhangjun
Signed-off-by: mxzjzj <mxzjzj@gmail.com>
Merge branch 'zhangjun' of git@github.com:App-coder/xmaicrm.git into zhujun

Conflicts:
	build/classes/com/crm/mapper/XmPicklistMapper.class
	build/classes/com/crm/mapper/XmPicklistMapper.xml
	build/classes/com/crm/service/XmPicklistService.class
	build/classes/com/crm/service/impl/XmPicklistServiceImpl.class
	src/com/crm/mapper/XmPicklistMapper.java
	src/com/crm/mapper/XmPicklistMapper.xml
	src/com/crm/service/impl/XmPicklistServiceImpl.java
	src/com/crm/service/system/impl/UserServiceImpl.java
Merge branch 'zhangjun' of git@github.com:App-coder/xmaicrm.git into zhujun

Conflicts:
	build/classes/com/crm/mapper/XmPicklistMapper.class
	build/classes/com/crm/mapper/XmPicklistMapper.xml
	build/classes/com/crm/service/XmPicklistService.class
	build/classes/com/crm/service/impl/XmPicklistServiceImpl.class
	src/com/crm/mapper/XmPicklistMapper.java
	src/com/crm/mapper/XmPicklistMapper.xml
	src/com/crm/service/impl/XmPicklistServiceImpl.java
	src/com/crm/service/system/impl/UserServiceImpl.java

Signed-off-by: Toney <458820281@qq.com>
Enable interactive console
Merge pull request #188 from nlake44/interactive-console

Enable interactive console
Minor fixes to make sure that the template functionality works with the new .docmaps settings file
success and error defaultcallbacks added
second week on leave
Ironfan.parallel catches errors per-thread; Ironfan.safely returns the exception
Parallel keeps track of the return value of each thread, and runs it inside 'safely'.
Safely now returns the exception if there was a problem
Together, you can then say 'results.each{|result| next if result.is_a?(Exception) ; ... }'
Cleanup of progress reporting and object display
* knife cluster show outputs the chef config
* resources have a readable-in-parallel #to_s method
* in-progress reporting for discovery, so you know whether to be angry with Opscode or AWS
* Moved the refactoring notes to an Ironfan.todo helper -- set Chef::Config[:show_todo] on to see them.
cleaner progress report from chef loading
* made all the load! methods follow the same stanza
* added #to_s methods for the models
call to keypair listing might have a nil cluster
Ironfan.deprecated should raise, not exit directly -- otherwise is great sadness when pry session dumps you on your ass.
Version bump to 4.1.0
Merge branch 'better_logging' of github.com:infochimps-labs/ironfan
Replacing frivolous log message with clearer description
Merge branch 'better_logging'
Correction for "url not found" case
Save errors
Fix getter to query the sandbox first since the value won't be empty when using get.
Lines between screens fixed
Merge branch 'splitscreen' of ssh://github.com/BlinksTale/cubior
Drop in/out gameplay added
Merge branch 'splitscreen' of http://github.com/BlinksTale/cubior into splitscreen
Individual drop in/out for players
Individual Pause Visuals
Split screen fills space
Alternating spot bool moved to cube init
Talkative timing logging for lag tests
Timing data log
Timing boolean implemented to enable/disable
Neighbor based drawing implemented
Framerate locked to timer again
Merge branch 'splitscreen'
Merge branch 'master' of ssh://github.com/BlinksTale/cubior
Fixed stuff

^
Working on sockets with nodejs and socket.io
Removing node modules
Merge branch 'master' of github.com:senorpasajero/bday2012
Added reproductor
Added musicpress folder
Added folder to submissions dir
Merge pull request #6 from senorpasajero/master

Musicpress
Hammerhead Heavy Freighter bridge camera and front camera fix
Betsy Agent Commits
Styling headers
Removed js files
Added Jasmine test framework
Resolves #1: override remote repo by placing an index.json in the ramen/cfadmin/ folder
Relates to #1; FAQ mention of the local repo feature.
Improved layout of researcher status link
Merge branch 'crismodelimprovement' of //pan.cilea.it/SASI/RepositoryGIT/dspace-cris into crismodelimprovement

Conflicts:
	jspui-webapp/src/main/webapp/css/researcher.css
Merge branch 'crismodelimprovement' of //pan.cilea.it/SASI/RepositoryGIT/dspace-cris into crismodelimprovement
Added license on jsp/css/js/xml
Fix list of box in tabform, add component support to pj and ou
bug fix - null value must not be exposed as variants
bug fix - autocomplete must filter for target type
Public identifier include a prefix for the CRIS object type
Ability to define virtual metadata from linked entities
Merge branch 'crismodelimprovement' of //pan.cilea.it/SASI/RepositoryGIT/dspace-cris into crismodelimprovement
Merge branch 'master' of https://github.com/CILEA/dspace-cris into crismodelimprovement
Added support persistent identifier
Merge branch 'crismodelimprovement'
merge conflict
merge conflict
merge conflict
Update dependencies to dspace pom at 1.8.3-SNAPSHOT, Added persistent identifier management
Completed management of persistent identifier
Cleaned up request!
Oct 26

Final working webstite with CSS and images
Example empty row fixed + new fonts style for header links
common submodule should be fixed
Changes from_query parameter name to sql
add privacy string output to model and basic create controller
turns out we don't need all that :D
Georeference window disabled if there isn't any row in table model
Merge branch 'develop' of github.com:CartoDB/cartodb20 into develop
When you have a map with no infowindows, on the share map the infowindow now doesn't appear
Merge branch 'develop' of github.com:CartoDB/cartodb20 into develop
Check if mandatory_key key is present on app_config
Requiring ssl on tablescontroller#create
Render user base layers in user json
Changes to the debug menu, viewmodel
Rework MapHeader to not need a MapHeaderStruct
added ability to disable message
fix no geolocation error handling
Fixes popups in IE8 and earlier
Merge pull request #827 from ajbeaven/IePopupFix

Fixes popups in IE8 and earlier
code reformating to make it compliant with jake
Merge pull request #653 from giscloud/reformating.fix

code reformating to make it compliant with jake
fix VML remove/add losing styles issue, closes #830
Fix str_replace
Make milkyhelper compile
Added 3 Data Links via lists

added 3 data links via list and corrected format issues of dbl </a>
Crap1 fell asleep cleaning up file

cleanud up file and relocated some images for cta.
Make the language graph taller so the name labels don't overlap, and get rid of legends.
whatever
Merge branch 'master' of https://github.com/Colinwielga/beats.git
Used 'check_call' instead of 'os.system' in conda_test.py so that the script can be exited gracefully with ctrl+c.
Array_multisort error
Forgot to remove last getEncryption()
Adding /media/ and increasing the number of nodes to show in the preview
Adding count() functions for nodes, relationships, node relationships and filtering support by label
Adding a templatetag for the general toolbar
Fixing an error importing types with final spaces
Hiding the Relationships button
Improving the main navigation toolbar
Adding total counting per type in listings
fixed viewport right+bottom, added entity draw offsets
file NOT url
Better tag search that is faster (probably) and without duplicates
updated tables and stuff
Added the IDiv opcode
Merge pull request #24 from rdnelson/IDIV

Added the IDiv opcode
Fixed negative relative jumping problems in Jmp and Jcc.
Merge pull request #25 from rdnelson/jcc_fix

Fixed negative relative jumping problems in Jmp and Jcc.
Merge branch 'master' of https://github.com/rdnelson/Libra.git into Cmpsub
Fixed problem with ImmediateOperand bitmasking
Merge pull request #26 from rdnelson/jcc_fix

Fixed problem with ImmediateOperand bitmasking
quick fix for getBitmask()

Signed-off-by: Darren Stahl <scooter_014@sympatico.ca>
Merge branch 'master' of https://github.com/rdnelson/Libra.git into Cmpsub
Added Sub. Reworked overflow flag setting to fix glitches, still needs more testing.

Signed-off-by: Darren Stahl <scooter_014@sympatico.ca>
Working through the WYIL bytecodes.
Fairly important bug fix related to the fact that preconditions were being ignored.
Final version of player's manual
Update source/docs/deploying/github/index.markdown

* Updated the IP address the A record should point to 
* Mentioned that the subdomain, if it exists, should be specified in the CNAME file 
* Fixed and improved formatting
Fix:[ bug #399 ] Bad calculation of local taxes in update line products
Merge pull request #199 from simnandez/develop

Fix:[ bug #399 ] Bad calculation of local taxes in update line products
Fix: you can not delete project document folder in delete task method
Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop
Three New ICs
* MCM112 - Pig Teleporter : MCX112 variant for Pig+Saddle+Rider
* MCM116/MCO116 - Mob Above? : Mob variant of MCX116 Player Above?
* MCX295/MCZ295 - Trigger Reader : IC mirrors state of redstone
trigger (Lever, Button, Pressure Plate) at X:Y:Z offset (line 3) from
IC sign.
Merge remote branch 'origin/master'
Undo of previous commit
Implemented 1200 responsive

Implemented the 1200 width for the fixed size responsive grid
Basic layouts are done for enter/editing schedules.
[*] Buildroot: Fix error support optional packages
Undid "test"
Add Lynx install
+ BslqNil + builtinConcat
(Temporary?) modal for simulation output.
jsLint nagging.
bump lumberjack gem version
Added TRACE to LOGLEVEL
init

Signed-off-by: Plamen Gochev <flamen88@gmail.com>
Added main buttons to right-hand side of pages other than the home page. Home page buttons remain in middle, under slideshow.
Core/DB: Convert script_texts to creature_text
Formalized the error handling a bit.  Every exception thrown by the
s-ramp server is now either a user exception or a server exception.  All
exceptions are returned to the client in the response, but only server
exceptions are logged.
Merge pull request #134 from EricWittmann/sramp-129-exceptions

(sramp-129) Be more selective about what errors get logged by the server
Further changes to product list and footer
Added isIdenticalTo() and isSimilarTo() to ThermoModel class.

These methods assess the degree of similarity between two thermodynamics
models. Unlike the similar methods for the kinetics models, these do not
require the form of the models to be the same; instead, they simply
require that the models reproduce the same Cp, H, S, and G values over
a wide temperature range.
The diffModels tool now also compares the species thermo.

This seems like a logical feature, since we already compare the kinetics.
In particular, since some of the kinetic estimates depend on which
direction is exothermic, we would need to compare the thermo of the
species if the two models ever disagreed on the exothermic direction.

The compareModelSpecies() method was updated to return both matched
species in the list of common species, to better parallel the
compareModelReactions() method. The implementation of the former was
updated to match a duplicate implementation, and the latter changed into
a call to compareModelSpecies() instead.

Might need some tweaking in the future of what "identical" and "similar"
means for thermo data.
Small changes to chemkin output.

Colliders are hopefully sorted (to reduce random diffs between identical
models) and kinetics comments have an extra line break if the barrier
was raised.
Optional frame implemented (vitality and planar info) on mousover

Combat indicator frame slightly increased.
fix Array#slice
complete array doc comment
blog
blog accueil
[fixes #34] Änderung von Speed, Delay und Direction aktualisiert raw data nicht
M302de: bypass travelevent 55
M302de: bypass travelevent 063
M302de: bypass sub_group_le()
making changes to new-readme
Arrumar bug [#GAIA-1]
Change upload dir for authoring media files
Merge branch 'master' of github.com:ISKME/OER-Commons
Fixed the fix
Updated git-ignore
Git-ignore
Merge branch 'master' of https://github.com/IjinPL/AuctionRMI
gradient within the fragment working
fixed screenshot key
Make output formatting a bit clearer
Minor change to log exception
stops fix
Implement Argument Passing
Fix Falling Nodes bug
Item chime
Added Phaedra as an author.
Adds printing of location to chat window.
added todo_item model
added rvmrc
set up routes for api
added index action
added show action
added the todo_items page that backbone will use
Merge pull request #1 from JoelQ/rails-setup

Rails setup
Added a server.
Focussing newly created windows on setWindow change and removing software rendering from various examples used for testing
Preparing for Ogre3D compilation for 3d graphics :-)
Update readme
Initial source dump
Update readme
Fix pgen script by adding library stubs
Omit encodings module from pgen output
Update readme
Add license
Non local refs.
Add support for 'limit' in 'parse' and 'translate'
Poczatki prac nad tablica.
Enable customization of archive post links
FTP Backup: Monday,  4.June.2012 10:00:01
Initial :)
Initial

Setting things up :)
Initial stuff
Fix issue with `:as` and `:joxify` in one require

In the previous commit 224c773c56, we fixed an issue with missing
module dependency information when a require clause contained a
`:joxify` element. In fact, the bugfix was not complete, as it didn't
cover the case with both an `:as` and a `:joxify` element in a require
clause.

Retrieving namespace information for require clauses is now basically
done the same way like for use clauses, i.e., we don't check for the
number, order, or presence of particular elements.
#462 Restore messages on trash manager (nothing messages are displayed)
Merge pull request #547 from xillibit/bugs5

#462 Restore messages on trash manager (nothing messages are displayed)
Add 150mots
First version
Merge branch 'master' of https://github.com/Leestex/Modern.js
nightly has no noremap, and I hate num-hints
Util more docs
SBCatDB has it's own repo now
bump version
"Not set" CatLab node fields fix.
Importer changes.
Adds conv_sample_server
Adds adv_proxy
Added srlua and updated all submodules
add top 5 feeds
fix bug on linux build
Merge branch 'VTKButtons'

* VTKButtons:
  fix bug on linux build
new admin icon that does fit and some more icons for the future
forgot FreeType RenderGlyph
Befehle dezimiert
Code folder support added.
Removed unnecessary key/location param variables
test_message
Close #785
Release 2.36.1.
This should fix Comment Expansion.
Implemented offerPriority
Also load M12 from Makefile
Ignore dist
Early cabal file
First SBAs
Setup.hs
Targets for documentation
Initial docs for module Types
Initial docs for module IdList
Made type Id opaque
SBA: lethal damage
Support for deathtouch
SBA: planeswalkers with loyalty 0
Todo placeholders for other SBAs
Process all applicable SBAs in a single event
Renamed WillSimpleEffect -> Will, DidSimpleEffect -> Did
applyReplacementEffects now takes a single effect as argument
Use python 2 script instead of the 3
Niceified the README
Update to HW3

Removed Calculate.sln files and added initial Homework 3 files
バージョンを設定
同点だと同着になるのを修正
卓情報格納用構造体を飛燕に対応させる
Fix 1.3 changes that prevent nether and the_end to save level data.
Don't merge items with enchantments. Fixes BUKKIT-2050
Implement new AsyncPlayerChatEvent. Addresses BUKKIT-2064

Added two utility collections for use with PlayerChatEvents allowing lazier
initialization of events and less need to synchronize against the player
list.

Provided a hidden queue system for similar logic to pre-1.3 chat. When a
plugin is listening for the deprecated PlayerChatEvent, all chat will be
delayed to be mirror executed from the main thread. All developers are
encouraged to immediately update to the developmental Bukkit chat API as a
minimum transition for server stability.

Additionally, changes were required to bring thread-safety to the flow
logic. CopyOnWriteArrayList is the only viable means to produce thread
safety with minimal diff; using a sane pre-implemented collection would
require reworking of sections of NMS logic.

As a minor change, implemented expected functionality for
PlayerCommandPreProcessEvent. Setting the player should now change the
player executing the command.
Fix PlayerBucketEmptyEvent handling. Fixes BUKKIT-2002 and fixes BUKKIT-1997

The method this.a(world, d0, d1, d2, i, j, k) is responsible for
actually placing the lava or water source block in the world. The event
is currently called after this method, thus canceling the event will
cause the player to keep their water/lava bucket but the water/lava will
still appear where they attempted to place it.

In addition, the check for whether a player has creative inventory is
short circuiting before the event fires, so the event will not be called
for these players.

This moves the event call and cancelled check above these two calls to
ensure it always fires and the results of it are honored.

Closes GH-835.
Potentially fix chunk leaking, needs further examination
Correctly detect invalid PistonExtension's to allow removal of StickyPistons. Fixes BUKKIT-2059
Re-implement code missing from leaving the end. Fixes BUKKIT-2003
Fix chat not being cancellable when not using deprecated API.
Avoid CME when lightning strikes by making a copy. Fixes BUKKIT-2055
Don't tick chunks or entities on chunks that are queued for unload.

Treat chunks in the unload queue as if they are already unloaded to prevent
processing on them removing them from the unload queue and leaking.
Add AABBPool for diff visibility
Fix bounding box pool to use a dynamic cache size

Also changed insane array copy routine. This should reduce server lag
spikes that occur periodically.
Merge remote-tracking branch 'upstrream/master'
- corrected data input to match task.
- added memory freeing.
- minor changes.
Allow to set root folder and add fallback folders.
E.g.:
  You have a theme system. You can add global directory as fallback folder.
  Then if theme file does not exist, WebLoader will take file from global directory.
Fixed issue with missing explosion / player vehicle after changing level
Update libraries/ManiaLivePlugins/MLEPP/Core/Gui/Windows/ListWindow.php

DedicatedApi fix and commented out getInstances()
fixed bug in roomTest
Changed .max file a bit
Gradle Release Plugin - pre tag commit:  'exhibitor-1.3.3'.
correctly keep track of read/write epoll events, relates #77
convert every dmi file to a png of exactly equal contents
theoretischer Teil Aufgabe 1.1
fixed duplicate pins
added schematics
Change SLN version to work with Mono
Despiste
booke
first shared commit
I added the hello world file
Draw a pond in the middle of the area
asdf
Add some tests and fix up create_link.
Make tests pass and fix error in link logic.
MODIFIED: break away shell from system process 0
Merge branch 'master' of https://github.com/PengyuCHEN/cw4aai
ADDED: syscall sleep
FIXED: bug in proc schedule which causes the execution of non-existing
process
Added the code to draw the path.
UI_CLI: Just fixing a formatting thing in the CLI

The phrase "Suspect: " gets prepended twice to the classification info. 
Just removed the first one so that things are uniform in my testing cases
Merge branch 'master' of ssh://helios/home/git/repositories/Nova
Merge branch 'master' of ssh://helios/home/git/repositories/Nova
Merge branch 'master' of ssh://helios/home/git/repositories/Nova
Merge branch 'master' of ssh://helios/home/git/repositories/Nova
Merge branch 'master' of ssh://helios/home/git/repositories/Nova
Merge branch 'master' of ssh://helios/home/git/repositories/Nova
Merge branch 'master' of ssh://helios/home/git/repositories/Nova
Merge branch 'master' of ssh://helios/home/git/repositories/Nova into FixMemLeaks
BUILD: Add make target that builds without QT as a req (libs,novad,cli only)
NOVAD: Increase libpcap buffer to fix packet drop problems on slow VMs 
NOVAD: Throw a warning message if libpcap is dropping packets
Novad: Lib: Major Performance Enhancements

Number of performance enhancements including:
- const ref usage during parameter passing to decrease allocation calls
- Removal of unecessary workflow
- Removal of TCP session table
- Removal of evidence vector
- Removal of m_haystackEvents variable

As packets come in they are created only once, are read directly
by the target featureset, the data extracted and the packet deallocated.

During classification the only thing left to do is calculate the enabled
features and then classify on that feature set.

As of this commit novad imposes no noticeable bottleneck on a local host.

Unfortunately the version of honeyd we are currently using is making
excessive use of the rsyslogd process so much so that even a doppelganger
and no haystack is enough to throttle bandwidth and max cpu usage during
an "nmap -sS -p 1-65535 <local net>".
Merge branch 'master' of ssh://helios/home/git/repositories/Nova

Conflicts:
	Novad/src/Novad.cpp
Merge branch 'master' of ssh://helios/home/git/repositories/Nova
Lib: Quick 1 packet port table bug fix

We no longer add information to the port table for non applicable packets
like ICMP, this means that not every suspect is gauranteed to have port
table entries.  Added a simple size == 0 check to prevent NaN error and
return a value of 0 if there is no port information.
UI_Core: turn off verbose/non-daemonized flag in honeyd

With the -d flag enabled honeyd becomes bogged down by syslog calls.
Disabling this will drastically improve performance.
Lib: Properly synchronize isShutdown bool in MessageQueue

- Was a race condition left to fix as a TODO
- Fairly minor, though. As it was just a bool. Still...
NOVAD: Change some CRITICAL errors to ERROR without forced exit
Config:   Switch logging levels - Libnotify occurs on critical or higher only
updated getPackage with proper path.join
rss iframe
Merge branch 'master' of github.com:w7cook/OpenBook
merged in latest
- modification du layout
- modification séparation des partie group et utlisateur de l'administration (2 controlleurs maintenant)
- modal pour certains formulaires
- modification du layout
- modification séparation des partie group et utlisateur de l'administration (2 controlleurs maintenant)
- modal pour certains formulaires
css andrad for spelkartan