summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2015-09-24Bump version to 1.10.4caja-1.10.41.10Martin Wimpress2-1/+4
2015-09-24Merge pull request #459 from mate-desktop/undo-fix-1.10Martin Wimpress2-4/+11
[1.10] don't crash on Ctrl-Z after deleting file when original path isn't stored in trash
2015-09-17undostack: don't try restoring files w/o "trash::orig-path" attributemonsta1-0/+5
fixes https://github.com/mate-desktop/caja/issues/361
2015-09-17use standard defines for "trash::" attributesmonsta2-4/+6
2015-08-24list view: jump to parent with left key on collapsed rowsMonsta1-1/+9
fixes https://github.com/mate-desktop/caja/issues/452 from https://github.com/GNOME/nautilus/commit/9eee9ff6ca3e93d5d363725282d8ba393a1e6d01
2015-07-21Bump version to 1.10.3caja-1.10.3monsta2-1/+4
2015-07-20file properties dialog: bring back two missing tabsMonsta1-0/+14
Notes and Image Properties tabs went missing after https://github.com/mate-desktop/caja/commit/451eef9b275ce006b270a3569d96e531e24dd15a fixes https://github.com/mate-desktop/caja/issues/433
2015-07-20removed useless call to g_list_freeMonsta1-1/+1
- first, we must not free the list of extensions at this point - second, the call did nothing as the argument is NULL after exiting the for loop
2015-07-20small indent fixesMonsta2-4/+2
2015-07-16Bump version to 1.10.2caja-1.10.2monsta2-1/+11
2015-07-13don't manage desktop and exit with last window when either runningMonsta1-5/+26
as root or on other desktops thanks to @mtwebster (https://github.com/linuxmint/nemo/commit/acabbaf6ca8e5ffc29851d766339c602777c4427) and @tarakbumba (https://github.com/mate-desktop/caja/pull/409)
2015-07-09Use accessor functions instead of direct accessinfirit2-6/+1
2015-07-07Merge pull request #431 from NiceandGently/mastermonsta1-1/+6
icon-container: reset the double click counter after a double click
2015-07-07Revert "Help menu/F1 shortcut: show the right help page from m-u-g"Monsta1-1/+1
This reverts commit d01fbc6c9921253bb023d3e40bd763f4a931e840.
2015-07-07Revert "show main caja help page from m-u-g in all dialogs"Monsta7-16/+7
This reverts commit b4e25754bf17ef54569367718eda57ea759108c5.
2015-06-27Merge pull request #436 from obache/neatsrcMartin Wimpress1-2/+2
Use g_malloc instead of malloc to be safe
2015-06-27Use g_malloc instead of malloc to be safeOBATA Akio1-2/+2
2015-06-25Merge pull request #434 from mate-desktop/leave-my-scrollbar-aloneMartin Wimpress1-4/+6
compact view: don't auto-scroll to the right on long filenames
2015-06-24compact view: don't auto-scroll to the right on long filenamesMonsta1-4/+6
however, now it will auto-scroll to the left if you manually scroll to the right and then click on any filename. I presume this behavior is more desired than the previous one. if it's not so, let me know (in the comments). adapted from https://github.com/linuxmint/nemo/commit/72c2214c82637ab622438d46c28e67289a49d472 (thanks to @glebihan) fixes https://github.com/mate-desktop/caja/issues/406
2015-06-23Sync translations with transifexmate-i18n1-19/+20
2015-06-23Sync translations with transifexmate-i18n8-529/+616
2015-06-21icon-container: reset the double click counter after a double clickraveit651-1/+6
If we don't do this, we ignore any other double click event that happen during the next 'gtk-double-click-time' interval after the first double click. taken from: https://git.gnome.org/browse/nautilus/commit/?id=a8539a6
2015-06-20Merge pull request #430 from mate-desktop/eel-stuffMartin Wimpress1-4/+15
[GTK+3] eel: fix bad positioning of rename window in certain cases
2015-06-19[GTK+3] eel: fix bad positioning of rename window in certain casesMonsta1-4/+15
adapted from https://github.com/linuxmint/nemo/commit/d5377cfd53034b6ab5588376322126f48782ec59 (thanks to @mtwebster and nautilus developer who did the original commit) fixes https://github.com/mate-desktop/caja/issues/376
2015-06-19Merge pull request #428 from NiceandGently/mastermonsta1-1/+3
GTK3: editable-label : only clear the selection if we change to insensitive
2015-06-18Merge pull request #429 from mate-desktop/sux-bugs-and-drag-n-dropMartin Wimpress1-14/+24
places-sidebar: enable both creating bookmarks and dropping files
2015-06-18places-sidebar: enable both creating bookmarks and dropping filesMonsta1-6/+18
- drag a folder to the top or bottom of the bookmark list to add a new bookmark. a horizontal line will be shown and the mouse pointer will have a '+' at its right side. - if there are no bookmarks (and that section isn't shown), drag a folder over the network section's heading. this will add a new bookmark and make the bookmarks list visible. - drag a file or a folder over some existing bookmark to move it into the bookmarked folder. the mouse pointer will have an arrow at its right side. - if you want to copy a file or a folder there instead, perform the same operation but hold ctrl during that. the mouse pointer will have a '+' at its right side. no horizontal line will be shown, so you will be able to distinguish this operation from adding a new bookmark. :) adapted from https://github.com/linuxmint/nemo/commit/f18c4dd842be0998cbe6a519d9904bfd9993ca3e (thanks to @mtwebster) fixes https://github.com/mate-desktop/caja/issues/345 closes https://github.com/mate-desktop/caja/issues/423
2015-06-18places sidebar: fix indentation a bitMonsta1-8/+6
2015-06-18editable-label GTk3: only clear the selection if we change to insensitiveraveit651-1/+3
this fixes non selected text if renaming a file taken from: https://git.gnome.org/browse/nautilus/commit/?h=gnome-3-0&id=d2c3410
2015-06-17show main caja help page from m-u-g in all dialogsMonsta7-7/+16
this should be corrected when m-u-g will be complete (e.g. will contain help for all these dialogs)
2015-06-17Help menu/F1 shortcut: show the right help page from m-u-gMonsta1-1/+1
2015-06-11Merge branch 'master' of github.com:mate-desktop/cajacaja-1.10.1Martin Wimpress1-14/+115
2015-06-11Bump version to 1.10.1Martin Wimpress2-1/+7
2015-06-11Merge pull request #424 from flexiondotorg/masterMartin Wimpress1-14/+115
Revert "places-sidebar: allow dropping of files to bookmarks"
2015-06-11Revert "places-sidebar: allow dropping of files to bookmarks"Martin Wimpress1-14/+115
This reverts commit 910b9141ac634a86d8f53fda534e33787a160efb.
2015-06-08Merge pull request #400 from tarakbumba/fix_automunt_on_locked_screenmonsta2-4/+236
Fix automount on locked screen
2015-05-19Merge pull request #419 from NiceandGently/mastermonsta1-0/+7
GTK3: set top and bottom margin of statusbar to zero
2015-05-19GTK3: set top and bottom margin of statusbar to zeroraveit651-0/+7
This reduce the size of the statusbar that it looks like GTK2 version. The size can now controled with .frame.flat and/or .flat.button selector by the theme.
2015-05-12Merge pull request #401 from NiceandGently/masterMartin Wimpress1-2/+4
U fixes for file management preferences
2015-04-07Ui: set a default window size for file management preferencesraveit651-0/+2
This fixes wrong window size in GTK3 version. For GTK2 best size is 600x600, best size for GTK3 is 800x600. But the smallest size works perfect for both GTK+ versions.
2015-04-07Ui: expand list columns in file management preferencesraveit651-2/+2
no need to have a scrollbar for a few entries
2015-04-07Fix g_bus_unwatch_name assertiontarakbumba1-2/+6
Guard the g_bus_unwatch_name() call to only run when we actually have set a watcher to the screensaver.
2015-04-07Fix for https://github.com/mate-desktop/caja/issues/398tarakbumba2-4/+232
On the Shmoocon at 2011 there was a presentation by Jon Larimer demonstrating how to abuse vulnerabilities and bugs, or even just creating socially or security compromising thumbnails in mounting and thumbnailing, which happens on automounting USB drives. This is a particular issue when this happens on a locked box where the attacker doesn't otherwise have access to the user account: http://www.net-security.org/secworld.php?id=10544 Disable automounting if the MATE screen saver is currently locked. See also https://bugzilla.gnome.org/show_bug.cgi?id=642020 This commit is merely based on : https://git.gnome.org/browse/nautilus/commit/?h=gnome-2-32&id=b7262fa945ef1ea936c15f0d248ad7a024d97dca
2015-04-06Bump version to 1.10.0caja-1.10.0Stefano Karapetsas2-2/+2
2015-04-04Sync translations with transifexmate-i18n18-1475/+8993
2015-03-19places-sidebar: fix crashMonsta1-2/+4
taken from upstream commits: https://git.gnome.org/browse/nautilus/commit/?id=cda2c75df4b95a481e8b774081ec1240d47fa45f https://git.gnome.org/browse/nautilus/commit/?id=4764a856c7a6e5a84d4067e7b105c09a93ffdbe4 Closes https://github.com/mate-desktop/caja/pull/395
2015-03-05GTK3: add missing style class view to FMIconContainerraveit651-0/+4
Closes https://github.com/mate-desktop/caja/pull/392 Closes https://github.com/mate-desktop/caja/issues/382
2015-02-24Bump version to 1.9.90caja-1.9.90Stefano Karapetsas2-2/+2
2015-02-24Sync translations with transifexmate-i18n6-32/+32
2015-01-21Disable desktop if we arent inside MATEStefano Karapetsas1-0/+4