labofsahil/github-event-dataset-2012 huggingface dataset:
+updated add_stockist() method

Signed-off-by: nuarharuha
finalize add new stockist form

Signed-off-by: nuarharuha
Client_Core: Replaced some mutex instances with Lock class

- Some manual calls to lock/unlock remain where it would be
   difficult to replace
Client_Core: AddUnit() checks to prevent a duplicate Unit first
CLient_Core, Common: Changed handling of Locks for Units

- Units now have their own Lock, don't check them out
- State Tracker uses Unit pointers now
OGRE: Fix for typo compiler error. "Ogre" was missing an "O"
Merge branch 'gameStateTracker' into CEGUI
OGRE: Style changes. Cut off many lines to make it fit on one screen
OGRE: Added CallbackHandler to Client_Core, initial dispatcher code

- Need to add overloaded functions to AppState to actually call
OGRE: Add empty ProcessCallback() functions to GameState and MenuState

- The functions are empty right now. Need to add handling of the functions
OGRE: Make callback handles loop every frame.

- In case we get more than one callback per frame
Client_Core: Fixed CallbackHandler not ending properly (inf loop bug)
OGRE: Hooked up ProcessCallback functions

- The MenuState LeaderChanged() function crashes though...
OGRE, Client_Core: Updated release versions of makefiles
OGRE: Changed interface of LeaderChangedEvent() to take argument

- Does not get a new callback message from the queue on its own
Merge remote-tracking branch 'upstream/CEGUI' into CEGUI

Conflicts:
	RTT_Client_OGRE/src/MenuState.cpp
	RTT_Client_OGRE/src/MenuState.h
Client_OGRE: corrected resources.cfg file to point to the correct GUI assets
Fix audiostreams!

again..
Merge branch 'bugfix/audiostream'
audiostream wijzingen
gastenboek
widget instellingen
Merge branch 'master' of git://github.com/Xeago/Carnaval-Radio
remove dotnetkicks
site master fix voor audio player
sponsoren bovenin functionaliteit
slider header design
design header slider
twitter settings restore
Merge branch 'Develop' of git://github.com/Odie20XX/Carnaval-Radio into develop

Conflicts:
	BlogEngine/BlogEngine/BlogEngine.NET/App_Data/datastore/widgets/7f094a0f-7f29-4cfa-a21f-f7fece0f4815.xml
	BlogEngine/BlogEngine/BlogEngine.NET/App_Data/datastore/widgets/Sidebar.xml
	BlogEngine/BlogEngine/BlogEngine.NET/App_Data/logger.txt
	BlogEngine/BlogEngine/BlogEngine.NET/App_Data/twitter_feeds.xml
	BlogEngine/BlogEngine/BlogEngine.NET/audioplayer.aspx
	BlogEngine/BlogEngine/BlogEngine.NET/pics/audioplayer/popup_icon.gif
Add additional json files
sponsoren bovenin functionaliteit
slider header design
design header slider
twitter settings restore
Incorporate sponsor expiring when retrieving

Refactored the update method a bit to be a bit more lean and mean.

Renamed the method to suit the added functionality
set right permissions on files
Guidelines updated: onClick's handled in XML
Revert "Guidelines updated: onClick's handled in XML"

This reverts commit c71d79819cf606d9f890d12d94cacbef7372dd54.
Adding debug flag
Merge branch 'master' of github.com:OpenFOAM/OpenFOAM-2.1.x
Merge branch 'master' of github.com:OpenFOAM/OpenFOAM-2.1.x
ENH: Adding arraySet sampleSet
[Magic-HD] TimerList: add descriptions.
[Magic-HD] Sreentweaks
Continued work on Reflection team.
Adicionada divisao de tarefas
Merge remote-tracking branch 'origin'
Revert to CM camera
working on week1 hw
Jewels work, kinda
small bugfix
Merge https://github.com/R3AL/SublimeTransporter
Add CardArrangeBox
Merge branch 'master' of https://github.com/RagingBigFemaleBird/sgs into working
minor skill dock alignment fix.
God Choose Allegiance.
Login interface.
Map Generator -> MapObject[][]
Fixed winner not being recognized.
remove dtrace
Ver 0.7

Multi sensor supports
Fixed static and admin url references and pep8 adjustments.
The code now works if the admin_url is a slash. Also, remove MEDIA_URL statics references.
Merge pull request #2 from ricardodani/master

