labofsahil/github-event-dataset-2012 huggingface dataset:
[scaffold] refactor uses of CPP into pure Haskell
[scaffold] add 'production' and 'prod' combinator
[scaffold] make the scaffolding buildable
Merge remote-tracking branch 'origin/master' into purge-cpp
[yesod] update extra-source-files in cabal file
[scaffold] remove the cryptic dev/prod combinators
[scaffold] fix typo in setLogger definition
[scaffold] use if-then-else instead of guards

While the guards solution was nice, it causes GHC to emit a
non-exhaustive pattern warning.
yesod-test: support newest hspec
Merge remote-tracking branch 'origin/master'
Fix tests in scaffolding a bit
yesod-test: use correct nonce/token key
More yesod-test cabal changes
Fix scaffolded tests
Improved scaffolded cabal file
Added yesod test command
Removed a file from cabal file
Merge remote-tracking branch 'parcs/purge-cpp'
Mention yesod test on homepage
Fixed yesod devel flag checking
New style for code blocks outside the docs so that examples and instructions stand out.
Merge pull request #1 from darkixion/downloadrefactor

Downloadrefactor
Refined documentation on chord-degree
gdt.c: correct comment
add file overloading_operators.cpp
Improve color scheme for vim
moar slash
globalism will not save us
Yritetäänpä vielä, html:ää ja css:ää sorkittu
Nelikulmiotyökalu
Modifying images and adjusting come css.
It compiles. And links. And passes a single test. Hooray!
It compiles, and passes reportURI-related tests.
Adam's first round of feedback.
First pass at isWhitelisted().
Reworking the API interface.
Adam's feedback.
Added C# MilSym
add randist generator
Add config option, rdoc, tests for mysql(2) STRICT_ALL_TABLES mode.
Changelog entry regarding mysql(2) STRICT_ALL_TABLES
Add the template path.
switch to public-api.netflix.com
gitignore rbenv version
remove "Expires" caching directive from home page
turn off HTTP caching from app controllers

The caching right now is too aggressive and results in many stale data
being served from regular actions and Ajax pagination.
basset: test
Added required_methods
merge
Merge branch 'flo' of github.com:miun/mediasense into timo
merge
Merge branch 'flo' of github.com:miun/mediasense into timo
fixed address issue
Fixed checkPredecessor Bug
merge wednesday
console works again
fixed intersection detection in CIRCLE command
Cleanup after installing to laptop
Issue_status_changed email added
Notification sends to issue author and assignee if issue being reopened or closed
Duplicate code removed from IssueObserver#after_update
Merge branch 'master' into issue_status_changed_notifications
Merge branch 'master' into issue_status_changed_notifications
nginx vhost standard
Restyled projects list on dashboard
Fixed project last_activity. Links color changed a bit
Gitlab cli for development need at first
Merge pull request #1336 from mmonge/install_nginx_fix

nginx vhost standard
Changed colors for buttons. Imporved preview area. Added clone panel to empty project
fix project.last_activity spec
Removed class 'small' for some buttons. Fixed issue creation
Fixed bunch of js bugs with comments. Also added development tips
Changed filters to readable one. Styled some stuff
Js validation for title presence in issue, mr, milestone
v2.9.0pre
gitlab_meta to 2.9
Freeze project path in admin area
Merge pull request #1326 from AlexDenisov/issue_status_changed_notifications

Issue status changed notifications
Import initial port of dhttpd to C
Well, it stitches frames together. It does it wrong, but it tries.
Let's make sure image-replaced text doesn't render.
Reset RequireJS on reload to allow module loading side effects to occur.
Comma preening
Restore class-based skipping of elements. Useful for temporary markup shown as a stopgap until adapted content is ready.
A bit of mobject refactoring. Functionality is split between main, mobject and utility M lib in a somewhat cleaner manner.
Create a top level document to house passive DOM. Limit appendChild transplantation to head, as it is not required in body.
pull in handling javascript document
re-format code examples
first commit
Merge branch 'master' of https://github.com/modul0/Calendar
Fix for window size with toggle_bar()
added appname to properties
Update api-class/etsy-class-generic.lisp with new generic-functions per new class definitions for `payment-adjustment' `payment-adjustment-item'
remove meaningless init of sockfd in uv_pipe_connect.
Fix proxy extension. Fixes #1933
Luka, Shruthi | #1479 | Fixing unit tests
Clean up importing of views
as per feedback from wenzel and jlongster
Merge pull request #27 from sgarrity/app-reorg

App reorg - fixes #26
mozcom-cdn.mozilla.net is deprecated
[bug 750236] Remove Arecibo logging.
removed .coverage file which should not be in the repo
Remove [compat] handling, always create stub natives
fix regression from fixing custom date range where  7days and 30days options are not re-enabled after being disabled (bug 767079)
update our mobile sniffing for latest Gaia/Fennec user-agent (bug 767620)
show 16px icons for creatured apps (bug 784557)
mock out http calls (bug 811522)
link to View Listing from Marketplace devhub dashboard
ignore packaged apps in domain change
remove <script> workaround
Initial class file commits
Usando setTimeout no loop ao invés de setInterval
Removendo código obsoleto
No more sleep for 5 seconds when open an issue
Put "viewWillAppear()" method to update shelf view orientation
- fix general deny in config
updated google oauth
Docs: Improved geometry usage example as per @tonylukasavage suggestion in #255.
Editor: Working menu system.
Edit user profile and add diagnosis
README cleanup
Inaccessible devices should not return an error

get_progname/2 should only return a string.
README rearrangement
more space for names
wis reverts commit f49ade76946f08869b9195e8ba17a78b5135f073.
add more plugins as submodules
removed POLPY_NEWWAY compile wrappers
Indentation/formatting
Code cleanup; began work on Kruskal's algorithm
Display FileMoves in reverse chrono order.
Fixing typos

buildout wasn't able to reach the logrotate template because its name was misspelled in buildout.cfg
Fix error reporting with leftAssociative
Corretto bug oggetto Radio Naja
.
Versione 1.6.0
Versione 1.6.0 config
.
update elastic search
worked on generics
Try moving the image to a subdirectory
Change the .gitignore when pulishing docs
Git checkout is finicky
Make _site into site on github
Cleanup the 'site' directory after publishing
Include the SVG diagrams in the github site
Clear out cruft before publishing to github
When publishing, merge the current branch
Merge branch 'rake-publish-github' into gh-pages
Publish HTML docs to GitHub
fixed nabeta/enju_leaf#61
Merge pull request #9 from yegusa/master

