Activity

From 2014-10-26 to 2014-11-24

2014-11-24

11:54 PM Revision 3c0d233c (qgis): support numerus forms in python strings and german translation update
Jürgen Fischer
11:07 PM Revision 5dd2f51f (qgis): translation script update:
* TRANSLATORS stats also needs lupdate run
* support numerus forms in python translation strings Jürgen Fischer
09:55 PM Revision a2b74ce7 (qgis): backport adjust pluralization
Backport https://github.com/geopython/MetaSearch/commit/83b88f67abb679501a238e4ab4ee344c3cdbf55d Tom Kralidis
09:53 PM Revision af3418ac (qgis): backport adjust pluralization
backport https://github.com/geopython/MetaSearch/commit/83b88f67abb679501a238e4ab4ee344c3cdbf55d Tom Kralidis
08:13 PM Revision 2ec4c2ab (qgis): Regenerate incorrect test images and reenable atlas tests for travis
Nyall Dawson
08:13 PM Revision b106f822 (qgis): Fix calculation of atlas map extent when set to fixed scale mode
Credit to m-kuhn for discovering the fix Nyall Dawson
04:33 PM Revision 7ef50928 (qgis): INSTALL: update required flex version to 2.5.6 and links to windows ver...
Jürgen Fischer
03:37 PM Revision b4a85471 (qgis): Streamline singleton behavior in a class QgsSingleton, take two
delete provider registry after map layer registry to avoid crashes Matthias Kuhn
02:33 PM Revision e61d27e1 (qgis): Revert "Streamline singleton behavior in a class QgsSingleton"
This reverts commit e1f6edbd55122e6d2206daf4a0b55e3e9207cf80 as it breaks tests Matthias Kuhn
01:38 PM Revision e1f6edbd (qgis): Streamline singleton behavior in a class QgsSingleton
If a singleton is unused in an application, it's not going to be created just
to be deleted instantanously on app exi... Matthias Kuhn
12:18 PM Revision 9a8dcec9 (qgis): Fix incorrect warning dialog appearing when creating new ramp
Previously a "not available" warning dialog would appear when
attempting to create a new color ramp using the categor... Nyall Dawson
12:18 PM Revision d6521143 (qgis): Fix grammar
Nyall Dawson
12:14 PM Revision f250a12a (qgis): Fix potential crash in random color ramp
Badly choosen values (eg max < min) could cause a crash. Now, values
are sanitised prior to generating the ramp colors. Nyall Dawson
10:45 AM Revision fa1e8032 (qgis): [symbology] Add method for retrieving symbol layers as list
Nyall Dawson
10:45 AM Revision a0c1380e (qgis): Fix incorrect warning dialog appearing when creating new ramp
Previously a "not available" warning dialog would appear when
attempting to create a new color ramp using the categor... Nyall Dawson
10:45 AM Revision 9213a845 (qgis): [FEATURE] Support drag and drop of python scripts onto QGIS window
Nyall Dawson
10:45 AM Revision fe3e385a (qgis): Fix grammar
Nyall Dawson
10:45 AM Revision 6365ca3d (qgis): Fix potential crash in random color ramp
Badly choosen values (eg max < min) could cause a crash. Now, values
are sanitised prior to generating the ramp colors. Nyall Dawson
10:45 AM Revision 89825e23 (qgis): Add toolbar icon and shortcut for python console
Nyall Dawson
09:44 AM Revision d002e5d7 (qgis): Remove help button from symbollevelv2 dialog
There is no help text available for this dialog and the button does nothing at
all at the moment Matthias Kuhn
09:34 AM Revision 4e360593 (qgis): Fix crash on exit: Close all cached sqlite connections
Matthias Kuhn
08:38 AM Revision b6e8f01f (qgis): remove repaint when layer is not modified
Gillian Milani
08:38 AM Revision 9231f548 (qgis): clean code style with prepare-commit.sh
Gillian Milani
08:38 AM Revision 6f4809d4 (qgis): add a save button for subform (1-n relations)
Gillian Milani

2014-11-23

05:53 PM Revision 6b9f85a1 (qgis): Merge pull request #1697 from mbernasocchi/patch-1
deactivate qgis_wcsprovidertest on travis
It depends on an unreliable external service and therefore produces false ... Matthias Kuhn
02:04 PM Revision 484e1625 (qgis): [processing] fixed help in models
Victor Olaya
11:48 AM Revision 8039895d (qgis): Add support for weighting points by expression to heatmap renderer
Nyall Dawson
10:23 AM Revision 03faafa4 (qgis): Make the "Merge shapefiles" tool correctly handle features without geom...
J. Dugge

2014-11-22