Solving some hardcoded url`s and the possibilite to use this with a admin site mapped as `/`.
Prevented .metadata from being tracked.
new test and comments added
Sign the document
Implement a gnucash report generator
filter_words2.py gemaakt
Moved entire site to jamalaide package
fix links to flow to correct mounted path

The link that is returned does not include the mount path so the links
will be broken.  Added the mount path so this will function properly.
Added some comments to start to better understand the code.
Change links to have full path
Bump SkinVersion to 1.3.0.1

- Changed SkinVersion in CompatibilityManager to 1.3.0.1
- Changed version in theme.xml of both themes in DefaultWide skin to 1.3.0.1
- Update reference in DefaultWide skin to 1.3.0.1
Merge remote-tracking branch 'remotes/upstream/master' into 1.3.0Alpha_SEB_ADDONV2_HomeY
Forgot to remove the additional toPyObject here
2i gemmes
Merge remote-tracking branch 'origin/master'
Sup Sup
Add all 147 HTML/CSS legal color names
Register Funktioniert! Allerdings wechselt er anschließend nicht die activity

bisher sind noch gleiche benutzernamen und emails möglich
new simple test sketch
new test bifile
Стабильная рабочая версия.

Перед внесением дополнения с модРМ и СИБ байтами, считаю нужным
закомитить. В упор не помню чем оно отличается от предыдущей версии, но
эта точно работает и наверняка не хуже.
[not-tested] Add nm-conf upgraded sources
Get and write nm configuration
Add finish install script
Disable nc_v6_interface_configured test
Add connection type file for finish-install script
Choose whether to use ipv4/6 config for nm
Add NM config for IPv6
Add template for finish install question
Remove config file used for testing
nm-conf: Use Linux's random/uuid proc entry if available.

Signed-off-by: Philipp Kern <pkern@debian.org>
Write out network-manager configuration files with mode 0600.

They might contain passwords and the network-manager default for those
files is 0600.

Signed-off-by: Philipp Kern <pkern@debian.org>
Reword target_network_config template; do not ask the question.

While netcfg/target_network_config might be useful for preseeding it
generally is not for regular use of the installer. Especially not
with medium priority. Hence use the heuristics that n-m configuration
is used when n-m got installed and ifupdown otherwise, with wireless
not being configured in /e/n/i if present.

Signed-off-by: Philipp Kern <pkern@debian.org>
nm-conf: use ESSID as connection name

According to Michael Biebl, upstream n-m now defaults to the plain ESSID
as the connection's name. Do not prepend "Auto" anymore.

Signed-off-by: Philipp Kern <pkern@debian.org>
test: reactivate test_nc_v6_interface_configured_suite

I cannot find a problem with that test…

Signed-off-by: Philipp Kern <pkern@debian.org>
finish-install: Do not set /etc/network/interfaces to mode 0600.

No code path currently in netcfg will write a password to /e/n/i. Hence
chmod()ing it to 0600 does not make sense anymore.

Signed-off-by: Philipp Kern <pkern@debian.org>
nm-conf: Allow both IPv4 and IPv6 to be activated post-installation.

Align the write out of IPv4 and IPv6 to the defaults in network-manager.
A connection is considered up if one of IPv4 and IPv6 is up. Allow
each of IPv4 and IPv6 to be activated post-installation by specifying
"auto" as their configuration method, even if they were not present.
Always write out IPv4 and IPv6 configuration blocks like nm-applet does.

Signed-off-by: Philipp Kern <pkern@debian.org>
nm-conf: Only write out MAC addresses on static configurations.

Specifying the MAC address in network-manager's configuration files
means binding that particular configuration to a specific device. This
might be unhelpful, especially if the configuration is nothing more than
network-manager's default anyway. However in case of a static
configuration it does make sense to bind it to the device which was used
for the installation.  Hence retain the MAC write out for this.

Signed-off-by: Philipp Kern <pkern@debian.org>
Add a changelog entry for the n-m write config changes.

Signed-off-by: Philipp Kern <pkern@debian.org>
merge!
fixes for graven integration.
Creating template
Openshift Merge
Openshift Merge
Openshift Merge
github Merge
Посещенная ссылка без подчеркивания
- Updated to v1.3 Screen Manager sample for iOS
config
Signed-off-by: Endis <369029432@qq.com>
初始化错误更正及sortLED部分项目初始化加载
Signed-off-by: Endis <369029432@qq.com>
Config.xml更新
Signed-off-by: Endis <369029432@qq.com>
一个客户对应多界面问题调整->新增客户查询界面
Signed-off-by: Endis <369029432@qq.com>
ViewClick 初始
Signed-off-by: Endis <369029432@qq.com>
通道机，立式机主界面坐标触发效果
Signed-off-by: Endis <369029432@qq.com>
Led引用
Signed-off-by: Endis <369029432@qq.com>
同步屏LEDprocess
Signed-off-by: Endis <369029432@qq.com>
Merge remote-tracking branch 'zzb/master'
增加每25条拆单；修改未测试；
getKeyByFieldAndStringFromDatastore returns None when no entity.
EmailRegistration was obsoleted and was removed from EmailUser.py
Unused commented out lines were removed
bug fix in keyByOdenkiId
Equipment was moved to model.Equipment
implementing class Equipment
functions in /record/RawData were moved to /api/RawData
/record/Metadata was moved to /api/Metadata
/record/Data was moved to /api/Data
/record/Sender was moved to /api/Sender
DataNdb.prepare() creates when it does not exist.
api/OdenkiUser implements create, login and logout
method=register works in /api/Equipment
Implemented issue 31. Now have a menu that appears when SDL_Quit events
are raised.
Escape now opens and closes the quit menu.
Update configuration for Maven

Update .gitignore for new file paths after refactor.
Set build execution environment as JavaSE-1.7 and add paths for source,
  resource and output directories.
Fixed thinsg
updated function to exclude nm_gallery content type from getting an attached gallery field
Update puppet/modules/postgresql/README.md

Update readme to list correct config setting for acls
json.load() can read from a file handle
- slave select signal vector nature applied
Fix movementInfo read/write

Signed-off-by: Yaki Khadafi <elsoldollo@gmail.com>
Merge pull request #7168 from Zakamurite/4.3.4
Core/Items: DestroyItemCount also searches bank

Closes #8240

Signed-off-by: Nay <dnpd.dd@gmail.com>
Core/SmartScript: Fixed possible crashes when attempting to use StoreTargetList with a the same list already stored on the same id
Sentry Totem can be unsummoned by totem timers opcode

Signed-off-by: dr.skull <dr.skull@centrum.sk>
Remove Sentry Totem Aura when Sentry Totem is destroyed.

For Totems use Totem::UnSummon() when old totem is replaced with new one

Signed-off-by: dr.skull <dr.skull@centrum.sk>
Use Totem::Unsummon when new totem replace old totem

Signed-off-by: dr.skull <dr.skull@centrum.sk>
Merge pull request #7487 from drskull/master

Core/Spells: Sentry Totem Aura remove fix and some minor fix in totem.cpp

Closes #4376
Core/Entities: Fixed block for Cataclysm
Core: Change phrasing on the logmessage given when a gameobject loses its reference owner
Action tutorial
Fix uppercase
Action tutorial
Consolidation based on ESTcube assembly;

* Completion off script engine.
* Update of limits.
* Update of commanding chain.
Save our openGL info so we can write it out.
Save game version / time / openGL stats / and misc. other things
that we can use to debug issues to a gameinfo.ini (in savegames)
or WZdebuginfo.txt (on fatal errors) file that can be easily
uploaded to us.
Site updated at 2012-03-29 02:39:42 UTC
"RubyGems を利用して Markdown ファイルを表示しよう" を追加
Corrette le informazioni di licenza
Corretto problema nell'identificazione dell'esito dell'upload
Corretto problema nell'identificazione dell'esito dell'upload
[MySQL] Removed typo saveQuery => safeQuery
change DESTDIR so brew can install properly
initial commit
Adding the game
Added support for requestAnimationFrame
Fixes.
All streams should now close before leaving public members
Added the class kaumasters.
Insulin Drug reservoir check before Bolus
Failure_bolus_insulinlevellow
Clean templates.php of type: down to 15 files!
Fixed issue PHP Error in statistic_view.php
Dev this fix error undefined variable showtextinline
Dev when user trying to get statistic from response
Fixed issue #6404: No bounce check button
Fixed issue: Tokens not listed if related responses record is missing
Fixed issue #6380: Error while exporting survey results to Excel
Fixed issue #6412: "SAVE" button visible when importing
Dev Automatic translation update
Fixed issue #6430 - Central Participant Database: List of participants does not scale well with the number of attributes
Fixed issue #6347: display of question text different in 1.92+ and 2.0 when view question in admin mode
Fixed issue #6427: 'Select tokens IDs' line showing up even when no tokens were selected for sending reminders
Removed kcfinder controller, added a function to the htmleditor helper that initiates the sessionvariables.
Added new vendors directory containing unedited libraries of kcfinder and ckeditor.
Removed old libraries for ckeditor and kcfinder.
Renamed /vendors to /third_party
Merge pull request #25 from SamMousa/Yii

Yii
Remove escape character (\) from any field evaluated by EM.
Added a testcase for EM for the new functionality that removes escape chars from curly braces.
Merge pull request #26 from rahmatawaludin/75384ebaec7d2fd5afec217014d21721ebdb6f46

Fixed issue: PHP Error in statistic_view.php
Updated translation: Czech by slansky
Updated translation: Turkish by kayazeren
Fixed issue #6429 admin language should not determine the list of available attributes. Attributes now displayed in admin language first, then in the first found language if there is no admin language translation available
Merge branch 'Yii' of https://github.com/LimeSurvey/LimeSurvey into Yii
Fixed issue #6444: Fix English sentence on the install directions
Dreaming out loud
Removed areas from repository
resolves spot-486 fixes z indexing for desktop displays on ff and ie
Merge branch 'master' of github.com:abztrakt/spacescout_web
finished Arrays chapter 7
Sender feedback til det rigtige endpoint med rigtige parametre.
Omdøber response.grade til response.smiley.
Added URL placeholders and templates for accounts, and very basic help.

Issues #2 and #5 still open but in progress. This should finish #4 for
this milestone.
Rearranged application layout to be more sane (removed home layout)

Added a general table view for items in stock (currently all items) and
added bootstrap popovers for descriptions.

I now have a better understanding of the asset pipeline.
t commit -s 'Added info about set_*() functions and form_validation class in
the Form Helper documentation.'
Signed-off-by: aditya <adityamenon90@gmail.com>
fixed up files table a bit
Inclusão da máscara no crud lista.
Pushed the whole thing :)
Add BuildRequires: systemd-units for daemons subpackage

0cd0270d introduced a regression in that the %{_unitdir} macro
is not defined without this BuildRequires.

Note that this will break builds for RHEL, but rwsu is fixing.
This gets fedora builds working again.

Signed-off-by: Richard Su <rwsu@redhat.com>
3ds duck
Packages.json with osx support.
graph library updates
Add Alex Gorbatchev's syntax highligher scripts
Moved syntaxhighlighter to a separate lib folder
jGrowl docs
Finishing up jGrowl docs
Event to open application detail page
Tela de contas
rails 3 modification script
Fix cannon rotation not updating when rotating robot
Merge branch 'master' of https://github.com/alexanderzeillinger/fah
dspserver: bugfix setting micEncoding
removed personal information from muttrc
Remove business class from wrapper

This used to control the appearence of the BL logo.  This is now handled
by slimmer
Always include the licence finder Javascript
Add SES gem
Added icons for delete and tree buttons
Going on POO conversion
Wrapper windowURL parameter is now saved in the document and reused correctly
Special characters problem fixed
list button-group one more time
Merge branch 'handlerupdate' of github.com:webnotes/wnframework into handlerupdate
fix in filter location
Merge branch 'handlerupdate' of github.com:webnotes/wnframework into handlerupdate
Removing movie maker and header files.
paginação de listas por seção FUNCIONANDO
bump to 0.3.6 and add in log handler
Fix template file and css file. [Status: unsuccess]
Hide cursor in mu4e headers view.
path patern
path patern
commit outbound_atler hook
change node_url for project
Merge branch 'refs/heads/dev' into feature/6-css-review
#6 remove lorem
version
Merge branch 'master' of github.com:antler/caribou-frontend into error-checking
Interversion Carré et Décapage.
fix bug to also change the path on windows
check_smart handles smart-unsupported disk
add smart test and add print_status
Merge branch 'master' of github.com:appfirst/nagios-plugins
write a Poem back to Pat
change arthor to YM
add auto_get_response attribute
add experimental EMV byte to byte bruteforce AID attack tool
Implement Script Effect for Spell 8856 "Bending Shinbone"
The Scritp effect has a 17% chance to add Item 7134 "Sturdy Shinbone" to the players inventory. Otherwise it adds Item 7135 "Broken Shinbone"
This fixes Quest 1846 "Dragonmaw Shinbones"
thanks @Artox
Se corrige error en el nombre del archivo
More keybindings
solarized-light default theme
Slightly changed keybindings
move detailed render performance tracking into modebase.
fixes and class organization updates.
RDoc + gitmodule
submodules fix
Helpers
arch
big commit
config file
code -> metacode
better view
rake task
spec typo
Merge pull request #1 from Ximik/master

Implementation
Added unit test iframe
Added DocumentUp Page
Added DocumentUp
basic db schema
Added sample code for Selenide test
changed developer link to devdocs.astropy.org
inital checkin
readme update
testPage: enable sidenav scrolling
Stuffies! And UE 0.8.5!
Pulverizer API
Finish, maybe. Version Bump!
Version bump, fr rlz.
Added missing alpha property in AWD2Parser.
Performance tweaking. Levy is now much different than other AORObjects.
merge
Ja/nein im Floraindex werden in ja/nein verwaldelt (bishe: Zahl)
Update classes/kohana/yaml.php
Support parenthesis
Don't uncork writes when using discovery.
Move formatting earlier in the writing process.
Pulsing, gyrating
Merge branch 'master' of github.com:beaugunderson/afterlife
RPM Release 1.6-20120520.1.fc17.x86_64.
RPM Release 1.6-20120520.1.fc17.
thema verfehlt
Poprawiony blad w sensorze windowsa - RAM
Ignore cbTemp files. Closes #3.
renamed Classifier to PrefixClassifier
change visuals, improve movement
In uniprot.php fixed handling of blank nodes
Merge pull request #158 from alisoncallahan/master

Updated uniprot.php -- fixed handling of blank nodes
ajout de exploitation.tex
py: creating addresses and checking with blockchain.info as a backend works
Merge branch 'master' of github.com:bitcoinaustria/bitnotar

* 'master' of github.com:bitcoinaustria/bitnotar:
  fixed Activity name
be able to use -std=c99 with gcc
update from buildtools
Corrected a little typo
Added better remote support
finished making libraries locally referenced
rot13 implementation in brainfuck
Do not +1!
No symlink.
poietische kritik
Better formatting.
OK, I should give myself some credits too!
Now it actually does something.
Fix ARGV. I'm ashamed of myself for this code, but hey, it did fix it!
this will auto-accept invites to channels
remove unused social classes
remove small tag
update link and heading styles
favicon, seo friendly
Add more beautiful images!
add sentence about using shuffling to validate results on each dataset.
Add a method for getting all the things [bump]
Add migrations for logging.
Fix group log search.
Add more logging for group or manager changes.
rid of generic message service, updated some dependencies
STREAM mode in config
stream mode seems to work
entry points seem to be working fine, one for candles one for quotes
Editing a block will prompt users to save changes (if necessary)
Move block editing functions to the editing toolbar.

* Disabled when page is initially loaded.
Add modal popup for adding content to the page

* Add Content (PLUS) button defaults to 'New Text'
* Provides options to select other content types
* Can choose to cancel or select other content to insert.
* Selecting existing content still uses 'old' UI.
* Uses standard twitter bootstrap popup
add method company
Ability to find a particular kiosk.
Objects size updated, static bubble color added
Added 1.2.2 build to the archieve
Added to the sample, demonstrating FileStorage, how to read/write data from/to std::string.


git-svn-id: http://code.opencv.org/svn/opencv/trunk/opencv@8815 c5418bc3-7546-4aae-8bad-fa6f2f3e53e6
Fixed Android build with SDK tools revision 20

git-svn-id: http://code.opencv.org/svn/opencv/trunk/opencv@8816 c5418bc3-7546-4aae-8bad-fa6f2f3e53e6
Fixed discrepancy between SSE and regular baranches in FREAK

git-svn-id: http://code.opencv.org/svn/opencv/trunk/opencv@8817 c5418bc3-7546-4aae-8bad-fa6f2f3e53e6
Small addition change in the FileStorage sample.


git-svn-id: http://code.opencv.org/svn/opencv/trunk/opencv@8818 c5418bc3-7546-4aae-8bad-fa6f2f3e53e6
Update resources/lang/logisticspipes/sv_DA.properties
refs #524 - Made project relationship removal links show a confirmation page
and removed the POST only requirement that made the page return 405 from the
icon links
refs #529 - Overtime & no hours tweaks on project progress bars
refs #529 - "Progress" column should not appear on small-screen environments
refs #529 - Label by overall progress bar
Fixes #529 - Correct parameter name for quick clock in form
Small language changes to Project Removal page
Merge pull request #525 from caktus/fix/project-relationship-removal-524

Made project relationship removal links show a confirmation page
Making a few styling and responsive tweaks.
Merge pull request #530 from caktus/feature/tweaks

refs #529 - Dashboard tweaks
Merge branch 'develop' into feature/dashboard-docs

Conflicts:
	timepiece/templates/timepiece/time-sheet/dashboard.html
Agregado el parámetro de alpha a ParticleController
Fix nilReason='' issue
custom theme based on cloud
Added Cordova Media to handle audio in packaged app for better robustness and support in Android.

--CAR
don't do snippets / partials
Bug 779277 - update staging configs. r=bhearsum
Bug 772029 - tracking bug for build and release of Firefox/Fennec 15.0b3. r=bhearsum
Bug 772811 - tracking bug for build and release of Thunderbird 15.0b2. r=jhopkins
bug 779327: please remove release-mgmt@ from thunderbird release email notifications. r=bhearsum

--HG--
extra : rebase_source : f3cc25d122b34d89c317ac310a70ddfe9e6d0b26
Bug 779518 - tracking bug for build and release of Fennec 14.0.2. r=catlee
adding dxr to production config
Merge branch 'master' of https://github.com/mozilla/build-buildbot-configs into dxr
add preprod config, clean up staging config
Use transactional connection during db population

Previously, DatabasePopulatorUtils#execute looked up a Connection from
the given DataSource directly which resulted in the executed statements
not being executed against a transactional connection (if any) which in
turn resulted in the statements executed by the populator potentially
not being rolled back.

Now DataSourceUtils#getConnection is used to transparently take part in
any active transaction and #releaseConnection is used to ensure the
connection is closed if appropriate.

Issue: SPR-9457
Merge pull request #87 from olivergierke/SPR-9457

* SPR-9457:
  Use transactional connection during db population
Music and sounds (first part).
improvement to form tweaking, put it in a separate module
Adding info
Merge branch 'master' of github.com:cdeskin/MergingPractice
Bumped version to 0.6.0 for ZF2 Beta5
Trying to fix push to github...
NuGet updated, added ReSharper defaults
Update the reference to the smart_common repo
Update the smart_common submodule reference
Merge pull request #3 from chb/container_manifest

Container manifest
Correct delegate property
Update readme
Remove duplicates in xcode project
Add -fno-objc-arc to CPUtilities.m in iOS target
Clean a few things up
Colorize ls always
Ruby installation requirement in readme.md
Added images and changed splash color

Ma, I done a drawin! I'ma artist. #paint
Changed logo and splash files

Ma, I forgot some drawins
Changed cursor style.
working on lightbox
Merge branch 'master' of github.com:christiangenco/pictwist
more lightbox stuff
add linux timer and workqueue
Not using allison anymore
wip on wiring
Firmware bump
Add gerbers for the PCBs
Add solder stencil design for the motor control board
Iterate on the motor plate a bit more (TODO: gear spacing still incorrect)
upgrade sortByTimeAgo to fix a sorting bug
Update notes for submitted changes

* modified vblob bvt to use app_sinatra_service and bump assets pointer
sorting
Merge branch 'master' of https://github.com/code4mani/home_learning
added runtime class analizator
Added dependency on watchdog >= 0.6.0 (working version for OSX) and removed explicit watchdog-installation docs for OSX.
Fixed references to epeli/sauna.reload to collective/sauna.reload.
tabs -> spaces

fail
unicorn working directory
處理使用者離線（關閉網頁、 WebSocket 中斷）的情況，要把該 player 移除
use UTF instead of ISO
mudança

Signed-off-by: construti <tcc.construti@gmail.com>
Merge branch 'master' of https://github.com/construti/construti_tcc.git

Conflicts:
	app/Controller/ObrasController.php
	app/View/Obras/visualizar_custo.ctp
	app/tmp/cache/persistent/myapp_cake_core_file_map
	app/tmp/cache/persistent/myapp_cake_core_method_cache
	app/tmp/logs/error.log
leave bootsrap alone
Modificados los scripts de altas de alumnos acorde a la interfaz requerida en la aplicación.
Create low/high threshold for performance counters

Treat as warning if counters just cross low threshold and error
if above high watermark.
Updating gruntfile to grunt 0.3.0 format.
fixed two bugs with block plugin/dev jquery ui implementation that
hindered testing
Oh my god
Revert "Oh my god"

This reverts commit c9549ce2250357d3a0c6d61d8a834d9b8159cdd6.
Cool animations bro
Data in traceroute request is sorted properly.
Remove non-existent .gemtest from .gemspec.
added feature to specify temperature or humidity from sensor.
require right user to update
add mpi pthread implementation of c-means; rename source code folders
excersice: parenths for prettyShow in num
proxy ui ok
bugfix for layout
Added phpunit.php script
Added a Dummy unit test to allow dry-running phpunit.php script
change output to add property files
Tests: convert cli.test to mocha format
Tests: convert github-commit-status.test into mocha
Tests: convert github plugin test to mocha
Tests: convert queue.test to mocha

Remove one redundant test (pop without push) cause (pop then push)
covered that case.
Tests: convert shell.test to mocha
Clarify table introduction
Rework 'Feedback and Contributions'.
Write css in sass, and make proper bootstrap select drop downs.
Added sinon. Added failing positioning tests. Added repositionOnResize.
shadows/highlights: additional switch to select gauss vs bilateral.
added basic urllib2 and webbrowser usage, thanks to Doug Hellman of http://www.doughellmann.com/ his expansions on these topics.  Fixed an error in $.get example in ajax.js
subida inicial
:e
disabled caching during chart publication
Ensures that the spacing between the label and the custom select box is identical to the other input types.  Since the custom form styling hides the original select box, and creates a new input element, the label spacing defined towards the top of this style sheet wasn't correctly spacing this element.  I've added this rule to the block with the other "Custom" styles, but this could also be declared up top with the other label positioning styles.
markdown, ignore file
css for list
改进ViewById使用方式
Sinatra: added basic sinatra app with Resque admin
Fixed Emeralds only socket items.
Tomes Identify Everytime, EffectLeech No Longer Throws IllegalArgument
Merge remote-tracking branch 'origin/master'
Reduce over objects to avoid blowing the stack when constructing hash
Merge branch 'full-listing'
Fixed round name token.
Merge branch '7.x-1.x' of git.drupal.org:project/tourney into 7.x-1.x
Merge branch 'master' into 7.x-1.x
Merge branch 'master' into 7.x-1.x
Merge branch 'master' into 7.x-1.x
updating round robin to allow for multiple round robins
Merge branch 'master' into 7.x-1.x
removing the minimum requirments now that real releases our out
adding the ability to choose a view mode to represent the contestant
removing license file
moving matchIsWon outside of conditional
removing extra whitespace
adding a null capability to rank sorting
packaging all tourney modules
fixed the tourney rank change field
renaming the sort handler to follow naming convention
adding better help text
Merge branch 'master' of github.com:delphian/drupal-tourney
updated
Included C directory.
initial commit
Merge branch 'master' of github.com:derpaderborner/fotoblog
Pings now use the same color as the ghosts who spawn them
Code format
Faster tests
Define port
Remove duplication
Remove duplication
Rename package
FIX 4
Add space 125 for TestTemplate 
Implement basic test
Social stats module.
Config for http post
Add module Diagrams.Backend.Cairo.Ptr

Used for rendering to buffers in memory.
Fix renderPtr: Clear buffer before rendering
Add module Diagrams.Backend.Cairo.List

For rendering to (Ord a, Floating a) => [[Colour a]]
Merge pull request #25 from nandykins/master

Additional rendering functions, for Ptr Word8 and [[Colour a]]
V0.1 This is a verry first version, not stable, now you can navigate, download and upload, but be careful, use it by your own risk
Handle @type blank node IRIs.
Whitelist frontend.
Added Single Sign-On log-in button and icon to options (only for sites using SSO)
Output user website if set in SSO payload
Added plugin activation statuses to debug info
Bump supported WP version to 3.4
update sso screenshot links
Added screenshots
Remove depenency on DISQUS.require (internal function)
Merge pull request #29 from disqus/add-screenshots

Added screenshots
Merge pull request #32 from disqus/link-wp-backup-guide

link to WP backup guide in readme
ignore
Merge pull request #31 from disqus/bump-wp-version-3-4

Bump supported WP version to 3.4
merge fix
merge fix
Merge pull request #30 from disqus/add-plugin-statuses-to-debug-info

Added plugin activation statuses to debug info
merge fix
Merge pull request #33 from disqus/pass-users-website-to-sso

Output user website if set in SSO payload
2nd merge fix
only show this.sso when button is set
Merge pull request #28 from disqus/add-sso-loginlogout-button-setting

Add sso loginlogout button setting
Merge pull request #27 from disqus/remove-require

Remove depenency on DISQUS.require (internal function)
Signed-off-by: Keith <Keith@Keith-PC>
worker: kill child process
Uses request.getQueryString() instead of getParameterMap() to fix for request.body.asFormUrlEncoded.
It returns an empty map because play2-war-plugin invokes request.getParameterMap() before request.getInputStream().
Uses request.getQueryString() instead of getParameterMap() to fix for request.body.asFormUrlEncoded.
It returns an empty map because play2-war-plugin invokes request.getParameterMap() before request.getInputStream().
Merge branch 'fix-for-asFormUrlEncoded' of https://github.com/takezoe/play2-war-plugin into issue-#102-use-request-querystring
Fixed the integration test for request.asFormUrlEncoded bugfix.
Merge pull request #104 from takezoe/fix-for-asFormUrlEncoded

Use request.getQueryString() instead of getParameterMap()
Fix #102
Merge branch 'issue-#102-use-request-querystring' of githubproxy:dlecan/play2-war-plugin into issue-#102-use-request-querystring
Better test configuration
Formatting
Pull up getHttpParameters method from servletXX class to CoreServlet
Formating
Add missing import and remove useless keyword
Merge branch 'issue-#102-use-request-querystring' into develop
Formating
Fix #89
- Initial commit, loading blank README.md File`
Merge branch 'master' of https://github.com/dlfritz/ELKYSER_ARTIKEL
- Added brief explanation to the README.md file.
The forms crusade continues...
Changed lease from minutes to seconds
Changed max lease for second timings