Volumeがない場合のエラー処理とテストを追加しました
Add PHPLondon and pfcongres slides
Unit-test for Password class
attempt to format..
Glancing at the ne wproject
/* new task */
Work around enums now starting at '1' by default, that broke bootstrap btw, shame on me.
Merge branch 'master' of github.com:nddrylliog/rock
Add ClientMapActivity structure for sampling
venky
RequestForm Full Of JQuery
Merge branch 'master' of github.com:nehaljwani/SSAD
Application\UI: add Form
Added some basic unit tests.
Fixed potential problem with cache size updating in wrong way with concurrent updateSize together with remove or put.
(cherry picked from commit 7c7422d643630fadc6d3246a0eff0d1dfce947be)
Improved the ordering of colors.
Merge remote-tracking branch 'upstream/master' into docfixes2
Render some graphs with a different style.
Merge pull request #341 from nawroth/docfixes2

Documentation fixes
Add read me
sss
Add link to terminitor project
Added missing file to manifest
Merge pull request #44 from nessche/master

Fix for issue #43
Release 2.5.1
Fixed bugreport:6838 pc_level_penalty_mod would return 0 when no player was attached to the kill and scream a nullpo report at console.

git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16853 54d463be-8e91-2dee-dedb-b68131a5f0ec
- Added comments about the max ***_REG_NUM defines in mmo.h

git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16892 54d463be-8e91-2dee-dedb-b68131a5f0ec
attempting to fix by breaking
upload from site
price changes
adding creds on site
upgrading
lam numbers report
minor fix
prevent inappropriate cred numbers
visual fixes
centered text
fixes
bug fixes (non-first bag problems)
company search
calculation fix
add check to calculate
hey
view fixes
fix
fhhhhhh
fix
[maven-release-plugin] prepare release languager-1.0.10
Script to concatenate timeseries files.
Script to run birrp and bbconvert.
Changes to run_birrp.py
Add good documentation and general options to csvutm.py
Some changes to mt.py

- Write EDI files
- Delete frequencies easily from arrays
- Load data from a number of sites into dictionaries.
Change find_nearest to use numpy
limpando .gitignore
varios fixes
create Task model
create Member model
scala-timeのimportと、package objectの導入
DB関連の記述も開始。Taskだけひとまずちゃんと書いた。Tobanはまだ枠だけ。
MemberのCRUDテストも追加
TaskとMemberのcreateはIDを入れたオブジェクトそのものを返りにした
Task, Memberにfindを追加
Tobanのfind, createOrUpdateを実装
Merge branch 'feature/create-models' into develop
* Fix filesCount function
* Some refactoring
Restrict XML-RPC to a clicker specific URI

This restricts the XML-RPC calls to a clicker specific URI.  This
is to avoid using the general RPC2 path, which allows clients to
know they are talking with a clicker server.
changed design and project infos are now dynamic
fixed toolbar buttons & added fontname animation
change package.json parse error reporting
added appengine info
Completed checking feature.
Fixed a bug causing a crash caused by insufficient pointer initialization.
Updated TODO.
changed image size

trade page image size
sell.php can now call the marketSell web service
First sketch of hook configuration
Initial work on adding hooks into the worker start/stop lifecycle
Correct variable name in test
Rename "action" argument to "hook_name" for consistency
Resolve hooks on watcher startup
Ensure config tests pass with new hook resolving approach
Fix typo
Add reference from Watcher back to the Arbiter that initialized it
merged
added hook return logic
fix logger message formating on socket error
Merge pull request #299 from mozilla-services/hooks

Hooks
FIX: openssl fixes.mk
na
BUG: fix atlas version to 3.8.0
added modules/inverters
Indes Galantes 1735 : prologue, scene 3 [6]

vous nous abandonnez
updated .gitignoregit
stlink: export write_debug_reg

Change-Id: I3944911d4a71dba4af48470ceb3e4850784a0e7d
Signed-off-by: Spencer Oliver <spen@spen-soft.co.uk>
Reviewed-on: http://openocd.zylin.com/580
Tested-by: jenkins
Reviewed-by: Mathias Küster <kesmtp@freenet.de>
Reviewed-by: Freddie Chopin <freddie.chopin@gmail.com>
stlink: support srst reset

This adds the ability to support srst reset for the stlink/v2.
stlink/v1 will fallback to using SYSRESETREQ which is a full reset - including peripherals.

To enable the use of the srst add the following to your cfg:
reset_config srst_only

Change-Id: I570de607c5f370fd6a4abf47360686c9be07bcdd
Signed-off-by: Spencer Oliver <spen@spen-soft.co.uk>
Reviewed-on: http://openocd.zylin.com/581
Tested-by: jenkins
Reviewed-by: Mathias Küster <kesmtp@freenet.de>
Reviewed-by: Freddie Chopin <freddie.chopin@gmail.com>
build: use generic name for arm_algorithm vars

This makes the code a bit easier to read as arm_algorithm can
refer to other arch's, not just armv4_5.

Change-Id: I78c99d40f34cda04e06f2daee75b48ff40a1d23d
Signed-off-by: Spencer Oliver <spen@spen-soft.co.uk>
Reviewed-on: http://openocd.zylin.com/613
Tested-by: jenkins
Reviewed-by: Aurelien Jacobs <aurel@gnuage.org>
Reviewed-by: Freddie Chopin <freddie.chopin@gmail.com>
cfi: check supported arch

check that the cfi driver supports the current target arch.

Change-Id: I8a95908684de67bf1657d1956f2573662a641cc1
Signed-off-by: Spencer Oliver <spen@spen-soft.co.uk>
Reviewed-on: http://openocd.zylin.com/614
Tested-by: jenkins
Reviewed-by: Aurelien Jacobs <aurel@gnuage.org>
wip, example site working
done with the use cases controller
log4j.xml замінив на log4j.properties
Merge remote-tracking branch 'origin/master' into test

Conflicts:
	src/main/resources/log4j.xml
Merge remote-tracking branch 'origin/test'
кабінет і деякі фікси
NXP-10184: remove leftover code blocking single user suggestion display to 'view'
7z -> bzip2
Revert "Initial commit."