10:10 PM Revision 269b6264 (qgis): getProjectSettings response: return 'maptip' instead of tooltip templat...
displayField layer attribute Jürgen Fischer
10:08 PM Revision 50d2a749 (qgis): getProjectSettings response: return 'maptip' instead of tooltip templat...
displayField layer attribute Jürgen Fischer
08:42 PM Revision d36597a6 (qgis): better fix for b99ab0a
Jürgen Fischer
06:54 PM Revision f10a8cce (qgis): update INSTALL (fixes #11715)
- remove outdate "practical case" section
- include pointer to GDAL formats for build instructions for proprietary
... Jürgen Fischer
02:42 PM Revision b99ab0a9 (qgis): restore setting of scene to map canvas items (followup 78c51954)
Jürgen Fischer
01:16 PM Revision fe7a0e57 (qgis): travis: disable qgis_wcsprovidertest due to unreliable server
Jürgen Fischer
12:44 PM Revision 222978ee (qgis): Fix #9604 - New icon for delete selected features
Nathan Woodrow
11:53 AM Revision cefc4df6 (qgis): [processing] redirect output from command line tools to Info tab (fix #...
Alexander Bruy
11:52 AM Revision 66377967 (qgis): [processing] fix Field calculator algorthm (fix #11488)
Alexander Bruy
11:36 AM Revision f273edb9 (qgis): fix windows build
Jürgen Fischer
10:02 AM Revision 802a4acd (qgis): Add an invert checkbox for heatmap renderer
Nyall Dawson
03:03 AM Revision 72774765 (qgis): [FEATURE] Live heatmap renderer
Allows for live, dynamic heatmaps for point layers. Options include
specifying heatmap radius in pixels, mm or map un... Nyall Dawson

2014-11-21

10:02 PM Revision c924401f (qgis): fix typo in tx config
Signed-off-by: Werner Macho <[email protected]> Werner Macho
09:39 PM Revision 0d2aac29 (qgis): adding new translations files
Signed-off-by: Werner Macho <[email protected]> Werner Macho
09:38 PM Revision fc850b77 (qgis): update if txconfig for new translations
Werner Macho
07:05 PM Revision 8299b206 (qgis): Followup to 2261999; fix import of QgsCodeEditorSQL for DB Manager
Larry Shaffer
04:51 PM Revision e7a89945 (qgis): deactivate qgis_wcsprovidertest
Disabling on behalf of @m-kuhn since the wcs server used in qgis_wcsprovidertest is not really reliable. Often the te... Marco Bernasocchi
04:45 PM Revision 9f8a7423 (qgis): [processing] patch for issues with delimited text layers
Still won't work when using delimited text layers in parameters of type MultipleInput Victor Olaya
03:07 PM Revision 1f47ffeb (qgis): dualview: autoselect first item
Matthias Kuhn
03:02 PM Revision 6e334d64 (qgis): [processing] Added missing field type to vector tools
Victor Olaya
03:02 PM Revision ac0eddae (qgis): [processing] Add snippet collection to script editor
The list of snippets is still very short, but the snippet management logic is added in this commit Victor Olaya
03:02 PM Revision 51de0cae (qgis): [processing] better output logging for gdal/org calls
Fixes #11501 Victor Olaya
03:02 PM Revision f3fdd9c2 (qgis): [processing] clean unused line
Victor Olaya
01:02 PM Revision 536efdda (qgis): Remove code no longer needed in QgsConfigCache
Marco Hugentobler
11:45 AM Revision 6c246384 (qgis): Return non-zero status from cmake script when build or test fails
Matthias Kuhn
11:45 AM Revision cae6baea (qgis): Formatting of tests
Matthias Kuhn
11:45 AM Revision 95f64838 (qgis): Fix some race condition segfaults of tests on exit
Matthias Kuhn
11:45 AM Revision 78c51954 (qgis): Add Qt5 support
Matthias Kuhn
10:25 AM Revision 97e79690 (qgis): [Processing] A new tool to import data in PostGIS based on ogr2ogr and ...
Giovanni Manghi
10:23 AM Revision 7de1dff3 (qgis): Merge pull request #1689 from rldhont/server_cache_project_config
[QGIS-Server] Enhance config cache Marco Hugentobler
09:59 AM Revision 6c836f0e (qgis): fix nightly build (followup a57066a48d)
Jürgen Fischer
09:23 AM Revision 336fe99a (qgis): [processing] remember last output folder in batch interface
Victor Olaya
09:10 AM Revision df9372a8 (qgis): [processing] better behaviour for fields calculator custom dialog
Victor Olaya
09:09 AM Revision 05dc06d4 (qgis): [processing] fixed fields calculator algorithm
It's not a complete fix, as it just comments out a line that was causing a 'underlying C/C++ object was deleted' erro... Victor Olaya
09:07 AM Revision 09c6b2b3 (qgis): [processing]removed unused code
Victor Olaya
07:22 AM Revision 810cb3fb (qgis): [processing] fixed handling of tables in models
Fixes #11694 Victor Olaya
07:21 AM Revision 530b15a0 (qgis): [processing] provide non-random default ordering of parameters in models
Fixes #11702 Victor Olaya
02:46 AM Revision 9837f430 (qgis): Followup to d897aa5; fix crash on Mac
Larry Shaffer
01:17 AM Revision 9ceb5cea (qgis): sip sync
Jürgen Fischer

2014-11-20

11:03 PM Revision c94b9f36 (qgis): Merge pull request #1681 from nyalldawson/sort_api
Sort members in api docs Nyall Dawson
09:32 PM Revision afd32fdc (qgis): browser restore favourites fix
Radim Blazek
08:40 PM Revision 907fb73d (qgis): browser remove favourite fix
Radim Blazek
08:01 PM Revision 47578074 (qgis): browser favourites fix
Radim Blazek
07:46 PM Revision 869ad447 (qgis): Merge pull request #1583 from slarosa/qdockwidget_browser
[browser] small ui reworking for consistency Radim Blazek
03:02 PM Revision a57066a4 (qgis): * fix cppcheck warnings
* some sip updates
* [API] fix spelling QgsMultiRenderChecker::drawBackround
* [API] fix spelling QgsSymbolLayerV2Uti... Jürgen Fischer
02:12 PM Revision d897aa5b (qgis): browser refresh and restore fixes and improvements
Radim Blazek
11:37 AM Revision d6635994 (qgis): Update cache
René-Luc ReLuc
11:28 AM Revision 44a334b0 (qgis): Add hasDefaultValues method to QgsDataDefined, add some tests
Nyall Dawson

2014-11-19

12:47 AM Revision 6cc073d9 (qgis): widgetParametersPanel.ui: fix header
[ci skip] Jürgen Fischer
03:38 PM Revision f4925120 (qgis): update translation
Otto Dassau
12:24 PM Revision 09ab5696 (qgis): Boost coverage of raster fill unit tests
Also add missing sip bindings for GUI widget Nyall Dawson
11:02 AM Revision 3c2d45ff (qgis): [processing] repair non-working random extract algorithms (fix #11571)
Alexander Bruy
11:02 AM Revision 1c6aa9b3 (qgis): [processing] add hypsometric curves calculation algorithm
Alexander Bruy
11:02 AM Revision 4c24666c (qgis): [processing] add open script action to script editor
Alexander Bruy
11:02 AM Revision 5e6f4c2f (qgis): [processing] correctly handle editable and non-editable fixed tables (f...
Alexander Bruy
10:58 AM Revision 474e6675 (qgis): more cleaning of redundant and same shortcuts
Werner Macho
10:42 AM Revision d0898087 (qgis): fix warnings
Jürgen Fischer
10:13 AM Revision ebfa6000 (qgis): Fix incorrect cast to double in shapeburst fill header
Nyall Dawson
10:11 AM Revision b8ff575e (qgis): Merge pull request #1695 from nyalldawson/fix_api
Fix incorrect cast to double in shapeburst fill header Jürgen Fischer
09:40 AM Revision c8ad99bf (qgis): Fix incorrect cast to double in shapeburst fill header
Nyall Dawson
09:28 AM Revision 256b2652 (qgis): Fix some warnings
Matthias Kuhn
08:07 AM Revision 2d69f986 (qgis): Merge pull request #1691 from m-kuhn/slv
Enable PyQgsSymbolLayerV2 test. Followup 5957b0a Marco Hugentobler
08:03 AM Revision edd8d9bc (qgis): Merge pull request #1692 from neteler/patch-4
Delete r.average.txt Paolo Cavallini
08:03 AM Revision d66c927f (qgis): Merge pull request #1693 from neteler/patch-5
Update and rename r.bilinear.txt to r.resamp.interp.txt Paolo Cavallini
05:26 AM Revision 52159851 (qgis): [FEATURE] Raster image symbol fill type
Allows for filling polygons with a tiled raster image. Options
include (data defined) file name, opacity, image size ... Nyall Dawson

2014-11-18

10:05 PM Revision 9c2a1131 (qgis): Update and rename r.bilinear.txt to r.resamp.interp.txt
r.bilinear: merged into r.resamp.interp, see http://trac.osgeo.org/grass/wiki/Grass7/NewFeatures#Renamedmodules Markus Neteler
10:00 PM Revision 36869f07 (qgis): Delete r.average.txt
Superseded by r.statistics, see http://trac.osgeo.org/grass/wiki/Grass7/NewFeatures#Removedmodules Markus Neteler
05:43 PM Revision 0a5c3cc8 (qgis): Enable PyQgsSymbolLayerV2 test. Followup 5957b0a
Matthias Kuhn
04:41 PM Revision 66ffb2a0 (qgis): Run build within ctest script and add some information for the dashboard
Matthias Kuhn
04:11 PM Revision 5957b0a5 (qgis): Hopefully fix sld test
Marco Hugentobler
04:11 PM Revision d7f7b06e (qgis): Merge pull request #1614 from radosuav/small_fixes
Small fixes for Processing Victor Olaya
03:07 PM Revision da91a9ee (qgis): Revert "Fix translations in Processing.py"
This reverts commit 81089a1fa258feb86a52db9bba1fd0708b5f70a7. Radoslaw Guzinski
01:39 PM Revision eef435e9 (qgis): [GRASS] data item fix
Radim Blazek
11:08 AM Revision 7d7ac62f (qgis): Add tolerance to shapeburst test
Fixes it on ubuntu trusty Matthias Kuhn
10:18 AM Revision 8f50d945 (qgis): remove redundant shortcut for Open and Open recent
Signed-off-by: Werner Macho <[email protected]> Werner Macho
10:17 AM Revision 49035a03 (qgis): [composer] Fix overview tooltips (fix #11655)
Nyall Dawson
10:12 AM Revision 00c5a75e (qgis): [composer] Fix overview tooltips (fix #11655)
Nyall Dawson
09:48 AM Revision 20deafdb (qgis): Merge pull request #1605 from ghtmtt/patch-1
Update geometricfigures.rst Alexander Bruy
09:22 AM Revision 1f41364c (qgis): Update link to qt homepage
Matthias Kuhn
01:47 AM Revision f81c0593 (qgis): fix PyQgsAppStartup test on windows
Jürgen Fischer
01:46 AM Revision dfbe8f3b (qgis): fix german translations (fixes #11617)
Jürgen Fischer
01:44 AM Revision 368bfa15 (qgis): Add casts to double to fix compilation on ARM
Sandro Mani
01:42 AM Revision 72c92e38 (qgis): Initialize some uninitialized variables
Matthias Kuhn
01:41 AM Revision f8a21bf9 (qgis): fix PyQgsVectorLayer test
Jürgen Fischer
01:41 AM Revision 881e25ba (qgis): vector file writer: scan shape file geometries instead of just assuming...
Jürgen Fischer

2014-11-17

07:03 PM Revision 05830c2c (qgis): [processing] handle ints and floats in range parameter panel
Alexander Bruy
07:03 PM Revision 42f16efe (qgis): [processing] refactor batch processing dialog and update related parame...
Alexander Bruy
07:03 PM Revision bec113b1 (qgis): [processing] refactor algortim dialog
Now we have base class AlgorithmDialogBase for all algortims. Dialogs
for algorithms and batch processes should be cr... Alexander Bruy
07:03 PM Revision c4e5ff75 (qgis): [processing] update layer selector widget
Alexander Bruy
07:03 PM Revision 20682a7c (qgis): [processing] update fixed table widget and dialog
Alexander Bruy
07:03 PM Revision 2a8fabfe (qgis): [processing] fix typo
Alexander Bruy
07:03 PM Revision 95650c43 (qgis): [processing] rename number selector to keep consistency
Alexander Bruy
07:03 PM Revision 06e6e718 (qgis): [processing] update range input widget
Alexander Bruy
07:03 PM Revision c9a90d9a (qgis): [processing] don't override default selection mode in ui file
Alexander Bruy
07:03 PM Revision 2851c5a2 (qgis): [processing] update MultipleFileInputDialog
Alexander Bruy
07:03 PM Revision 6fb32687 (qgis): [processing] remove MultipleFileInputPanel as it duplicates MultipleInp...
homogenize UI in FileSelectionPanel and RenderinStylePanel, remove inused imports Alexander Bruy
07:03 PM Revision c3d230c0 (qgis): [processing] update extent selection widget
Alexander Bruy
07:03 PM Revision 28c03a1c (qgis): [processing] remove similar widgets (use generic one instead)
Alexander Bruy
07:03 PM Revision 24a3e227 (qgis): [processing] update projection selector widget
Alexander Bruy
07:03 PM Revision 6ff48770 (qgis): [processing] replace two similar dialogs with generic one
Alexander Bruy
07:03 PM Revision eee616c5 (qgis): [processing] remove compiled ui files
Alexander Bruy
11:30 AM Revision 0ca7773b (qgis): add shortcuts to some Processing actions
Alexander Bruy
10:33 AM Revision 06ea9801 (qgis): Fix CPack path to README.md
Matthias Kuhn
10:24 AM Revision 7fc1b873 (qgis): homogenize icons related to managing project and global scale lists
Alexander Bruy
10:21 AM Revision e54a7866 (qgis): More README to README.md
And add travis build status Matthias Kuhn
09:21 AM Revision 77328b20 (qgis): Merge pull request #1686 from alexbruy/dbmanager-sqleditor
switch DB Manager's SQL editor to QgsCodeEditorSQL Alexander Bruy
02:30 AM Revision 150aa53a (qgis): add missing ts files (fixes #11662)
Jürgen Fischer

2014-11-16

10:49 PM Revision 0b9e1f67 (qgis): [TRANSUP] some fixes and improvements for transifex including renamed a...
Signed-off-by: Werner Macho <[email protected]> Werner Macho

2014-11-15

11:16 AM Revision 4a4dc6bb (qgis): [QGIS-Server] Enhance config cache
Add xmlDocument and server config in cache
xmlDocument and server config will be opened once for every requested W*S... René-Luc ReLuc
05:55 AM Revision 34e6a713 (qgis): Add note about QgsMapCanvas::refresh() behavior
Martin Dobias
05:54 AM Revision a6650e4b (qgis): Add note about QgsMapCanvas::refresh() behavior
Martin Dobias
05:39 AM Revision d91694a8 (qgis): [FIXED] #11572 Filter Legend By Map Content doesn't maintain point disp...
The fix from https://github.com/qgis/QGIS/pull/1673 has to be enhance to have
something more generic.
This fix add ... René-Luc ReLuc
05:19 AM Revision fda637b3 (qgis): Merge remote-tracking branch 'rldhont/filter_legend_displacement_point2'
Conflicts:
src/core/qgsmaphittest.cpp Martin Dobias

2014-11-14

07:16 PM Revision b28cc141 (qgis): [travis] Do some steps in install step
Matthias Kuhn
07:16 PM Revision 4ff4394b (qgis): [travis] Disable PyQgsPalLabelingServer tests for now
Matthias Kuhn
07:15 PM Revision e4d3eaac (qgis): [travis] Disable SymbolLayerV2 test
There is a pull request to properly fix the issue. When this PR is dealt with
this test will be re-enabled.
https://... Matthias Kuhn
07:14 PM Revision 581815f8 (qgis): Fix atlas tests
* Recreates composition for every test and therefore removes internal
dependency
* Reorders method calls to make ... Matthias Kuhn
06:30 PM Revision f0efa6d8 (qgis): Disable geometry simplify check
This test mixes different effects and is very unprecise in what it tests and
what it expects as result. Matthias Kuhn
06:30 PM Revision fdde5905 (qgis): Exclude PyQgsPalLabelingCanvas test because of Segfault on test server
It seems that there is still a thread running when QgsApplication exits.
Error message:
QThreadStorage: Thread 0x16e... Matthias Kuhn
06:30 PM Revision 31c32505 (qgis): Switch to RGB32 images for composition checker
Nyall Dawson
06:30 PM Revision fd959301 (qgis): Switch QgsCompositionChecker to MultiRenderChecker
Matthias Kuhn
06:30 PM Revision 4b843e4d (qgis): Add QgsDartMeasurement
Matthias Kuhn
06:30 PM Revision 2cfcca10 (qgis): Use a non-transparent background for composition checker
Fix composerhtml tests on precise Nyall Dawson
06:30 PM Revision eaf0d345 (qgis): Cleanup atlas composition tests
* Don't try to cache on 0-sized image
* Use qDebug instead of qWarning Matthias Kuhn
06:30 PM Revision 81d38710 (qgis): Fix shapeburst test
Move to multirenderchecker Matthias Kuhn
06:30 PM Revision 416f471e (qgis): [unit tests] Make qgis_rendererstest pass
Replace control image Matthias Kuhn
06:30 PM Revision ab5e0e2b (qgis): Fix PalLabelingComposer test
Switch to QgsMultiRenderChecker and add control images for Ubuntu precise where
required. Matthias Kuhn
06:30 PM Revision 58932890 (qgis): Fix inverted polygon renderer test
Matthias Kuhn
06:30 PM Revision 9d9f7c18 (qgis): [unit tests] Fix blend modes test
* Switched to QgsMultiRenderChecker and added control images for precise
* Add a minimal color tolerance for slight ... Matthias Kuhn
06:30 PM Revision 9ae9de3e (qgis): Compositionchecker: Default color tolerance of 1
Matthias Kuhn
06:30 PM Revision b28dcb9c (qgis): [unit tests] Add multirenderchecker
The multirenderchecker allows to have several images, each with its own set of
anomalies distributed in several subdi... Matthias Kuhn
06:30 PM Revision 35286613 (qgis): Add .travis.yml for automated testing
Matthias Kuhn
06:28 PM Revision 5457d729 (qgis): Initialize some uninitialized variables
Matthias Kuhn
05:16 PM Revision ad881089 (qgis): case insensitive autocompletion
Alexander Bruy
11:52 AM Revision e0ab4b2c (qgis): avoid use of QIcon in data items in threads
Radim Blazek
09:57 AM Revision aa4338a0 (qgis): pull_ts.sh: verify lrelease is available
Jürgen Fischer
08:48 AM Revision 770db719 (qgis): Merge pull request #1687 from gioman/master
fixes r.watershed parameter description for GRASS 6.4 Paolo Cavallini

2014-11-13

11:13 PM Revision d4f64d9b (qgis): indentation update and typo fixes
Jürgen Fischer
09:30 PM Revision 3e3f1fb1 (qgis): fixes r.watershed parameter description for GRASS 6.4
Giovanni Manghi
08:46 PM Revision 701f4644 (qgis): prepare-commit.sh: fix script directory detection
Jürgen Fischer
08:44 PM Revision 40c5ae44 (qgis): [FIXED] #11572 Filter Legend By Map Content doesn't maintain point disp...
The fix from https://github.com/qgis/QGIS/pull/1673 has to be enhance to have
something more generic.
This fix add ... René-Luc ReLuc
04:08 PM Revision 22619996 (qgis): switch DB Manager's SQL editor to QgsCodeEditorSQL
Alexander Bruy
11:27 AM Revision cbf1d33b (qgis): re-enabled init expand to last expanded in browser
Radim Blazek
10:33 AM Revision bafd3e32 (qgis): Merge pull request #1684 from manisandro/armbuild
Add casts to double to fix compilation on ARM Nyall Dawson
10:00 AM Revision 9cb157a7 (qgis): prepare-commit.sh: remove executable bit from source files and exit suc...
Jürgen Fischer
09:35 AM Revision 4254d4e6 (qgis): Add casts to double to fix compilation on ARM
Sandro Mani

2014-11-12

12:38 AM Revision 9a2327cd (qgis): update debian dependencies in INSTALL (scripts/scandeps.pl run)
Jürgen Fischer
11:46 PM Revision 57644354 (qgis): fix source permissions
Consider using 'git config core.filemode false' on Windows
find . \( -name "*.cpp" -o -name "*.h" \) -perm /111 -exe... Jürgen Fischer
11:46 PM Revision 5ccb1e77 (qgis): i18n: script updates
Jürgen Fischer
11:10 PM Revision 571d47a8 (qgis): postgres provider: fix layer detection
Jürgen Fischer
10:18 PM Revision 40bb180d (qgis): expand browser items in threads
Radim Blazek
10:18 PM Revision 078a3ab7 (qgis): loading icon from qt-everywhere-opensource-src-4.6.3/demos/browser/data...
Radim Blazek
10:15 PM Revision 47121fb6 (qgis): fix PyQgsAppStartup test on windows
Jürgen Fischer
08:45 PM Revision c18cb33a (qgis): fix PyQgsLogger test (fixes b5f6d2ce, but also the failure on windows)
Jürgen Fischer
05:43 PM Revision a036627d (qgis): fix tim dot linfiniti at com
Jürgen Fischer
05:43 PM Revision 278ffa15 (qgis): i18n: move to transifex
* deprecate update_ts_files.sh
* use pull_ts.sh to pull updates from transifex
* use push_ts.sh to pull qgis_en.ts fr... Jürgen Fischer
03:43 PM Revision f1fb5fb1 (qgis): Fix qgis_legendrenderertest
Changed control image that fails on every platform Matthias Kuhn
02:55 PM Revision e4cd5520 (qgis): parse embedded project only once (speedups loading of multiple embedded...
Jürgen Fischer
02:55 PM Revision b5f6d2ce (qgis): refactor QgsLogger and add duration and thread id
Jürgen Fischer

2014-11-11

11:02 PM Revision 3d2cc147 (qgis): fix german translations (fixes #11617)
Jürgen Fischer
10:29 AM Revision 11c2bae7 (qgis): vector file writer: scan shape file geometries instead of just assuming...
Jürgen Fischer
09:44 AM Revision 631341b5 (qgis): Sort members in api docs
Nyall Dawson
08:41 AM Revision ef5955a7 (qgis): Fix maprenderertest
By introducing some color tolerance Matthias Kuhn

2014-11-10

07:53 PM Revision 73231d9b (qgis): use browser objectName in settings key to distinguish browser2
Radim Blazek
07:39 PM Revision 1018c91f (qgis): use connection name in wms,wfs,wcs data item path instead of uri, group...
Radim Blazek
09:39 AM Revision cb9bd88c (qgis): [GRASS] autorefresh vector layers
Radim Blazek

2014-11-09

04:40 AM Revision 61b02910 (qgis): fix Empty console Output on R under processing. refs #7643
Takayuki Mizutani

2014-11-08

05:17 PM Revision 5d1dde03 (qgis): fix regex for getting layer name
Alexander Bruy
03:24 PM Revision 95f880a5 (qgis): Fix occasional crash on exit because of statis network access manager
see https://bugreports.qt-project.org/browse/QTBUG-25789 Matthias Kuhn
10:30 AM Revision f3eeed90 (qgis): fix PyQgsVectorLayer test
Jürgen Fischer
09:50 AM Revision 9b01b2ea (qgis): Fix dual view test
* References commit 51e01d6
* And issue #11529 Matthias Kuhn
09:34 AM Revision 1871a4c0 (qgis): Fix expression test
make sure the style file with the color ramp can be copied to the settings path Matthias Kuhn

2014-11-07

08:54 PM Revision 402b6d0a (qgis): debian packaging update (fixes for tests)
Jürgen Fischer
06:52 PM Revision 959c5660 (qgis): Revert "Doxygen: do not add "Definition at line N of XYZ.cpp" to each m...
This reverts commit 7ee05afd366cebf3c8f44354067c34223346f835. Martin Dobias
06:51 PM Revision 094defc2 (qgis): Revert "Doxygen: do not add "Definition at line N of XYZ.cpp" to each m...
This reverts commit 7ee05afd366cebf3c8f44354067c34223346f835. Martin Dobias
06:05 PM Revision a54c31d5 (qgis): Fix a crash in layer node after removal of layer from registry.
A crash may occur when using custom layer tree in composer legend and layer from that tree is removed from registry.
... Martin Dobias
05:54 PM Revision 7e4709bd (qgis): Merge pull request #1678 from ghtmtt/patch-2
Update gridcalculator.rst Paolo Cavallini
03:19 PM Revision b4824abb (qgis): Update gridcalculator.rst
change **x** and **y** with **a** and **b** matteo ghetta
03:11 PM Revision 2417a82b (qgis): [processing] add method in OGR algorithms for getting layer name from s...
Alexander Bruy
11:13 AM Revision c78a3783 (qgis): browser last expanded better
Radim Blazek
09:53 AM Revision 2597100d (qgis): [FIXED] #11572 ilter Legend By Map Content doesn't maintain point displ...
For point vector layer render with 'displacement point', when 'Filter
Legend By Map Content' is activated, the legen... René-Luc ReLuc
09:06 AM Revision 47a16184 (qgis): [FIXED] #11572 ilter Legend By Map Content doesn't maintain point displ...
For point vector layer render with 'displacement point', when 'Filter
Legend By Map Content' is activated, the legen... René-Luc ReLuc
09:01 AM Revision fd1ced7f (qgis): [composer] Don't save hide bounding box setting between sessions
In practice the workflow is better if this setting is only
temporarily applied to a composer. Nyall Dawson

2014-11-06

12:31 AM Revision 8b29097f (qgis): [FEATURE][composer] Vertical descending direction for annotations
This change adds a new descending vertical direction mode for
map grid annotations. Previously only ascending text wa... Nyall Dawson
11:53 PM Revision b2423241 (qgis): [composer] Use intersection rather than clip for transformed grids
Previous behaviour was to clip transformed grid lines to the visible
map extent. This caused problems if a map item h... Nyall Dawson
07:09 PM Revision abf00872 (qgis): remember browser last expanded item
Radim Blazek
06:19 PM Revision 443264f2 (qgis): GRASS: show layers non expandable
Radim Blazek
05:59 PM Revision 7c52e7dd (qgis): GRASS: points removed from topo in GRASS 7
Radim Blazek
04:46 PM Revision d8d9edb0 (qgis): GRASS: fixed crash when opening vector without topo
Radim Blazek
04:46 PM Revision d74b52e5 (qgis): add GRASS vector layers from browser with map + layer name
Radim Blazek
02:15 PM Revision 2202b42b (qgis): [TRANSUP] preparing transition to transifex DEFAULT
Compared translations manually with source and transifex and uploaded every translation with more strings in source t... Werner Macho
11:56 AM Revision 08e39fc9 (qgis): GRASS 7.1 fixes
Radim Blazek
08:37 AM Revision b1b0db6b (qgis): Fix a crash in layer node after removal of layer from registry.
A crash may occur when using custom layer tree in composer legend and layer from that tree is removed from registry.
... Martin Dobias
07:29 AM Revision 878230a1 (qgis): Add methods to QgsGeometry to convert to/from QPointF and QPolygonF
Nyall Dawson
07:29 AM Revision b5c9df0e (qgis): Add methods for converting QgsPoint to and from QPointF and QPoint
Also add some more basic unit tests for QgsPoint Nyall Dawson

2014-11-05

08:48 PM Revision a987525a (qgis): Fix encoding of QgsPoint source files
Allows editing these files in QtCreator. Nyall Dawson
06:03 PM Revision 4e9e9f48 (qgis): browser: register editor widgets (fixes #11529)
Jürgen Fischer
06:02 PM Revision 863089ac (qgis): server: stop processing after 'no REQUEST' exception (fixes #11543)
Jürgen Fischer
06:02 PM Revision 48dffb78 (qgis): fix typo
Jürgen Fischer
06:01 PM Revision 699e68c1 (qgis): fix feature action from identify menu (fixes #11533)
Jürgen Fischer
06:01 PM Revision 2bf465a6 (qgis): add QScintilla2 include directory to python bindings and oracle provider
(fixes #11528) Jürgen Fischer
01:51 PM Revision 64b634fb (qgis): Fix feature request with Fid Filter working on the edit buffer
The following snippet did not take attribut changes that have not been commited
into account.
layer.getFeatures(... Matthias Kuhn
01:51 PM Revision 068bb17e (qgis): Fix feature request with Fid Filter working on the edit buffer
The following snippet did not take attribut changes that have not been commited
into account.
layer.getFeatures(... Matthias Kuhn
12:35 PM Revision 05a96368 (qgis): merge OWSLib 0.8.10 CSW fix
https://github.com/geopython/OWSLib/commit/4e5e24840372028be2858c5c6897818bf6059282 Tom Kralidis
12:35 PM Revision 98c9ec71 (qgis): merge OWSLib 0.8.10 CSW fix
https://github.com/geopython/OWSLib/commit/4e5e24840372028be2858c5c6897818bf6059282 Tom Kralidis
09:16 AM Revision fcc8a003 (qgis): Merge pull request #1670 from gioman/saga_fixes1
fix several SAGA 2.1.2 modules, take1 Victor Olaya
01:51 AM Revision 47e3dc9d (qgis): fix build error
Jürgen Fischer

2014-11-04

11:04 PM Revision 38e13e0e (qgis): Fix app startup test
Matthias Kuhn
04:24 PM Revision 156a0fa3 (qgis): Merge pull request #1671 from elpaso/requesthandler-refactoring2
Requesthandler refactoring2 Marco Hugentobler
03:44 PM Revision a4fb2a10 (qgis): Restored streaming capabilities, added mHeadersSent flag and accessor
Funded by ItOpen - http://www.itopen.it Alessandro Pasotti
03:34 PM Revision 840fcf31 (qgis): ASTYLE formatting
Funded by ItOpen - http://www.itopen.it Alessandro Pasotti
03:34 PM Revision 4a255754 (qgis): Removed python plugins define
Funded by ItOpen - http://www.itopen.it Alessandro Pasotti
03:34 PM Revision 670719ca (qgis): Http request/response handler refactoring.
HTTP Request handler now manages HTTP request and response.
* added methods to manage HTTP response headers
* added ... Alessandro Pasotti
01:41 PM Revision fbc47d1d (qgis): [TRANSUP] missing files from es and hi
Signed-off-by: Werner Macho <[email protected]> Werner Macho
12:30 PM Revision 1d3f8a73 (qgis): server: stop processing after 'no REQUEST' exception (fixes #11543)
Jürgen Fischer
11:48 AM Revision eda723cd (qgis): fix typo
Jürgen Fischer
11:01 AM Revision a28aea61 (qgis): [TRANSUP] translation update
Signed-off-by: Werner Macho <[email protected]> Werner Macho
11:01 AM Revision 5ced592a (qgis): Adding back shortcut and avoid double assign
Werner Macho
09:18 AM Revision 1c2bdf1e (qgis): Switch tests to automoc
Required for Qt5 compatibility
Raises minimum CMake version to 2.8.6 Matthias Kuhn
08:18 AM Revision f46e6836 (qgis): remove redundant shortcut for Open and Open recent
Signed-off-by: Werner Macho <[email protected]> Werner Macho
03:17 AM Revision ac9220d3 (qgis): [FEATURE][composer] Finer control of frame and annotation display
Previously, for rotated maps or reprojected grids, the composer would
draw all coordinates for every map side. This r... Nyall Dawson

2014-11-03

12:21 AM Revision 991f94d3 (qgis): oracle provider:
* if a no spatial index is found try sdo_filter (fixes #11358)
* allow specifing connection parameters (eg. OCI_ATTR_... Jürgen Fischer
12:21 AM Revision d546de1a (qgis): QgsDataSourceURI: add parameters to uri
Jürgen Fischer
12:20 AM Revision 9aa678b9 (qgis): fix feature action from identify menu (fixes #11533)
Jürgen Fischer
02:59 PM Revision 23261ef6 (qgis): [TRANSUP] adding hindi from transifex
Signed-off-by: Werner Macho <[email protected]> Werner Macho

2014-11-02

10:34 PM Revision a68958fb (qgis): browser: register editor widgets (fixes #11529)
Jürgen Fischer
08:51 PM Revision 51e01d6d (qgis): add QScintilla2 include directory to python bindings and oracle provider
(fixes #11528) Jürgen Fischer
07:55 PM Revision 1baba3ae (qgis): [TRANSUP] transifex and string update
Signed-off-by: Werner Macho <[email protected]> Werner Macho
07:15 PM Revision c78f199a (qgis): german translation update
Jürgen Fischer
12:53 PM Revision 7976d948 (qgis): fix several SAGA 2.1.2 modules, take1
Giovanni Manghi

2014-11-01

01:00 PM Revision 92de1f1b (qgis): fix directory layout
Alexander Bruy
12:58 PM Revision 8be274dc (qgis): [processing] add Vector grid algorithm (addresses #5953)
Alexander Bruy
12:57 PM Revision e8d3d5a2 (qgis): [processing] add Vector split algorithm (addresses #5953)
Alexander Bruy
12:56 PM Revision cc3ccdf3 (qgis): [processing] fix Join by location alg
Alexander Bruy
12:56 PM Revision 9d1a7b3e (qgis): [processing] add Symetrical difference algorithm (addresses #5953)
Alexander Bruy
12:56 PM Revision ae4a1441 (qgis): [processing] add Regular points algorithm (addresses #5953)
Alexander Bruy

2014-10-31

10:52 PM Revision b8624204 (qgis): add link to 2.6 doxymentation to master version
Jürgen Fischer
08:38 PM Revision 48e0a591 (qgis): [FEATURE][composer] New action for toggling visibility of panels
This change adds a new action to the composer which hides or shows
all panels from the window. It's useful for maximi... Nyall Dawson
08:38 PM Revision 220bc844 (qgis): [FEATURE][composer] Full screen mode for composer
This change adds a full screen mode for the composer. Full screen
mode can be enabled via a shortcut key (F11) or via... Nyall Dawson
08:38 PM Revision 7b537f64 (qgis): [FEATURE][composer] Add view menu option to hide bounding boxes
This allows users to hide the bounding boxes for selected items
within a composition. It's a handy feature for allowi... Nyall Dawson
08:38 PM Revision a2a094bd (qgis): [FEATURE][composer] Allow control of hoz and vert margins for labels
Previously only a single margin setting would apply to both
horizontal and vertical margins. This change allows users... Nyall Dawson
08:38 PM Revision a57080cc (qgis): [FEATURE][composer] Allow negative margins for label items
If negative margins are set for a label, the label contents will
begin outside the bounds of the label. This is desir... Nyall Dawson
03:21 PM Revision c180fecb (qgis): support icons in map layer actions
Denis Rouzaud
03:17 PM Revision 5016213f (qgis): fix splash screen
Jürgen Fischer
01:00 PM Revision 0bfe8aba (qgis): Bump version to 2.7
Jürgen Fischer
01:00 PM Revision 8acae246 (qgis): Release of 2.6 (Brighton)
Jürgen Fischer
12:57 PM Revision 3a33dbdd (qgis): update changelog for 2.6 release
Jürgen Fischer
12:55 PM Revision d3662025 (qgis): Less verbose debug output in layer tree model
Martin Dobias
12:53 PM Revision 48af5431 (qgis): invert back toggle editing button in relation editor widget (fixes #11524,
followup b1a2bef1) Jürgen Fischer
12:43 PM Revision 74167c01 (qgis): [TRANSUP] transifex translation updates
Signed-off-by: Werner Macho <[email protected]> Werner Macho
12:18 PM Revision e4d17352 (qgis): fix more graduate renderer crashes (followup d99d2fd97)
Jürgen Fischer
12:07 PM Revision 60706275 (qgis): Merge pull request #1669 from gioman/tmp_fix_modeller_saga
fix modeller with saga tools Alexander Bruy
12:04 PM Revision 9024badc (qgis): fix modeller with saga tools
Giovanni Manghi
10:07 AM Revision d99d2fd9 (qgis): fix graduated renderer crash (followup 6de53e51b)
Jürgen Fischer

2014-10-30

10:31 PM Revision f0970800 (qgis): ftools: field uniqueness fix (fixes #11523)
Jürgen Fischer
09:27 PM Revision d9419498 (qgis): also restore style for file based layers (followup dfff717a0) and
use file name for GeoJSON layers (fixes #10711) Jürgen Fischer
07:02 PM Revision dfff717a (qgis): when manually loading layers defer loading default style until the laye...
added to the registry so that the readCustomSymbology signal can be processed
by the edit widget registry (fixes #11516) Jürgen Fischer
04:23 PM Revision 18db8c01 (qgis): [TRANSUP] transifex update
Signed-off-by: Werner Macho <[email protected]> Werner Macho
01:31 PM Revision 23f39a23 (qgis): attribute dialog: really keep cloned feature until destruction (feature...
also need it and crash otherwise)
This reverts revert commit f618cae5e8a9c893038101db54f5ddecb5087cdf. Jürgen Fischer
11:08 AM Revision a0b52412 (qgis): remove "added" notes for 1.x and 2.0 versions
Denis Rouzaud

2014-10-29

11:54 PM Revision ef56c53c (qgis): GDAL tools: put tif back to top for save file dialog formats (fixes #11...
Jürgen Fischer
08:47 PM Revision 75bfc1b0 (qgis): [TRANSUP] transifex update excluding locations
Signed-off-by: Werner Macho <[email protected]> Werner Macho
08:31 PM Revision 6e51ac96 (qgis): adjust update_ts_files to exclude location
Signed-off-by: Werner Macho <[email protected]> Werner Macho
02:15 PM Revision cc5d3bcb (qgis): Merge pull request #1668 from m-kuhn/action-menu-crash
Alternative approach to f9fcee9 Jürgen Fischer
01:54 PM Revision a7f889dc (qgis): Use a copy of the feature for the action menu in the attribute dialog
Matthias Kuhn
01:53 PM Revision f618cae5 (qgis): Revert "attribute dialog: keep clone feature until destruction (fixes c...
This reverts commit f9fcee980ec7fb721187080f853f86dfbf453918. Matthias Kuhn
12:34 PM Revision 4cf08c5c (qgis): Avoid unneeded geometry cloning in QgsGeometry::nodeGeometries
Affects splitGeometry and reshapeGeometry public functions Sandro Santilli
12:27 PM Revision 8d7eb7d6 (qgis): Fix missing show/hide selected layers icons
Larry Shaffer
11:40 AM Revision f9fcee98 (qgis): attribute dialog: keep clone feature until destruction (fixes crash fro...
menu) Jürgen Fischer
11:30 AM Revision f831475f (qgis): Drop execute flag from .cpp file
Sandro Santilli
08:30 AM Revision 0ee7cfd9 (qgis): german translation update
Jürgen Fischer
03:08 AM Revision 0aeea528 (qgis): Fix a crash after adding favourites to browser when the item is not yet...
The model was getting broken due to list of children being overwritten and
it was sometimes crashing in the proxy mod... Martin Dobias
01:13 AM Revision 0a875d3e (qgis): db manager: show error message in bar when adding a layer fails (fixes ...
Jürgen Fischer

2014-10-28

12:24 PM Revision 34af9788 (qgis): Merge pull request #1667 from elpaso/bugfix11510
Fix #11510 graduated renderer causes crash: added check for geometry Nathan Woodrow
12:22 PM Revision 4bc4636a (qgis): fix typos
Jürgen Fischer
11:54 AM Revision 6de53e51 (qgis): Fix #11510 graduated renderer causes crash: added check for geometry ne...
Funded by ItOpen - http://www.itopen.it Alessandro Pasotti
11:36 AM Revision d9ed1752 (qgis): Merge pull request #1666 from elpaso/bugfix11510
Fix #11510 graduated renderer causes crash Nathan Woodrow
11:05 AM Revision c6d37c18 (qgis): [TRANSUP] transifex update
Signed-off-by: Werner Macho <[email protected]> Werner Macho
11:04 AM Revision 257833fc (qgis): more typos in tooltip
Werner Macho
10:55 AM Revision efc7921c (qgis): Fix #11510 graduated renderer causes crash
Alessandro Pasotti
10:34 AM Revision 7966fb49 (qgis): fixing typo in tooltip
Werner Macho
09:24 AM Revision 04ae39ba (qgis): Merge pull request #1608 from yjacolin/newTips
new tips in tipfactory Werner Macho
09:17 AM Revision c7c107eb (qgis): Merge pull request #1657 from DelazJ/MeasureTools
Update MeasureTools context help Werner Macho
02:56 AM Revision 8617143c (qgis): Hide borders from status bar items under Windows
These aren't required and just clutter the interface. Nyall Dawson

2014-10-27

08:17 PM Revision dbed468b (qgis): Merge pull request #1664 from Cracert/master
[TRANSUP] pl: varia Werner Macho
08:14 PM Revision cad3d2b9 (qgis): Merge pull request #1658 from DelazJ/AttributeTableContextHelp
Attribute table context help Werner Macho
05:48 PM Revision 4f1e6b9c (qgis): [TRANSUP] pl: varia
Robert Szczepanek
04:20 PM Revision c21edd06 (qgis): Merge pull request #1663 from timlinux/papercuts
Add missing sip bindings for fill and border colours of rubber band. Tim Sutton
04:18 PM Revision 531474d7 (qgis): Merge remote-tracking branch 'origin/master' into papercuts
Tim Sutton
04:11 PM Revision 84c429dc (qgis): Added setFillColor and setBorderColor for rubber band to the python API
Tim Sutton
03:46 PM Revision 83d070e8 (qgis): Fix #11489 (crash with force point inside polygon in centroid fill style)
This isn't actually a very good fix. The issue in the "maptopixel" simplification
is still there, it is just less obv... Martin Dobias
03:23 PM Revision bb857610 (qgis): Merge pull request #1662 from timlinux/papercuts
Mark old rubber band ctor as deprecated in python API Tim Sutton
02:24 PM Revision 0fa4ce36 (qgis): Merge remote-tracking branch 'origin/master'
Tim Sutton
01:39 PM Revision 362d69cc (qgis): [TRANSUP] more translations and string fix
Signed-off-by: Werner Macho <[email protected]> Werner Macho
12:13 PM Revision 4abaf60a (qgis): [composer] Don't shrink scalebar height when updating
Previously any update of a scalebar would reset it's height to
the minimum height allowed. Now, if the user has set a... Nyall Dawson
11:14 AM Revision d2c9ffd8 (qgis): [composer] Fix incorrect calculation of scale for tick scale bars
QPainter::drawLine(x1,y1,x2,y2) takes int values, so coordinates
were being rounded to the nearest mm. Consequently s... Nyall Dawson
06:08 AM Revision 04ed47e5 (qgis): Cleanup identify tooltip strings
Nyall Dawson
01:16 AM Revision 3be82ff7 (qgis): [processing] Ignore geom for non geom tables for ImportIntoPostGIS
This fixes an error where trying to import non geometry tables
using the "Import Into PostGIS" algorithm results in a... Nyall Dawson

2014-10-26

12:45 AM Revision 4e3bbef9 (qgis): german translation update
Jürgen Fischer
12:04 AM Revision 817f5a9a (qgis): Fix #9359; set default WCS caching to Prefer Network
- This is noted in the tool tip, but was not set. Always Cache was the
default, which caused the cache to never be up... Larry Shaffer
11:06 PM Revision 6f1c3713 (qgis): fix for #11504 RotateFeature tool prerotation
Richard Duivenvoorde
11:03 PM Revision a00039c8 (qgis): delete ring: consider reprojection when search for clicked ring (fixes ...
Jürgen Fischer
08:24 PM Revision 19323904 (qgis): Properly mark old qgsrubberband ctor as deprecated
Tim Sutton
04:47 PM Revision cc4fc5a0 (qgis): vector file writer: avoid duplicate destruction of coordinate transform...
Jürgen Fischer
03:48 PM Revision 748e7cf4 (qgis): Remove unsupported append import/export option from db_manager (refs #1...
Jürgen Fischer
03:14 PM Revision e1ff0edf (qgis): support relative paths for gpx datasources (fixes #11131)
Jürgen Fischer
02:53 PM Revision c8a76f8c (qgis): support ogc binary operation with more than two operands (fixes #10053)
Jürgen Fischer
11:54 AM Revision 7e69dbdb (qgis): move TODO.txt to root folder to avoid attempts to parse it as
algorithm description Alexander Bruy
11:54 AM Revision 3d8e630b (qgis): [processing] fix broken TauDEM support
Alexander Bruy
08:40 AM Revision d73c9d8d (qgis): [TRANSUP]transifex and lv update
Signed-off-by: Werner Macho <[email protected]> Werner Macho
07:56 AM Revision 3d9aa200 (qgis): Merge pull request #1659 from Cracert/master
[TRANSUP] pl: log, color, composer Werner Macho

2014-10-25

12:53 AM Revision 64028645 (qgis): doxygen: add/replace some occurences of \verbatim with \code
Jürgen Fischer
 

Also available in: Atom