Also var-ized the max lease time
Modificaciones Instalar
Created an exercise to test calculations of F=ma.

This is just a rough start to the exercise. Many improvements
to come hopefully. The goal is for students to be able to perform
calculations involving Newton's Second Law, solving for any of
the three variables.
config.duration
Revised README and junk.
structural approach to hierarchy
Moar barney
remade URLs like in the TKE paper
Enable buffered channel tests
Correção na exibição de formulário quando não há uf para o cargo
added BOM to README
商品读取
Merge branch 'master' of github.com:doyouhaobaby/needforbug
Fix barclamp initialization and unix file format issues
Merge pull request #10 from galthaus/pull-req-release-rails3anddb-master-e5c84a8488

Tweak Daves fix for object initialization and fix some linux file format issues [22/29]
fix documentation reference
fix doc ordering
Merge pull request #11 from cloudedge/pull-req-release-rails3anddb-master-154397cc14

Remove catalog.yml references from crowbar framework (will break things) [2/6]
Remove unneeded code from the barclamp controllers
Merge pull request #12 from galthaus/pull-req-release-rails3anddb-master-40ce57288a

More updates puma support controller cleanup [20/27]
Microblaze softcore v5.04, v6.00, v6.01 and v6.02
Add remainder of examples.
Disabled banner in media query