This reverts commit a5bd97a1a69c45d388cb701cdcde866716857702.
Audio: Remove unused CELT loading code
Audio: Move CELT code
Murmur: add Opus threshold option
CELTCodec: Fix compile error if PLUGIN_PATH is set
Murmur: Add codec warnings and ignore non-Opus packets if Opus is enabled

Also includes the CELT warning for "broken" clients by Nicos Gollan.
WolfET: fix string buffer termination and use more efficient peeking

Fix string buffer termination (was off by one).
Peek avatar pos with 1 call (3 subsequent floats).

(see comments on pullreq #87 upstream)
WolfET: set context data in JSON format
Merge remote-tracking branch 'dist/master'
Merge branch 'master' into dx11
Fixed typo in the GeocodeInterface documentation.
Add IP6 localhost to SenateFilter exceptions.
add auto upgrade function
Fix JSON definition
Update the session cookie when new login info is provided
Store Login action in user trace
Mark session object as modified when we update it.
update #150
make bootstrap buttons large
Har laget kommentar boksen. Jobber med aa faa den til aa fungere
Forward on defualt keyword.
Add DebugOnError for debugging bulk processing
Fixed: cosmetic improvements requested by customer
cleanup
Merge branch 'master' of github.com:omarkj/dotfiles
Added database step to README.
Got rid of the generate task, not necessary for faqtly.
Script para agregar usuarios OMI ahora intenta agregarlos a un concurso especificado
symexec: use SymCtx::GetStackFrameLayout() instead of SymCtx::sfLayout_
symctx: make SymCtx a class
The same check in VerifyMethodCheck
Merge pull request #72 from LTe/double_check_verify

The same check in VerifyMethodCheck
Fix a memory leak when read a malformed RGB(A) png
doc: Remove USA vs International from AdminGuide

OpenAFS does not have separate distributions for the United States
and the rest of the world.  Nor are there any restrictions on the
capabilities of the Update Server.

Reviewed-on: http://gerrit.openafs.org/7902
Tested-by: Jeffrey Altman <jaltman@your-file-system.com>
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Derrick Brashear <shadow@dementix.org>
(cherry picked from commit da9f42d044725ae128feffcfbeaab67b31aaab44)

Change-Id: I98249c3ebb84ae4f4a73a502b0511d46dad8c849
Reviewed-on: http://gerrit.openafs.org/7906
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Derrick Brashear <shadow@dementix.org>
Windows: Freelance Short circuit all vol updates

As long as the cell is the Freelance Cell ID the volume updates
should be short circuited.  There is no benefit to performing
the extra work.

Reviewed-on: http://gerrit.openafs.org/7636
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Jeffrey Altman <jaltman@your-file-system.com>
Tested-by: Jeffrey Altman <jaltman@your-file-system.com>
(cherry picked from commit e0b9b89dd98d0bf449556e3f28b479dd61e7eb95)

Change-Id: I1ea014e4a8bd0c8523d0cecc7411afb53c199a18
Reviewed-on: http://gerrit.openafs.org/7689
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Jeffrey Altman <jaltman@your-file-system.com>
libafs: afs_CacheFetchProc can't be called without a dcache pointer

An inspection of the only call site suggests that afs_CacheFetchProc()
can't be called with a null dcache pointer, and code further down
in this function dereferences adc unconditionally (assuming
rxfs_fetchInit() doesn't crash first) so remove the conditional
here.

Probably more of these parameters can and should be included in the
AFS_NONNULL.

Change-Id: Ic87517376085b0d5bc7631b5558411259ae986f4
Reviewed-on: http://gerrit.openafs.org/5180
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Derrick Brashear <shadow@dementix.org>
rx: Remove packet burst elements from peer struct

The peer structure contains a number of elements left over from an
earlier, burst based, congestion control strategy. As OpenAFS has
never implemented this strategy, just remove these elements from
the structure, and store 0 values for these elements in the debug
packets.

Change-Id: Ib50a8ac587890efb483d3c2640ead615d170db34
Reviewed-on: http://gerrit.openafs.org/7006
Reviewed-by: Derrick Brashear <shadow@dementix.org>
Tested-by: Jeffrey Altman <jaltman@secure-endpoints.com>
Reviewed-by: Jeffrey Altman <jaltman@secure-endpoints.com>
simplify error displaying code in moses
Some minor cleaning up.
Some minor cleaning up.
Some minor cleaning up.
Some minor cleaning up.
Some work on the simulation and solvers properties (#112). Can now keep track of the properties' values for a given CellML file.
Some work on supporting the 'saving', 'saving as' and 'saving all' of files (#102).
Some cleaning up for PropertyEditorWidget (#112).
close_swift_conn is a method of swift.proxy.controllers.base.Controller, not function

Change-Id: I84dd7bc2fc5ebd1190a7184f42fc5ecf5fd7b4d3
Merge "close_swift_conn is a method of swift.proxy.controllers.base.Controller, not function"
Update notes for submitted changes

* replace a value set with utils.TRUE_VALUES
Update notes for submitted changes

* Two MIME types sent during test
Add explanation for definer change to readme
come on nu då
come on nu då
Merge branch 'master' of https://github.com/oreflow/sokoban
getting the user on page load
working bfs territory
Remove all references to canceled elo
Remove all references to Game.configArray
Move remaining game finish logic to lila
Merge branch 'testing' into testing-ninja
wip
add identifiers to a few buttons on the admin
Merge branch 'develop' into testing
Merge branch 'testing' into testing-ninja
admin tools test finished/updated
admin pages tests
admin plugins test finished
WIP, half of appearance test done
Merge branch 'testing-ninja' into testing
small fix on admins' password change
fixed #324, added check permissions at oc_admin items.php
Merge branch 'testing-ninja' into testing
Merge branch 'testing' into testing-ninja
bug fixed at search.php - addContactEmail

Conflicts:

	oc-includes/osclass/model/Search.php
improved buttons add widget+location, added element id
bump maple version
adding mysql driver
using jadaboop.core as main
adding mysql example as a comment
add usage section to the README
Merge pull request #1 from carvil/enhance-documentation

Enhance documentation and add mysql support
10.6 gflops on 64x64, edge cleanup not finished. blocking by 4 on i, 2 on j, simd reads and stores into C
Made the WorldCreator private
Made the WorldCreator private
Update
Embed oUF and oUF Experience
Revert "Only show Experience when plugin is present"

This reverts commit 87a71772bae68ed91c0871b1379860816c4afc18.
Revert "Use double underscore to avoid tainting blizzard"

This reverts commit 426860d6f11b413270d3ca3b93c785820767dc3e.
enable gpg-agent
haven't used the public license for a while -- remove from repository
Condor -> HTCondor name change and trademark
Condor -> HTCondor name change for license.tex
完成donater的curd，实现了其分页。修正了date函数的分钟显示，原来不是m，而是i。
把数据的curd操作全部提取到了BaseAction里面（add->create, getEditForm->read, edit->update, changeStatus->delete）。
Moved /Pigeon/trunk to /Racepoint.
Upgraded to NetBeans 7.1
Moved javascript files to Static
Added resources
Fixed the Index to properly dispaly messages and to redirect correctly
Started working at the Chat page
Adding in a build-close method
New architecture

- Now using knockout.js
- Added plugins for require.js (cs, domReady, i18n)
- Created model.
Silence some php errors
Tested Impaling Critical and Improved Impaling Critical, works great now!
Issue#: NEWSOURCE-130


git-svn-id: https://pcgen.svn.sourceforge.net/svnroot/pcgen/Trunk/pcgen@17764 b6a209e6-650d-0410-972b-dadffa731f64
[RSRD] Open Minded feat should grant 5 skill points
- Proper Code Support would be preferred, but till then, this will suffice.
Issue#: DATA-412


git-svn-id: https://pcgen.svn.sourceforge.net/svnroot/pcgen/Trunk/pcgen@17707 b6a209e6-650d-0410-972b-dadffa731f64
Fix warning about additional symbols after #endif
Make internal hashmap functions static.

Fixes a linking conflicts that causes cfitsio to use this crc32 and segfault.
Return the correct errorcode in tracer.
new 'set' section introduced, intermediate code compression
Allow multiple File transports
Added ArticleResume to Article and fixed date problems in most_moved
Image preview in admin panel
Gallery updated
history management
text query on a non empty dim win
save to disk when saving txt... save entry in main menu
using the mouse to move objects on the whiteboard (and not losing the focus)
fixing some codesmells reported by findbugs
replacing .printStackTrace with log messages
Update readme with regard to mac #58
Merge branch 'master' of github.com:pfn/keepasshttp
New only_attribute_changes_of option for searchable method.

:only_attribute_changes_of<Array>::
Define the only attributes that should trigger a reindex of that object. Should be at least the indexed attributes.
ignore_attribute_changes_of is ignored if you use this method, and the default behavior is executed when only_attribute_changes_of is omitted.
Support for IE (2)
re-updating 0.4.0 beta for win
bump. cleanup. tablumps parser seems to be working fine now...
Shifted SymmetryJob from mopac.py to symmetry.py.

Symmetry jobs are not dependent on QM calc program.
Having them in mopac was breaking from the idea of
this refactor.
fix up link location
added option "disableProgressReload" to disable the progress reload on thumbnail generation

git-svn-id: http://www.pimcore.org/svn/pimcore/private/core/trunk@1851 1f8fe7d8-47f0-464c-8d0a-336f4953ab05
added support for "reload" param

git-svn-id: http://www.pimcore.org/svn/pimcore/private/core/trunk@1852 1f8fe7d8-47f0-464c-8d0a-336f4953ab05
bugfix setObjectbricks() - only set the value if it was not previously added - otherwise a mysql error will be thrown because the join table is not unique

e.g. caused a error
$list->setObjectbricks(array_merge($list->getObjectbricks(),$bricks));

git-svn-id: http://www.pimcore.org/svn/pimcore/private/core/trunk@1853 1f8fe7d8-47f0-464c-8d0a-336f4953ab05
PIMCORE-1529 - Problem with Objectbricks with long names in "object_relations_?" table

git-svn-id: http://www.pimcore.org/svn/pimcore/private/core/trunk@1568 1f8fe7d8-47f0-464c-8d0a-336f4953ab05
PIMCORE-1529 - Problem with Objectbricks with long names in "object_relations_?" table => renamed updatescript to 2038

git-svn-id: http://www.pimcore.org/svn/pimcore/private/core/trunk@1569 1f8fe7d8-47f0-464c-8d0a-336f4953ab05
renamed update script from 2033 to 2034

git-svn-id: http://www.pimcore.org/svn/pimcore/private/core/trunk@1570 1f8fe7d8-47f0-464c-8d0a-336f4953ab05
oppdatert med meny og stuff
added external URL field to sponsor application form
WIP
Using directory name and folder icon on sharedpoints list for local ones
Bug fixed on sharedpoint size after re-design
Files are sorted based on their relativePath previously to be hashed
Shared files showed on a hierarchy
Clean-up of folders paths on shared files hierarchy
Shared files list show sharedpoints icon
Little code clean-up
Get automatically the sharedpoints type icon from file metadata
Merge branch 'master' into issue_41__Fix_add_sharedpoints
Merge branch 'master' into issue_41__Fix_add_sharedpoints
Delete removed files on the refresh walk-about
Using own version of EventTarget since original was renamed
Fixed bugs
Removed files are deleted from the Sharing tab
Fixed typhos on test images names and added duplicated one
Merge branch 'issue_41__Fix_add_sharedpoints'
Changed style of "Start here" div
Splited UI_setSignaling() on UI_setSignaling() & UI_setPeersManager()
Opening connect user dialog from Start here div
Unified both UI_setPeersManager()
Added open dialog from Start here div
Launching the tools menu from Start here div and modified times
Darked smiley quiet to be more easy to see
Showing the compatibility manager dialog correctly
Changed IDs and removing compatibility alert from DOM
Added accept buttons on dialogs
Show compatibility smiley correctly
Updated "Start here" div with info about the compatible browsers
Improved accesibility of tables
Enable the sharing tab only if we are sharing files
Allow customization of content of empty files tables
Open preferences dialog from sharing tab if no files are shared
Merge branch 'master' into issue_38
Resorted functions
Auto-update UID on user interface
UI_setSocket() method
Moved themes to own folder
better help message
remove.py
remove trailing dot from api auto generated description
changed dashboard display of interval to use time_ago_in_words
api v1 - domains controller
add compute_resource.supports_update? to current provider set
Show kind_id in config templates API
added environment API
fix failing 'show nested fact json' test in fact_values_controller_test
fix for FactValuesControllerTest#test_create_invalid
a bunch of fixes to get functional tests running under 1.9.2
Merge branch 'develop' into api-doc
Added a few comments on what has changed with Travis-CI-tests.
run the tests (and generate the docs) as the default `make` target

(this way you can get started by just `git clone` & `make`)
Users should be redirected back to the projects page if they try going to a project that does not exist
Removing unused bootstrap files and adding the retina.js lib.
revise st_union example to show new and faster way of doing multi-band union

git-svn-id: http://svn.osgeo.org/postgis/trunk@10362 b70326c6-7e19-0410-871a-916f4a2858ee
oops forgot to finish the changed statement

git-svn-id: http://svn.osgeo.org/postgis/trunk@10363 b70326c6-7e19-0410-871a-916f4a2858ee
ST_AddEdge*: make update of old face edges more robust (#2025)

Include tests for adding an edge that splits an hole in a face
while forming a left ring which constitutes an invalid polygon ring.

Also fixes one case of invalid topology creation (when the formed
ring has a dangling edge but not a new area on the other side).

git-svn-id: http://svn.osgeo.org/postgis/trunk@10365 b70326c6-7e19-0410-871a-916f4a2858ee
fix rest endpoint
just a write statement to give a visual aid at the prolog REPL while cycling over answers using the semicolon
Began an Windows installer project with WiX
Display max 1024 bytes of data block 0

If file size is less than 1024 bytes then display only
the file size of data

Signed-off-by: Prashant P Shah <pshah.mumbai@gmail.com>
GDT offset is calculated as superblock block size

Previously GDT offest was hardcoded as 1024 + 1024 which used
to work if block size is 1024. GDT offset is the next
*block* after the superblock *block* ends

Also aligned everything to column size of 80

Signed-off-by: Prashant P Shah <pshah.mumbai@gmail.com>
In case a node loses it's agent we take it out of the display on UI
visualisation etc as draw() method in some objects
next
Manage the exception when no statistics are available
replace outdated calls to errors.add_to_base
Merge branch 'master' of https://github.com/prove/tarantula
Fix bug products url generation to handle sub dir deployment
automated git export - commit
Add support for game time display in header widget.
Remove source mapping as it is not usable.
Melhorado a visualização no admin
With code links
+ add thor module:create
+ add thor project:create
Merge branch 'feature/thor' into develop
+ compile module files
- delete no need files
+ add module parameters compile
+ add slideshow(fw-ss01-01) makeup
+ add compass_twitter_bootstrap
+ compile module parameters
+ rewrite carousel slideshow module makeup
+ livereload :apply_css_live => false
+ widget carousel
+ add add_import_path and sprite_load_path for compass
origin carousle widget makeup and css ok
+ add .caption for carousel
+ carousel item caption style
+ slideshow's carousel-control restyle
+ .section not work, use clearfix apply to module direct
+ add module param colors
+ random color for .item only work for fade effect
+ .caption style
Merge branch 'feature/mod/slideshow' into develop
switching all files to space indentation
stubbed tests and classes for model discovery
chrism's blog link
added check for previous incomplete get-callback in get()/get_timevars()/get_ctrlvars(), moved timestamp conversion to dbr.py
Added {{ integration:visitors }} to display a visitor count and a page view count
Merge branch '2.1/develop' of github.com:/pyrocms/pyrocms into 2.1/develop
Update installer italian lang

Update italian language for intallation
Italian language for Files module

Create italian language for Files module
Update Italian Group module

Update italian language
Fixed typo

Fixed typo
Created italian lang for search module

Italian Lang
Fixed typo

Fixed typo
fixed typo

fixed typo
Other italian language fixes

Fixes
Fix language

Fix language
fix

fix
gitignore

gitignore
fixed italian language

Fixed italian language
fixed typo

fixed typo
Merge pull request #1570 from ChristianGiupponi/2.1/develop

2.1/develop
Fixing mishaps of last commit.

Reverted files/js/functions.js
Added missing permissions/js/group.js

Signed-off-by: George Petsagourakis <petsagouris@gmail.com>
Use pipe trick to ensure gevent queue's wake up when set from a separate thread.
New StringCalculatorKata

Creating new project

Signed-off-by: Paul <pzaloznyj@gmail.com>
validation
Merge branch 'master' of https://github.com/qballer/yael.js
Segment.ioによるアナリティクス解析用のコードを追加した
[Bug #6544] Take care of returning last added value of given cookie.
[Bug #6501] In case of using "ios" and running application in an iframe there can be a problem by same origin pilicy, in order to listen orientationchange or resize events of top frame (window.top). Therefor we are forwarding the event the event through ElementResize handler.
Prevent touch devices from waiting 500ms to flush queue.
Allow getData() method from dragover event
Reset action after changing target.
Drag and Drop Quick-fixes. They should be cleared bei framework team.
Async work around for table bug, makes to much site effects. So reverted.
Prevent dragover event if related target is dragdropcursor.

Signed-off-by: Mustafa Sak <mustafa.sak@1und1.de>
Dangling comma removed
http://issue.tool.1and1.com/browse/MAMOSCLIENT-533
Implementation of firering dragchange event with target as drag target removed.
added missing child control documentation
[BUG #6286] Use the proper key stored in the styles map to query the values to make sure the JavaScript animation is working.
Week 10 test 2 Step by Step
added charts to 'rand,' no longer needed 'rand2'
edit on master again
Remove random bad asserts
Git/vim: Use vim to merge (with some flags to make vim merge well)

Finally a merge tool that has all the views! Thanks vim.
Additional colours added to the colors command - the 256 palette
Screen can be launched in any directory now, not just $HOME
Vim: fixes and missing lines. Not sure how these lines got missed.
Vim: Added Grep command
Vim: NERDTree now doesn't close if it's the only window and ,t opens it
Fix ls aliases to work on platforms without --group-directories-first
Added disk usage (du) function with human readable sorting (namely: duh)
Calling "fg" now pulls the job name from the job list to update the title

Previously it would show "fg" as the current running application.
Exit code is checked for a signal (exitcode > 128) and the name shown
Tidy-up of exit code checking

Turns out 128 is used by Git. In bash it means the command was cancelled
or exit() was called with a bad value.
Vim diff improvements

 - Less context
 - Deleted lines not as prominent (default background colour)
Vim: Support for templates in .vim/templates/ext where ext is the file ext.
Added makefile snippets
fixes #1913 Solaris architecture fact should always be hardwareisa
Bugfixes & calibration
- Fix an issue with a main unit that doesn't change it's values. If we
  see the same checksum for MAX_SAME_CHECKSUM packets, we reset the main
  unit using gpio_reset() and reinitialize the serial port
- Further calibration work of pressure
Install Composer, closed #10
NPE fix and register tab validation follow on checkin to complete it.
Maybe this time - Travis, please!
more text
added html file
adde dhtml tag
Merge branch 'feature/my_test' into develop

* feature/my_test:
  adde dhtml tag
  added html file
  more text
Jeweler -> Bundler

issue #3
fixes to sync script remove duplicate pip stuff from .zshrc
[lib,daemon]Handle errors in Hash.load().
[UPDATE] Bump version and add changelog
Merge branch 'release/0.3.0' into develop
Rename final report.
Install Syntastic
I'll give ctrlp a try instead of Command-T
fewer failed clues
Model_Post adjusted to phpcs standards.
Fixed bug in idref validation checks
Minor bug fix. Previous approach assumed the first element in a content document was an 'html' element. Now this is sought explicitly as the starting point.
line height in settings problem
added a spacer to the bottom of the toc
collapsing toc when closing navbar
for linux build
Merge branch 'master' of https://github.com/reallongda/vnoc
Small modif on gitignore_global file
Move zshrc file to custom ohmyzsh folder
remove HTML code around "Wallet" (displayed on overview page) and use Qt tags for font settings
gettransaction RPC for non-wallet transactions

Works for wallet transactions, memory-pool transaction and block chain
transactions.

Available for all:
 * txid
 * version
 * locktime
 * size
 * coinbase/inputs/outputs
 * confirmations

Available only for wallet transactions:
 * amount
 * fee
 * details
 * blockindex

Available for wallet transactions and block chain transactions:
 * blockhash
 * time
-loadblock to load from an external blk000?.dat file
small translation-file handling / loading changes and re-work comments to be clearer
CDiskTxPos, CInPoint, COutPoint: cast null value (-1) to unsigned int
to eliminate signed/unsigned comparison warnings
OpenBlockFile(): cast to eliminate signed/unsigned comparison warning

nFile's null value is -1.  Cast that to unsigned int, to avoid warning.

Additionally, avoid nFile==0 because the first valid value is 1.
ThreadSocketHandler2(): cast to avoid signed/unsigned warning
EvalScript(): cast to avoid signed/unsigned warning
Update to require IE 5.1 as it is required on mingw64.

We already require XP, this just fixes Mingw64 build.
add a clear all button to the sign message page
Fixed non-sensical error message

Previously trying to create a multisig address that required less than
one signature would output something like the following:

"wrong number of keys(got 1, need at least 0)"
fix #952 by checking if we have a new address or an updated label
SOCKS5 support by default

Add -socks=<n> to select SOCKS version to use. 4 and 5 are supported,
5 is default.
SOCKS5 connect via hostname
refactor ConnectSocket
Support connecting by hostnames passed to proxy (-proxydns)
Add -seednode connections, and use this for -dnsseed + -proxydns
Support for multiple local addresses
Added -externalip and -discover

-externalip=<ip> can be used to explicitly set the public IP address
of your node. -discover=0 can be used to disable the automatic public
IP discovery system.
Bump version numbers for 0.6.1rc2
Merged r9924 from trunk.

git-svn-id: svn://rubyforge.org/var/svn/redmine/branches/2.0-stable@9959 e93f8b46-1217-0410-a6f0-8f06a7374b81
Merged r9783 from trunk.

git-svn-id: svn://rubyforge.org/var/svn/redmine/branches/1.4-stable@9790 e93f8b46-1217-0410-a6f0-8f06a7374b81
CHANGELOG update.

git-svn-id: svn://rubyforge.org/var/svn/redmine/branches/1.4-stable@9791 e93f8b46-1217-0410-a6f0-8f06a7374b81
Merged r10733 from trunk (#12232, #12235)

German translation for 2.1-stable updated by Daniel Felix.

git-svn-id: svn://rubyforge.org/var/svn/redmine/branches/2.1-stable@10738 e93f8b46-1217-0410-a6f0-8f06a7374b81
Accept float in inline styles.

git-svn-id: svn://rubyforge.org/var/svn/redmine/trunk@10396 e93f8b46-1217-0410-a6f0-8f06a7374b81
Do not consider that versions that are due today are completed.

git-svn-id: svn://rubyforge.org/var/svn/redmine/trunk@10397 e93f8b46-1217-0410-a6f0-8f06a7374b81
scm: bazaar: add asserting entries root path at unit model test

git-svn-id: svn://rubyforge.org/var/svn/redmine/trunk@10398 e93f8b46-1217-0410-a6f0-8f06a7374b81
scm: bazaar: remove unused scm.revisions ":with_paths => true" option from fetch_changesets method

git-svn-id: svn://rubyforge.org/var/svn/redmine/trunk@10399 e93f8b46-1217-0410-a6f0-8f06a7374b81
Attachments should be available to the text formatter when previewing an existing news.

git-svn-id: svn://rubyforge.org/var/svn/redmine/trunk@10400 e93f8b46-1217-0410-a6f0-8f06a7374b81
Adds a "depth" option to the child_pages macro (#10789).

git-svn-id: svn://rubyforge.org/var/svn/redmine/trunk@10401 e93f8b46-1217-0410-a6f0-8f06a7374b81
Updates macro description (#10789).

git-svn-id: svn://rubyforge.org/var/svn/redmine/trunk@10402 e93f8b46-1217-0410-a6f0-8f06a7374b81
Adds missing WikiContent fixture.

git-svn-id: svn://rubyforge.org/var/svn/redmine/trunk@10403 e93f8b46-1217-0410-a6f0-8f06a7374b81
Adjust tests for new fixture.

git-svn-id: svn://rubyforge.org/var/svn/redmine/trunk@10404 e93f8b46-1217-0410-a6f0-8f06a7374b81
Adds assertions on the confirmation form.

git-svn-id: svn://rubyforge.org/var/svn/redmine/trunk@10405 e93f8b46-1217-0410-a6f0-8f06a7374b81
Removed test contexts.

git-svn-id: svn://rubyforge.org/var/svn/redmine/trunk@10406 e93f8b46-1217-0410-a6f0-8f06a7374b81
Added a test for JSON upload.

git-svn-id: svn://rubyforge.org/var/svn/redmine/trunk@10407 e93f8b46-1217-0410-a6f0-8f06a7374b81
Load site-specific mobile CSS
Add appropriate classes to the body, as with MobileFrontent

We use the same classes as MobileFrontend's production version
(Bug 38001) Remove limit of 50 saved pages from Wikipedia app
(Bug 39048) Make page language dir not affect footer direction
(Bug 38912) Fix directionality for text in map bubbles
Upgrade to leaflet 4.5.

Gives us much smoother pinch zooming!
Upgraded to jQuery 1.8.2
(Bug 33881) Autohide the search bar

Shows when you tap anywhere or scroll to top
Remove useless 'redirects' parameter being sent to API

It was a typo ('redirect') and it was yes by default anyway
Do not display title on the main page
Merge pull request #302 from yuvipanda/jquery-1.8.2-update

Upgraded to jQuery 1.8.2
Merge pull request #301 from yuvipanda/leaflet-upgrade-v4.5

Upgrade to leaflet 4.5.
Merge pull request #305 from yuvipanda/mainpage-no-title

Do not display title on the main page
Merge pull request #304 from yuvipanda/remove-useless-api-param

Remove useless 'redirects' parameter being sent to API
Merge pull request #303 from yuvipanda/auto-hide-searchbar

(Bug 33881) Autohide the search bar
Merge pull request #300 from yuvipanda/leaflet-bubble-direction

(Bug 38912) Fix directionality for text in map bubbles
Merge pull request #298 from yuvipanda/footer-direction

(Bug 39048) Make page language dir not affect footer direction
Merge pull request #297 from yuvipanda/no-saved-pages-limit

(Bug 38001) Remove limit of 50 saved pages from Wikipedia app
Merge pull request #296 from yuvipanda/mf-production-classes

Add appropriate classes to the body, as with MobileFrontent
Merge pull request #295 from yuvipanda/add-site-css

Load site-specific mobile CSS
stf in progress
Changed to show only failing commands for non successful executions
Add wmv mailcap.

Signed-off-by: Sébastien Gross <seb•ɑƬ•chezwam•ɖɵʈ•org>
Update gnus layout.

Signed-off-by: Sébastien Gross <seb•ɑƬ•chezwam•ɖɵʈ•org>
require_relative paths were incorrect.
Version up to 0.0.2
Do not scale down image
Add getopt-based command-line option processing, and --debug option.
Remove unused code.
added signal.h header to resolve build issues in linux
return defaults from get_or_create()
early check for crashID in submitter.log
Add convenience Rakefile
Augment .gitignore
Removed -SSAC suffix from page titles for nicer google results.
Add comment & refinement for plupload
Change max_file_count to max_file_uploads
defining gps r/v in vertical vectors; adding pqw to eci conversion
README: EOF
Added the compile task.
Got rid of "already initialized constant" warnings
fixed alias
Merge pull request #2 from phundament/master

Fixed alias
Interactive migration added
Merge branch 'master' of github.com:mishamx/yii-user
Set default values in migration
Repair Issue 45: Field Type Float Won't Accept 10,2 Format
convert pages to namespaces
CA-88283/CA-88859: Exclude dom0 from any squeeze activity

This means that squeezed will never attempt to balloon down dom0.

Signed-off-by: Rob Hoes <rob.hoes@citrix.com>
isdgads
Fixed bug when retreiving payment type from Factura, could be null when payment type was transaction. Added ability to mass assign housekeeping done on JPanelLimpieza.
add the meta-package
[posting] Add updates from RD.
Fixed bug of unknown transformation (missing a 3D after Euler)
Normalized type of imageMask for all registration (image of unsigned
char)
Fixed seg fault on initialize motionCorrectionAffine3D (forget a
getImageMask)
Merge branch 'dev'
Finished ICRA chapter: negative data, assumptions, future work and more.
Added contact to address bar
Gravity is still off. Adjusting events of motion.
syscall: Fix handling of Unix domain @ addresses.

R=iant
CC=gofrontend-dev
http://codereview.appspot.com/6850100
compiler: Don't use memcmp for equality if struct has trailing padding.

R=iant
CC=gofrontend-dev
http://codereview.appspot.com/6845088
Fixed problem with prematurely-closing output stream.
revise new file menu
change plots alt-key so it doesn't conflict with code folding shortcut
correct handling of dev_mode library path for R CMD build and R CMD check
initialize previewer with synctex disabled
2949: mountain lion grep problem

Extra '[K' appearing in output due to new version of grep
Use 1024x768 on first startup
use compile panel in build tools
Don't run DAWG tests during continuous integration.
Update Gemfile and readme
Enough of the schitzo caps. [admin]
Update gemspec. [admin]
Load email helpers by default.
Adjust note about using Facets.
Dynamically create Shell methods with locally block. [major]
Add ShellUtils (still needs some work).
moving function to base class where it belongs
add read content and merge and write code.
Se modifica el nombre de un campo: enaction_name --> enaction_date
correcting utf8
Merge branch 'master' of github.com:runn1ng/FilmTit
calling createDocument in GUI
dialog chunk-marking and basic chunk-grouping support
change
change
change
change
change
change
initial draft covering Chemero 2001
Implement 1.8 specific Thread#kill behavior
Boost Build cleanup - minor stylistic changes.

git-svn-id: http://svn.boost.org/svn/boost/trunk@79875 b8fc166d-592f-0410-95f2-cb63ce0dd405
Boost Build cleanup - project-rules.using() & project-rules.import() rules now restore the original 'current project' reference the same way.

git-svn-id: http://svn.boost.org/svn/boost/trunk@79876 b8fc166d-592f-0410-95f2-cb63ce0dd405
Boost Build cleanup - removed some redundant module imports in multiple project-rules module rules.

git-svn-id: http://svn.boost.org/svn/boost/trunk@79877 b8fc166d-592f-0410-95f2-cb63ce0dd405
Marked ScopeExit regression test failures.

git-svn-id: http://svn.boost.org/svn/boost/trunk@77953 b8fc166d-592f-0410-95f2-cb63ce0dd405
Removed a test used to figure out a bug on Sun (the bug was fixed by not doing any macro expansion in the definition of the pp-iteration params macro).

git-svn-id: http://svn.boost.org/svn/boost/trunk@77954 b8fc166d-592f-0410-95f2-cb63ce0dd405
missing include

git-svn-id: http://svn.boost.org/svn/boost/trunk@77810 b8fc166d-592f-0410-95f2-cb63ce0dd405
updates

git-svn-id: http://svn.boost.org/svn/boost/trunk@77811 b8fc166d-592f-0410-95f2-cb63ce0dd405
hide detail stuff

git-svn-id: http://svn.boost.org/svn/boost/trunk@77812 b8fc166d-592f-0410-95f2-cb63ce0dd405
Updated Boost Build's internal test system to not report an error as if it was not able to run the external diff tool when that tool returns 1 to indicate that the two files given to it are different.

git-svn-id: http://svn.boost.org/svn/boost/trunk@79037 b8fc166d-592f-0410-95f2-cb63ce0dd405
Minor stylistic changes in Boost Jam's strings.c module.

git-svn-id: http://svn.boost.org/svn/boost/trunk@79038 b8fc166d-592f-0410-95f2-cb63ce0dd405
Fixed a Boost Jam debug assertion bug encountered when creating string objects with embedded '\0' characters as done for example by the SPLIT_BY_CHARACTERS builtin rule implementation.

git-svn-id: http://svn.boost.org/svn/boost/trunk@79039 b8fc166d-592f-0410-95f2-cb63ce0dd405
Cleaned up and extended internal Boost Jam strings.c module unit tests.

git-svn-id: http://svn.boost.org/svn/boost/trunk@79040 b8fc166d-592f-0410-95f2-cb63ce0dd405
Code cleanup in Boost Jam's execnt.c module.

git-svn-id: http://svn.boost.org/svn/boost/trunk@79041 b8fc166d-592f-0410-95f2-cb63ce0dd405
Updated Boost Jam's execnt.c module to report correct Windows API error messages instead of incorrectly expecting them to set the global errno C library variable and printing out error messages related to this invalid/random/unrelated value.

git-svn-id: http://svn.boost.org/svn/boost/trunk@79042 b8fc166d-592f-0410-95f2-cb63ce0dd405
random table now chosen
readme updata 1.2
Termanadas funciones básicas de la calculadora. Falta los numeros reales, retroceso y demás funciones.
core: set time properly when saving kegs.
web: minor changes to example appengine config
docs: documentation overhaul.
core: rename common_settings.py to local_settings.py.
kegweb: use crispy forms.
connections: fix for event time change.
core: update with standalone sentry support (must uninstall django-sentry).
kegweb: remove bootstrap as a git submodule.

Too confusing for new users.
kegweb: add copy of twitter-bootstrap-v2.0.4

Local changes:
  - deleted docs/

Source:
  https://github.com/twitter/bootstrap/zipball/v2.0.4
kegweb: some badly-needed template improvements; still a work in progress.
add a script to setup appengine dependencies
resolve merge conflicts
simplified calls into neo4j by neoutil.py
Fix for PyPi registering
Code Row set to current row on successful guess
php5extension-1.0.tcl: disable livecheck for bundled extensions


git-svn-id: http://svn.macports.org/repository/macports/trunk/dports@93004 d073be05-634f-4543-b044-5fe20cf6d1d6
viking: add gnome-doc-utils build dependency


git-svn-id: http://svn.macports.org/repository/macports/trunk/dports@93005 d073be05-634f-4543-b044-5fe20cf6d1d6
viking: add libexif dependency


git-svn-id: http://svn.macports.org/repository/macports/trunk/dports@93006 d073be05-634f-4543-b044-5fe20cf6d1d6
mongodb: update to 2.0.5


git-svn-id: http://svn.macports.org/repository/macports/trunk/dports@93007 d073be05-634f-4543-b044-5fe20cf6d1d6
php-hidef: unified port


git-svn-id: http://svn.macports.org/repository/macports/trunk/dports@93008 d073be05-634f-4543-b044-5fe20cf6d1d6
molmol: maintainer update to fix build on Lion to respond to mouse movements, and also remove some unnecessary files and change how libpng is used; see #34408


git-svn-id: http://svn.macports.org/repository/macports/trunk/dports@93009 d073be05-634f-4543-b044-5fe20cf6d1d6
py-coverage: maintainer update to 3.5.2; add py31 and py32 subports (#34687)


git-svn-id: http://svn.macports.org/repository/macports/trunk/dports@93774 d073be05-634f-4543-b044-5fe20cf6d1d6
py-requests: maintainer update to 0.13.0; add py31 and py32 subports (#34689)


git-svn-id: http://svn.macports.org/repository/macports/trunk/dports@93775 d073be05-634f-4543-b044-5fe20cf6d1d6
fltk, fltk-devel: remove -arch flags from fltk-config script (#34672)


git-svn-id: http://svn.macports.org/repository/macports/trunk/dports@93776 d073be05-634f-4543-b044-5fe20cf6d1d6
Only apply patches if there are files to patch.


git-svn-id: http://svn.macports.org/repository/macports/trunk/dports@92516 d073be05-634f-4543-b044-5fe20cf6d1d6
mono: update to 2.10.9


git-svn-id: http://svn.macports.org/repository/macports/trunk/dports@92517 d073be05-634f-4543-b044-5fe20cf6d1d6
java/hibernate4:
New port, based on hibernate3, closes #34251


git-svn-id: http://svn.macports.org/repository/macports/trunk/dports@92518 d073be05-634f-4543-b044-5fe20cf6d1d6
java/poi:
Add livecheck


git-svn-id: http://svn.macports.org/repository/macports/trunk/dports@92522 d073be05-634f-4543-b044-5fe20cf6d1d6
p5-text-bibtex: Update Version 0.61 -> 0.62


git-svn-id: http://svn.macports.org/repository/macports/trunk/dports@92523 d073be05-634f-4543-b044-5fe20cf6d1d6
gtk-sharp: fix build error with glib 2.32; see #34272


git-svn-id: http://svn.macports.org/repository/macports/trunk/dports@92524 d073be05-634f-4543-b044-5fe20cf6d1d6