nextcloud
/
desktop
mirror of https://github.com/nextcloud/desktop
0
0
Fork 0
Code Issues Releases Wiki Activity
10,144 Commits 415 Branches 237 Tags 422 MiB
Commit Graph

31 Commits

Author SHA1 Message Date
Christian Kamm db24f60ae3 License: Adjust license of GPLv2 source files to GPLv2+ 
See #5180
 2016-10-25 11:06:54 +02:00
ckamm 355a8a0a27 Workaround for Ubuntu 16.04 tray issue #4944 (#4947) 2016-06-07 11:48:25 +02:00
Christian Kamm 17003cec19 Settings: Hide update info if skipUpdateCheck #4397 
(cherry picked from commit 93de378fb21e934d324d621f66eec98e53f1637a)
 2016-03-09 15:32:32 +01:00
Klaas Freitag 87aa1de67a Merge branch 'newactivity' 2015-11-16 17:02:05 +01:00
Klaas Freitag 7e4c0bd515 AccountSettings: Add a toolbox button for the account specific actions. 
Also move the 'Add Account' button from the General Tab, where it
is not properly found, to the new account toolbox.
 2015-11-13 14:50:07 +01:00
Klaas Freitag ff4a8c9202 GeneralSettings: Remove references to protocolwidget. 
The ProtocolWidget is now the Activitytab Widget
 2015-11-11 14:49:11 +01:00
Klaas Freitag a3904f4d32 Theme: Revert logic of singleAccount switch. 
To use the same logic as the other clients and unify ownBrander
implementations, the switch is now called multiAccount() rather
than singleAccount() with a reverse logic.
Desktop Client stays with the default of having multiaacount
enabled.

Note that existing brandings need to rename the switch.

https://github.com/owncloud/ownbrander/issues/443
 2015-10-19 12:26:42 +02:00
Klaas Freitag a8eb913535 SyncLogDialog: Do not delete SyncLogDialog after close. 
Keep one instance for the lifetime of the generalsettings widget.
 2015-10-07 18:59:48 +02:00
Klaas Freitag afd081f40b Settings: Move synclog widget to a seperate dialog. 
This a first step to integrate the server activity view, see #3732
 2015-10-01 16:57:37 +02:00
Klaas Freitag 0c148025a3 SyncLog Dialog WIP 2015-09-30 12:02:05 +02:00
Klaas Freitag 98e6d61d1b General settings: Set left margin of layout to zero. 
This fixes the vertical alignment of the checkboxes, see bug #3758
 2015-09-09 15:52:22 +02:00
Christian Kamm 7bfbc21770 Settings: Allow adding at least one account #3721 
We always show the 'Add Account' button when no account exists,
even When the 'singleAccount' option is enabled.
 2015-09-03 06:14:49 +02:00
Markus Goetz 2a14c121db Account settings: Make version selectable/copyable #3600 2015-08-13 17:27:18 +02:00
Olivier Goffart 6b003f96f5 Theme: add a method to hide the 'add account' button #3517 2015-08-13 09:39:44 +02:00
Olivier Goffart 0ccaae9a22 Confirm feature: Confirm for any folder, not only shared ones 
issue #3148
 2015-07-27 09:54:20 +02:00
Klaas Freitag 316427c801 Merge branch 'regular_update_check' 
Conflicts:
	src/gui/application.cpp
	src/gui/application.h
	src/gui/updater/ocupdater.h
 2015-07-23 11:34:12 +02:00
Markus Goetz afed400ac6 SettingsDialog: Make bigger and more native on OS X 
On OS X, the width of the dialog must not change, only its height.
 2015-07-20 18:16:33 +02:00
Olivier Goffart d1bfc7a636 Settings: fix broken signal/slot connection: 
No such slot OCC::GeneralSettings::slotForceRemoteDiscoveryOnFolders()
      (sender name:   'OCC__IgnoreListEditor')
      (receiver name: 'OCC__GeneralSettings')

The slot was in another settings page (because the button 'edit ignored files'
was moved.

Move the actual code to IgnoreListEditor where it logically belong.
Add a comment on the why this code is there.
 2015-07-07 20:46:39 +02:00
Olivier Goffart 41111541c5 Confirm feature: Add an option for it 2015-07-07 16:28:48 +02:00
Olivier Goffart 29fecb029e Merge remote-tracking branch 'origin/1.8' 
Conflicts:
	VERSION.cmake
        src/gui/accountsettings.cpp
	src/gui/accountsettings.h
 2015-06-25 12:30:52 +02:00
Klaas Freitag c8cb604c18 Updater: Do a tray notification if a new update is available. 2015-06-09 08:35:15 +02:00
Olivier Goffart 426d2338d9 Settings: New UI that intergate the selective sync within the account settings 2015-03-27 16:50:35 +01:00
Daniel Molkentin a2b817f0c0 mirall.qrc -> client.qrc 2014-12-08 18:00:29 +01:00
Daniel Molkentin 281c0e1553 Merge branch 'master' into rename_client 
Conflicts:
	CMakeLists.txt
	src/gui/main.cpp
	src/libsync/accessmanager.cpp
	src/libsync/accessmanager.h
	src/libsync/owncloudpropagator_p.h
 2014-11-12 00:07:59 +01:00
Daniel Molkentin 2db17a57d2 Fix header names 2014-11-09 23:25:57 +01:00
Daniel Molkentin ae85aa33fd Adjust namespaces 2014-11-09 22:34:07 +01:00
Daniel Molkentin f2eadacf09 Remove "Mirall" from class names 2014-11-09 22:30:29 +01:00
Dominik Schmidt 38ff7d87c8 Hide crashreporter config option if not build with crashreporter enabled 2014-08-29 17:07:31 +02:00
Dominik Schmidt 89aec52503 Add checkbox to general settings to disable the crash reporter 2014-08-28 16:19:17 +02:00
Daniel Molkentin 902bb7a198 Merge remote-tracking branch 'origin/master' into move_lib_to_sep_dir 
Conflicts:
	src/CMakeLists.txt
	src/gui/accountsettings.cpp
	src/gui/folderwizard.cpp
	src/gui/settingsdialog.cpp
	src/libsync/syncengine.h
 2014-08-26 11:29:42 +02:00
Daniel Molkentin df3c3bca02 Split into three separate projects: library, gui and cmd 2014-07-11 11:07:31 +02:00