Removed extraneous banner
updating README to github markdown
Really fixes tests on travis-ci
Added unexisting field protection for Section stories

Added unexisting field protection for Section stories block
Update .gitignore
Add to `run_closure_compiler.sh' the ability to use a system-provided `closure-compiler' script

This may be easier for Mac users who have installed Closure Compiler via
Homebrew:

 brew install closure-compiler
Add public constants directly to the `BigDecimal' and `MathContext' objects

This makes it so that access to these constants does not have to go through
the prototype; i.e. `BigDecimal.prototype.ZERO' can be replaced with the
more convenient `BigDecimal.ZERO'.

Suggested by: Pablo Grisafi

Recompiled with Closure Compiler 20120917
estilos de participantes
User links on header and small style changes
end models2012
readd submodule.
nitaa
Corretto comando nel README
updated method to retreive string
Ensure that there is null terminator at the end of entitydefs.
regions with translations added
mail logs with person_id
Merge branch 'master' of github.com:eaudeweb/cites-meetings
Small changes to MicrotubuleProcess and bugfix in visualizer
Improved reports views
sh: cpufreq: struct device lookup from CPU topology.

The struct device pointer associated with the CPU we're on can be fetched
via the topology information. Tie this in to localize the CPU clock
lookup. While we're at it, tidy up some of the debug/info printing
notices too.

Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Début dernieres modifs
criando implementacao DP-Strategy
Перенёс компоненты в ядро
now accepts penalties in list form, as well as single numbers
Added sidebar slide in box-example. Added questmap. Corrected many-feeds index to use relative datahappi path.
Merged box-example.js and box.html.
Merge branch 'master' of github.com:electronicmax/datahappi
deleting now works, tweaked empty boxes
Merge branch 'refactor-boxes'
added new files pertaining to maps and such
new chainer
introducing Feeds with Sockjs
Add files to work on
added variables and references heading
testing perl syntax in md
added perl syntax in all code snippets
Merge branch 'master' of https://github.com/elrzn/the-little-perler
Tabs -> Spaces
Favicon link.
woot, finally got the block comment working, i love emacs extensibility.
Merge pull request #107 from jvshahid/block_comment

