 Daniel Molkentin
|
6a20ea5e73
|
Merge pull request #3472 from owncloud/linux_restart_on_new_version
On Linux restart if new version is found on disk
|
2015-08-06 17:47:10 +02:00 |
|
|
Daniel Molkentin
|
26cb737bb1
|
Merge pull request #3558 from owncloud/si-units
Utility: use SI units for the sizes in bytes
|
2015-08-05 17:45:53 +02:00 |
|
|
Daniel Molkentin
|
e21ddfedcb
|
Merge pull request #3513 from owncloud/fix_nautilus_plugin
Fix nautilus plugin
|
2015-07-31 16:06:21 +02:00 |
|
|
Daniel Molkentin
|
59f93b77c3
|
Merge pull request #3468 from owncloud/3368
Win32: Do not silent-update if the application is already up-to-date
|
2015-07-16 23:02:06 +02:00 |
|
|
Daniel Molkentin
|
770ca77673
|
Merge pull request #3467 from owncloud/remove_nsis_appdata_page
Win32: Remove confusing option to remove AppData
|
2015-07-16 17:09:51 +02:00 |
|
|
Daniel Molkentin
|
0fb43dbc3a
|
Merge pull request #3397 from owncloud/uselibcpp
OS X: Force linkage against libc++
|
2015-07-02 14:26:55 +02:00 |
|
|
Daniel Molkentin
|
0610d3ea8d
|
Merge pull request #3347 from jturcotte/shell_integration_findersync
shell_i: Add a FinderSync-based implementation #2340
|
2015-07-02 14:20:24 +02:00 |
|
|
Daniel Molkentin
|
c4bc1da171
|
Merge pull request #3380 from owncloud/doxygenify
Structure developer documentation
|
2015-06-29 18:57:23 +02:00 |
|
|
Daniel Molkentin
|
95c04e59fe
|
Merge pull request #3314 from owncloud/typo
from translators on transifex
|
2015-06-07 14:21:49 +02:00 |
|
|
Daniel Molkentin
|
1bec652822
|
Merge pull request #3303 from owncloud/new_nsis_modules
NSIS installer module updates
|
2015-06-03 21:05:47 +02:00 |
|
|
Daniel Molkentin
|
b1658cb1cf
|
Merge pull request #3291 from RealRancor/backport_3004_2978_1.8
Backport #3004 and #2978 to 1.8
|
2015-05-28 17:22:06 +02:00 |
|
|
Daniel Molkentin
|
e2a26f0eaf
|
Merge pull request #3289 from RealRancor/backport_3279_1.8
Backport #3279 to 1.8
|
2015-05-28 17:03:27 +02:00 |
|
|
Daniel Molkentin
|
abaf2138cf
|
Merge pull request #2978 from RealRancor/doc_virus_scanner
Add note for on-access virus scanner solutions
|
2015-05-26 10:32:17 +02:00 |
|
|
Daniel Molkentin
|
265b4415c3
|
Merge pull request #3277 from vidaren/master
Adding Norwegian translation to Client
|
2015-05-25 18:33:16 +02:00 |
|
|
Daniel Molkentin
|
5c6a6529a6
|
Merge pull request #3258 from binwiederhier/bugfix/issue3256-mkcol
Add 'Content-Length: 0' header to MKCOL request; fixes #3256
|
2015-05-20 15:48:33 +02:00 |
|
|
Daniel Molkentin
|
2518fd7059
|
Merge pull request #3126 from owncloud/equal_user_agents
Use identical User Agents for csync and the Qt parts
|
2015-04-17 10:16:09 +02:00 |
|
|
Daniel Molkentin
|
f455c71338
|
Merge pull request #2997 from owncloud/fix_shell-integration-python3
fix python3 syntax errors
|
2015-03-23 11:28:28 +01:00 |
|
|
Daniel Molkentin
|
1d3100848e
|
Merge pull request #2915 from oostenveld/patch-1
fixed small typo in read me
|
2015-03-18 15:25:54 +01:00 |
|
|
Daniel Molkentin
|
ff68caac24
|
Merge pull request #2900 from rullzer/qt-4.8-fix
static member QFileInfo::exists is not available on 4.8
|
2015-02-27 08:56:40 +01:00 |
|
|
Daniel Molkentin
|
fedf368c7a
|
Merge pull request #2849 from owncloud/nsis_shortcuts_all_users
Install shortcuts for all users
|
2015-02-17 18:13:11 +01:00 |
|
|
Daniel Molkentin
|
3dea1eb173
|
Merge pull request #2785 from owncloud/typos
some typos, grammar and sentence fixes
|
2015-02-14 23:56:10 +01:00 |
|
|
Daniel Molkentin
|
adfb216325
|
Merge pull request #2793 from glensc/patch-1
use touch from path
|
2015-02-08 00:43:03 +01:00 |
|
|
Daniel Molkentin
|
46abd47bfe
|
Merge pull request #2787 from cmeh/patch-1
Orthography: "an folder" corrected to "a folder"
|
2015-02-06 10:31:57 +01:00 |
|
|
Daniel Molkentin
|
d2670b8473
|
Merge pull request #2767 from jdhoek/feature/choose-connection-method
Add dialog to connection wizard for client-side TLS certificates
|
2015-02-02 23:22:19 +01:00 |
|
|
Daniel Molkentin
|
ed05a24cc4
|
Merge pull request #2749 from vtsingaras/patch-1
Update Toolchain-mingw32-openSUSE.cmake
|
2015-01-28 13:10:42 +01:00 |
|
|
Daniel Molkentin
|
00ed37dd02
|
Merge pull request #2709 from rullzer/monochrome-state-info-icon
Resepct theming when no syncs are configure
|
2015-01-20 08:21:42 +01:00 |
|
|
Daniel Molkentin
|
4de815ad67
|
Merge pull request #2710 from rullzer/sort_folder_order
Manged folder list in the tray icon is now sorted
|
2015-01-19 18:56:55 +01:00 |
|
|
Daniel Molkentin
|
ff695f08f7
|
Merge pull request #2704 from remixtj/master
Fix for issue #2703
|
2015-01-14 17:48:08 +01:00 |
|
|
Daniel Molkentin
|
214f925b2f
|
Merge pull request #2692 from owncloud/typo
fix typo
|
2015-01-11 14:12:43 +01:00 |
|
|
Daniel Molkentin
|
4a819026df
|
Merge pull request #2634 from ryo-on/netbsd-support
Support NetBSD like FreeBSD or Linux.
|
2015-01-08 22:35:44 +01:00 |
|
|
Daniel Molkentin
|
94d0c28f69
|
Merge pull request #2629 from owncloud/accountstate
Refactor Account in preparation for multi account feature
|
2015-01-08 15:39:09 +01:00 |
|
|
Daniel Molkentin
|
3f5c1d2ade
|
Merge pull request #2678 from chrodan/master
Hide Ignored files in context menu
|
2015-01-08 14:29:36 +01:00 |
|
|
Daniel Molkentin
|
6e4da53e31
|
Merge pull request #2638 from owncloud/add-slash-as-ignored-character
fix link and add slash as bad character
|
2015-01-07 15:36:09 +01:00 |
|
|
Daniel Molkentin
|
3f5887cc03
|
Merge pull request #2565 from owncloud/accountsettings_itemsontop
Refactor generic settings dialog
|
2014-12-01 15:01:45 +01:00 |
|
|
Daniel Molkentin
|
c5a35ad56f
|
Merge pull request #2499 from owncloud/revert-2412-nsis_shortcuts_all_users
Revert "Install shortcuts for all users"
|
2014-11-15 21:05:05 +01:00 |
|
|
Daniel Molkentin
|
1e94161ec1
|
Revert "Install shortcuts for all users"
|
2014-11-15 21:04:33 +01:00 |
|
|
Daniel Molkentin
|
6f78ff200c
|
Merge pull request #2412 from owncloud/nsis_shortcuts_all_users
Install shortcuts for all users
|
2014-11-15 20:09:29 +01:00 |
|
|
Daniel Molkentin
|
7246011b62
|
Merge pull request #2459 from owncloud/typo
fix typo
|
2014-11-12 00:09:22 +01:00 |
|
|
Daniel Molkentin
|
9a58d0e559
|
Merge pull request #2469 from owncloud/fixing_indent
Fixing indent and make nautilus script python3 compatible.
|
2014-11-12 00:08:46 +01:00 |
|
|
Daniel Molkentin
|
52a63a65ef
|
Merge pull request #2110 from owncloud/crashreporter
Implement CrashReporter using libcrashreporter-qt
|
2014-11-12 00:01:58 +01:00 |
|
|
Daniel Molkentin
|
e579504181
|
Merge pull request #2370 from owncloud/icons-overlay-doc
Add section on Overlay Icons to 'Using the Synchronization Client'
|
2014-11-07 16:52:26 +01:00 |
|
|
Daniel Molkentin
|
cc6e548a78
|
Merge pull request #2419 from owncloud/updater
Update and correct doc/autoupdate.rst
|
2014-11-06 19:53:33 +01:00 |
|
|
Daniel Molkentin
|
47e3da9ebf
|
Merge pull request #2414 from owncloud/fix_2365
Doc: Fix build documentation, adjust it to 1.7.
|
2014-10-27 16:15:14 -04:00 |
|
|
Daniel Molkentin
|
24b07aaaef
|
Merge pull request #2402 from metrix78/spelling
correct spelling on user is empty error.
|
2014-10-26 21:52:03 -04:00 |
|
|
Daniel Molkentin
|
1bd1c61c3c
|
Merge pull request #2399 from r2evans/patch-1
add 64-bit windows registry location
|
2014-10-25 10:31:04 -04:00 |
|
|
Daniel Molkentin
|
d0b40bab47
|
Merge pull request #2391 from owncloud/ignore_windows_reserved_characters
Ignore reserved words on Windows
|
2014-10-24 15:39:21 -04:00 |
|
|
Daniel Molkentin
|
52a5729298
|
Merge pull request #2319 from owncloud/sqlite_capi
Introduce a common sqlite layer across csync and mirall.
This avoids conflicts that both each load different and/or updated sqlite versions.
|
2014-10-17 12:11:27 +02:00 |
|
|
Daniel Molkentin
|
0a96aa3aaf
|
Merge pull request #2307 from owncloud/fix-version-jw
owncloudcmd --version needs this.
|
2014-10-12 20:17:57 +02:00 |
|
|
Daniel Molkentin
|
db3318886e
|
Merge pull request #2214 from owncloud/2211
Implement (most of) #2211
|
2014-09-18 00:09:26 +02:00 |
|
|
Daniel Molkentin
|
6e42ee1bd4
|
Merge pull request #2194 from tim-vandecasteele/fix-apple-build
Fix apple build.
|
2014-09-12 14:39:26 +02:00 |
|
|
Daniel Molkentin
|
2d020b5989
|
Merge pull request #2138 from owncloud/cleanup_shell_integration_nautilus
Cleanup and make python3 compatible shell integration nautilus
|
2014-09-05 15:48:16 +02:00 |
|
|
Daniel Molkentin
|
86a00eee3f
|
Merge pull request #2079 from owncloud/nsis_use_installlib
Use InstallLib to install the overlay icons
|
2014-08-20 17:19:40 +02:00 |
|
|
Daniel Molkentin
|
3d6b622879
|
Merge pull request #2064 from owncloud/fix-1959
Show folder icon a offline when account is offline
|
2014-08-15 15:11:06 +02:00 |
|
|
Daniel Molkentin
|
996b7166d2
|
Merge pull request #2027 from owncloud/l10n-fix
Use am. eng. since brit. eng. is handled on transifex
|
2014-08-05 14:11:20 +02:00 |
|
|
Daniel Molkentin
|
115276408a
|
Merge pull request #1805 from wakeup/master
Fix some typos
|
2014-05-24 15:26:06 +02:00 |
|
|
Daniel Molkentin
|
5ed4710d64
|
Merge pull request #1726 from owncloud/debian_bsd
Make Debian GNU/kFreeBSD compile
|
2014-05-14 12:20:17 +02:00 |
|
|
Daniel Molkentin
|
16ffd7fbe4
|
Merge pull request #1765 from owncloud/shibcookies
CookieJar refactoring required to overcome issues in Shibboleth support
|
2014-05-14 11:14:42 +02:00 |
|
|
Daniel Molkentin
|
ece41921ff
|
Merge pull request #1697 from wakeup/master
Space fix
|
2014-04-20 15:44:03 +02:00 |
|
|
Daniel Molkentin
|
9b09a2ee32
|
Merge pull request #1375 from owncloud/l10n-installer-readme
L10n installer readme
|
2014-01-27 02:03:47 -08:00 |
|
|
Daniel Molkentin
|
484ad28cd6
|
Merge pull request #1357 from owncloud/nsis_fixes
NSIS preparations for upgrade mode
|
2014-01-22 07:20:53 -08:00 |
|
|
Daniel Molkentin
|
c9c56ee55a
|
Merge pull request #1313 from csware/close-button
Close dialog if button was clicked not just pressed
|
2013-12-21 00:09:11 -08:00 |
|
|
Daniel Molkentin
|
a7eddb2985
|
Merge pull request #1296 from owncloud/add-turkish
Adding Turkish translations
|
2013-12-17 06:34:11 -08:00 |
|
|
Daniel Molkentin
|
f9ba3bc22d
|
Merge pull request #1264 from owncloud/l10n-installer-2
Multi-lingual installer
|
2013-12-10 03:10:56 -08:00 |
|
|
Daniel Molkentin
|
5d6700c68d
|
Merge pull request #1165 from csware/startmenu-according-to-ms-guidelines
Startmenu according to ms guidelines
|
2013-11-25 04:27:43 -08:00 |
|
|
Daniel Molkentin
|
56de183155
|
Merge pull request #1160 from csware/exclude-office-tempfiles
Add another Office lock/temporary file pattern
|
2013-11-13 15:52:37 -08:00 |
|
|
Daniel Molkentin
|
c8256eea0e
|
Merge pull request #1162 from csware/startmenu-according-to-ms-guidelines
Startmenu according to ms guidelines
|
2013-11-13 15:52:05 -08:00 |
|
|
Daniel Molkentin
|
44fd03c058
|
Merge pull request #1125 from iAndre89/patch-1
Update mingw32-cross-nsis-plugin-processes and mingw32-cross-nsis-plugin...
|
2013-10-28 09:20:09 -07:00 |
|
|
Daniel Molkentin
|
a06e551469
|
Merge pull request #1103 from Absolight/freebsd-port
Patches for FreeBSD
|
2013-10-16 08:52:46 -07:00 |
|
|
Daniel Molkentin
|
864b7cd41e
|
Merge pull request #998 from owncloud/fixing-mb-1.4
Fixing mb 1.4
|
2013-09-13 11:11:43 -07:00 |
|
|
Daniel Molkentin
|
7045a6c239
|
Merge pull request #996 from owncloud/dont-ship-doc_scripts
Don't ship doc/scripts/README.rst via sphinx
|
2013-09-12 17:25:39 -07:00 |
|
|
Daniel Molkentin
|
1e7716abb4
|
Merge pull request #964 from morriswinkler/patch-1
Update building.rst
|
2013-09-10 02:28:03 -07:00 |
|
|
Daniel Molkentin
|
f09cae74fb
|
Merge pull request #897 from onnozweers/patch-1
Adding "Type=Application" to desktop file (to fix autostart in Ubuntu)
|
2013-08-21 16:50:25 -07:00 |
|
|
Daniel Molkentin
|
f4da7f1fb0
|
Merge pull request #857 from Arakmar/hiddenFix
Don't add empty entries in hidden files editor with an empty string or when cancel is clicked
|
2013-08-13 03:43:02 -07:00 |
|
|
Daniel Molkentin
|
6163de378e
|
Merge pull request #840 from owncloud/network-icon
Proper network icon for the nice new settings dialog.
|
2013-08-07 13:27:00 -07:00 |
|
|
Daniel Molkentin
|
dab17e381c
|
Merge pull request #836 from krnowak/warnings
Add -Wall -Wextra -Wpedantic (or -pedantic) warnings by default.
|
2013-08-07 04:08:26 -07:00 |
|
|
Daniel Molkentin
|
b638341c14
|
Merge pull request #821 from owncloud/ts-cleanup
Translation cleanup
|
2013-08-01 05:38:50 -07:00 |
|
|
Daniel Molkentin
|
b028ca0738
|
Merge pull request #650 from manolopm/master
Fixes for windows client when setup server url customization
|
2013-05-31 07:25:09 -07:00 |
|
|
Daniel Molkentin
|
7d71f9dd2d
|
Merge pull request #582 from ghmer/master
Fix messed formatting in build documentation
|
2013-04-29 00:34:53 -07:00 |
|
|
Daniel Molkentin
|
d7bce80c7b
|
Merge pull request #580 from ghmer/master
Documentation Update cross-compiling section to include all libs needed to build the Windows Package
|
2013-04-26 04:41:20 -07:00 |
|
|
Daniel Molkentin
|
e3f8a918d6
|
Merge pull request #559 from ghmer/master
Fix for Issue #424
|
2013-04-22 04:01:22 -07:00 |
|
|
Daniel Molkentin
|
89e0543e0a
|
Merge pull request #562 from fastfwd/master
Fix Issue #382 (Minor Windows Installer Issue: Missing descriptions on the "Choose Components" screen).
|
2013-04-22 03:41:17 -07:00 |
|
|
Daniel Molkentin
|
b50d201154
|
Merge pull request #423 from hefee/master
adding WITH_DOC parameter to cmake
|
2013-03-11 08:28:51 -07:00 |
|
|
Daniel Molkentin
|
7ba8a55fa5
|
Merge pull request #313 from hefee/doc2default
creating doc to default target
|
2013-02-12 11:48:00 -08:00 |
|
|
Daniel Molkentin
|
ee7dc8e1c5
|
Merge pull request #312 from hefee/master
usefull manpages for owncloud and mirall
|
2013-02-12 11:47:41 -08:00 |
|
|
Daniel Molkentin
|
08ab13dc4b
|
Doc: More missing packages
|
2012-12-14 21:11:19 +01:00 |
|
|
Daniel Molkentin
|
aac9b770fc
|
Details on windows builds
|
2012-12-14 20:42:59 +01:00 |
|
|
Daniel Molkentin
|
da64639f39
|
Update doc/building.rst
move packages into correct section
|
2012-11-21 15:20:15 +01:00 |
|
|
Daniel Molkentin
|
9b8b656720
|
doc: Add Qt dependency to build instructions
|
2012-11-19 18:49:10 +01:00 |
|
|
Daniel Molkentin
|
8c9f8bdb6d
|
doc: Fix build instructions; hint make package
|
2012-11-19 18:15:25 +01:00 |
|
|
Daniel Molkentin
|
ba9a07c2f2
|
Upate build docs
|
2012-11-15 14:42:10 +01:00 |
|
|
Daniel Molkentin
|
df219dd09b
|
Doc: use correct cmake vars
|
2012-11-05 14:44:10 +01:00 |
|
|
Daniel Molkentin
|
7d6eb61f1b
|
doc: wording
|
2012-11-04 00:46:02 +01:00 |
|
|
Daniel Molkentin
|
f8e56cc099
|
Update ChangeLog for 0.60.1
|
2012-10-18 13:11:16 +04:00 |
|
|
Daniel Molkentin
|
62a36cd3bb
|
CMake: Also set CSYNC_BINARY_DIR
...so NSIS finds its resource in the right place.
|
2012-10-10 15:15:19 +02:00 |
|
|
Daniel Molkentin
|
60f16896ed
|
Merge branch 'master' of github.com:owncloud/mirall
|
2012-10-10 14:20:17 +02:00 |
|
|
Daniel Molkentin
|
a6acb2a4d0
|
Remove beta flag in preparation for packaging
|
2012-10-10 11:53:43 +02:00 |
|
|
Daniel Molkentin
|
824368e504
|
Update change log with client changes
|
2012-10-10 11:51:38 +02:00 |
|
|
Daniel Molkentin
|
72f3b5457e
|
Use HTTPS for update check
|
2012-10-09 17:46:41 +02:00 |
|
|
Daniel Molkentin
|
e45dfdb3b2
|
Dirty qnam/proxy export is no longer required
|
2012-10-09 17:19:09 +02:00 |
|
|
Daniel Molkentin
|
19a4f8fc64
|
_accessManager is already initialized in the ctor
|
2012-10-09 17:15:46 +02:00 |
|