Syntax highlighting for block comments
Add some basic util tests (Issue #70).
[jwlib #18] Added NodeJS support.
Merge remote-tracking branch 'jwlib/master'
[jwlib #18] Added NodeJS support.
Merge remote-tracking branch 'jwlib/master'
Merge remote-tracking branch 'jwui/master'
barcelona campeon
removing old background files
removing old bg images
added skeleton for sponsors page
Finished game over screen and fixed bug where items spawn in corner
EMI: Fix some trivial Valgrind warnings
Merge pull request #553 from eriktorbjorn/residualvm-valgrind

EMI: Valgrind warning fixes
GRIM: Pause the game when pressing the pause key.
GRIM: Not all the talking actors are in the current scene.
Merge pull request #550 from Botje/better-anims

EMI: Render animations properly
GRIM: Fix zbitmap creation in tinygl renderer.
GRIM: Use an ARB shader to dim a screen region if possible.

This is much faster than using glReadPixels/glDrawPixels.
GRIM: Fix invalid read when an actor finishes talking.
GRIM: Call updateTalk() before update().
GRIM: Add support for integer registry values.

Fix #520. The problem was that ReadRegistryValue("SfxVolume") was pushing
a string, which was later compared to a number, making lua complain.
GRIM: Return false in updateTalk() if it isn't talking.
GRIM: Fix wrong ')' placement. Fix #557
GRIM: Set the values of the global joystick keys before calling BOOT. Fix #555
GRIM: Increase the precision of str2float.
GRIM: Rebuild the active actors list immediately after restoring a savegame. Fix #560
GRIM: Ignore the sticky modifiers when checking alt+enter.
GRIM: Flip the buffer only with the TinyGL renderer. Fix #561
GRIM: Initialize variable.
GRIM: Delete the TextObjects when a movie is stopped.
MYST3: Empty the inventory on new game
Got versions.txt into permalink and pointed version check to it.
Fixed sys.path issue in the new CLI signing script
edit inside of boxess
First commit
remove usless things
Convert JS to CoffeeScript

Merges coffeescript branch
Use RequireJS to load PortalHttpRequest
pause game in onPause
Task#4434 - Generating milan.20121213.02
create doc
decouple config from lib
add icon file to static directory
Closed opportunities are not presented on the dashboard. Fixed task specs.
Fixed mail template and translation keys
update entity, fix activity and user's many to many issues.
Merge pull request #100 from fedorov/Reporting-update-version

Reporting - Update version
ENH: Updated SlicerRT (0.5.1) for Slicer 4.2. See more info at https://www.assembla.com/code/slicerrt/subversion/changesets/compare/352..404
ENH: Updated SlicerRT (0.5.1): DicomRtImportSelfTest works also when installed from the SlicerRT package. See more info at https://www.assembla.com/code/slicerrt/subversion/changesets/compare/404..406
Merge pull request #105 from SlicerRt/update-SlicerRT

ENH: Updated SlicerRT (0.5.1): DicomRtImportSelfTest works also when installed from the SlicerRT package. See more info at https://www.assembla.com/code/slicerrt/subversion/changesets/compare/404..406
test change usernaem
finishd note/simpleecho
finish simple echo ,next step will finish echo example use select
Fix Future task waiting logic. Fixes BUKKIT-2408

Previously, the timeout would erroneously get converted to milliseconds
twice. The second conversion was removed.

Spurious wakeups were not handled properly, and would instead throw a
TimeoutException even if the waited time was not reached..
Fix BUKKIT-2419: PlayerAbilities not being updated on teleport/respawn

Minecraft resets abilities based on what it knows client side, when someone dies and is in "survival," by default they should be in "survival." However, we allow modification of the PlayerAbilities, so we send this update out to the client.
removed debug statement
removed redundent editFire
import organizing
added Undoable edit classes
uses new Edit classes
[maven-release-plugin] prepare release btrplace-model-0.7
[maven-release-plugin] prepare for next development iteration
finish layaut save
Output closing tags if toolbar is not loaded
Update sphinx_plugin/includes/search/fulltext_sphinx.php
Merge pull request #1 from ilantipov/patch-1

Exclude ANONYMOUS (deleted) users from search by username when it is given.
Moved to boilerplate.json
boilerplate.json
Handle all not possible requests with 404.
Add exit if not cloud ID provided.
Update gitignore.
Improve scrape technique and output aws vpc subnet id and rs href.
ensure id of card is carried over from build to put routine
flush cache on bootstrap -d target
gravatar endpoint, use gravatar url if no avatar value supplied in card or register post body, return card from register endpoint
Merge branch 'master' of github.com:flowdotnet/gluecon-demo
added change password dance and removed those annoying fitbit notifications
fixed a bug in Bodymedia
Zeo now checks if the credentials provided were valid
started re-enabling the search field
move files to uploads
add setOption and getOption functions.

to start off, there is an option "vflip", used for potential performance increase, at the cost of incorrect texture coordinates
Use auto for iterators
Add select to test picking a match. All very hacky...
moved the functions example to the begining of the section
changed the functions example to make it more fluid
added stacktrace example
merged origin/master
Merge pull request #121 from fourkitchens/functions-slide

Functions slide and stacktrace example.
Probieren wirs mal...
Checks for existing parsed copy of any tune played

Using the extracted Title from the ABC tune, together with the integer
representing the instrument used, now we check with readProjectData to
see if we already have it.  This makes your parsed tunes accompany your
project, so it is a little bigger but a lot faster.  These data in the
Data.plist file would go along with your project if you were App
Storing it…
cleaned up idCharcodes somewhat
Testfàlle angepasst
libgee-0.7.90-1-x86_64
* Version bump
* Change m8r
melhorado o makefile, agora com profiling
Model Class
merged branch gajdaw/2.0 (PR #296)

Commits
-------

4c184d8 HTML5 meta tags
c110d24 Does $installDir exist?

Discussion
----------

Does $installDir exist?

When the contents of vendor/ folder is removed and the command:

```php bin/vendors install --reinstall```

is executed we will get error messages in the output.
updated deps
updated VENDORS for 2.0.12
updated vendors to dev branches
Symfony => Symfony2 (in README.md)
Merge branch '2.0' of https://github.com/symfony/symfony-standard into 2.0
Fixed naming bug in add_labels
AMQP-213 Add Namespace Support for Returns

Attributes added to template for mandatory, immediate,
return-callback.

Also confirm-callback for confirms.
Reworking proofs to use one block length
Added docs directory and proposal file.
Some ideas on proposal.
Changing spree requirement to >= 1.2

From =1.2
Added the abbr in zenconding for the sections to 'mico del codi'
'productname' and 'application' are better of being '<cite>' than '<span>'.
Using the first parent directory name as the article name for mico in zencoding.
zencoding’s biblioentry and bibliography now use schema.org microdata by
default.
zencoding for mico’s article now has the reference section by default too.
zencoding snippets for mico now use H2 for the article’s sections, because they
look way better on lynx (yeah, I know; but there must be a reason for that.
Additionally, this is not against the recommendation of the W3C)
Removed my email address from the zencoding’s mico:article snippet; I don’t
want people to contact me, really.
Zencoding’s snippet for mico article has ids now in “catalan” too.
Silly, me: it is foreign, not foreing...
Added the ftplugin to show chunks in htmlweb documents.
Merged
Build 5, added smartFind()
Added 'years' in DateType default options. Fix #80.
Merge pull request #81 from solzenic/master

Added 'years' in DateType default options. Fix #80.
Do not crash if user asks for chats but has no partner
added comments.
cleanup: now using getAttributeValue instead of getAttribute and
getValue.
added getStringArrayValue and getStringListValue to ValueTransformer
Added UserDataStoreInfo to encapsulate info about a user's data-store
(e.g., Access Control List, private/remote data-store connection, etc)
Added InfoNodeFilter and InfoNodeFilterChain (enables supression of info
nodes from clients, unless they have proper access rights).
Clarified role of "mimeType"

There's a balance to be struck here. It is useful to be able to provide
MIME type hints, so user agents can present an interface that allows
the user to anticipate what is at the other end of the link.  On the
other hand, we don't want to allow these type hints to re-interpret
safe data.  I might want to include a plain-text illustration of some
malicious code, without worrying that somebody could link to
"/tutorial/security#/example/code", re-interpreting it as a client-
side script that would then execute in the context of my domain.
Test adding a second post
Added a draft template
Added mailchimp signup form
Added twitter follow button
Less aggressive

Signed-off-by: Gavin Halliday <gavin.halliday@lexisnexis.com>
HPCC-8364 Move doRemove methods to files

doRemovePhysical and doRemoveEntry, both in CDistributedFileDirectory
were doing the actual deletion of files and super-files, and being
called from within detach(), which made up a very complicated call path.

This patch moves them inside files (logical files and super-files) and
uses inheritance to determine how to remove a file from the file-system.

This change had several steps:
 * Moving the methods inside File SFile
 * Clean up the unused cluster argument and hint how it should be passed
 * Split remove physical logic and move it inside detach()
 * Make sure clusters were still being removed correctly
 * Make sure renaming would still work (detachLogical() was added)
 * Passing qualified names instead of strings all over (keep clusters)

There is still one issue that needs solving:
 * detachLogical() is public, because daregress tests are using it

A future patch will fix this, as well as move daregress to CPPUNIT style.

Signed-off-by: Renato Golin <rengolin@hpccsystems.com>
Merge pull request #3743 from rengolin/dfs-remove

HPCC-8364 Move doRemove methods to files

Reviewed-By: Jake Smith <jake.smith@lexisnexis.com>
Reviewed-By: Gavin Halliday <gavin.halliday@lexisnexis.com>
Reviewed-By: Richard Chapman <rchapman@hpccsystems.com>
HPCC-8410 Move daregress to CPPUNIT

Moving daregress to CPPUNIT and adding more tests that were not commonly used.
Also making the CDistributedFile::detachLogical() private, to avoid misuse and
moving some common CPPUNIT code to a shared header.

Signed-off-by: Renato Golin <rengolin@hpccsystems.com>
Merge pull request #3800 from rengolin/daregress

HPCC-8410 Move daregress to CPPUNIT

Reviewed-By: Jake Smith <jake.smith@lexisnexis.com>
Reviewed-By: Richard Chapman <rchapman@hpccsystems.com>
Revert CXF version to 2.6.1 for Jenkins Build Problem
TODO : Investigate for the problem
* Refactor Tests ScheduleController (2 tests à compléter)
Merge branch 'master' of https://github.com/glo-ulaval/Architecture.git
Deal with clang warnings about cast of SEL to uintptr_t.


git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/dbuskit/trunk@35592 72102866-910b-0410-8b05-ffd578937521
small changes
small
integrated app loader, set up static content serving for apps, initial ui generation for apps
Note that <T0 and <T1 do not require timestamp files, and spell out the difference between <T0 and <T1.
Move logfile/milestones definitions to sources.yml.
Fix lack of commits causing MySQLdb to go crazy.
Clean up configuration for morgue-location, base-URL.
Google Analytics R OAuth sample

A sample script completing the exchange between an app and Google
Analytics, and then refreshing the token and eventually getting the
data.
more tweaks
home page
home page
index
OMG it sort of works now good
cleaning up styling
cleaning
fonts
fix for chrome font rendering issue
s3 config
new timelines for activity & profile
added option to generate the old-style monolithic shader programs
fixed rare crash in background chooser
Commit README
Merge branch 'master' of https://github.com/gwstudents/gradle-class
added code to display the note, refs #223
BUGFIX: Fix erroneous if-statement

Fix erroneous if-statement. "!=" should be "=="
添加 编译,链接 输出信息.
introduce pool type
Remove file packages
added empty Makefile.in in m4.  Is it really necessary?
added link to original djangosnippet
removed commented out block
CAmbiado el java a 1.6
win32 gui ok
delete extra image and add the cancel button

changed attribute。pane
LPS-28839 Refactorization. Avoid executing unnecessary code.