Markus Goetz
78ed4866ce
Merge pull request #3803 from owncloud/phil-davis-logout
...
Adjust log out description
2015-09-11 01:08:29 +02:00
Jocelyn Turcotte
d061a4b434
Merge pull request #3799 from phil-davis/srcstuff
...
Minor shell integration typos
2015-09-10 18:31:20 +02:00
Phil Davis
429f8229b3
Adjust log out description
...
Note: This whole doc needs review and updating of text and screen shots for 2.0 multi-account client.
2015-09-10 22:12:24 +05:45
Klaas Freitag
eb154de2a1
Merge pull request #3802 from owncloud/alt_webdav_url2
...
Branding option: Alternative WebDAV URL
2015-09-10 17:44:46 +02:00
Klaas Freitag
8c2b5af7f0
Account: Fixed typo in comment.
2015-09-10 17:44:20 +02:00
Klaas Freitag
9004fd6d11
Utility: Fix the size display back to JEDEC standard.
...
Also updated the test.
2015-09-10 17:36:28 +02:00
Klaas Freitag
5f660bf080
GUI: Replace term "sign in" with "Log in" and friends.
...
Also with doc changes.
2015-09-10 17:36:28 +02:00
Daniel Molkentin
1f55598010
Merge pull request #3801 from phil-davis/src2
...
Minor typos in client test section
2015-09-10 17:04:52 +02:00
Klaas Freitag
9eec45f9c4
SetupPage: Fix crash caused by uninitialized Account object.
...
Since the webdav path is read from account now, it needs to be
initialized first thing.
2015-09-10 16:03:22 +02:00
Klaas Freitag
cf7726353a
Always use the webdav path from the Account object.
...
The Account object has the themed webdav path if it is branded.
2015-09-10 15:39:37 +02:00
Klaas Freitag
93e1ad088c
Account: Make sure that davPath() always comes with trailing slash.
2015-09-10 15:38:40 +02:00
Phil Davis
13b6b3989a
Minor typos in client test section
...
Note: I am not sure that nostoredpasswd even exists in the current
version. Maybe the stuff in testplan.txt is old and not relevant anyway?
2015-09-10 18:11:44 +05:45
Daniel Molkentin
2a8aa8a108
Merge pull request #3800 from phil-davis/src1
...
cmd and crashreporter minor typos
2015-09-10 13:58:26 +02:00
Phil Davis
b490be2267
cmd and crashreporter minor typos
...
nothing important here
2015-09-10 17:34:26 +05:45
Daniel Molkentin
593ad20e69
Remove shadow from ownCloud icon
...
Fixes #3693
2015-09-10 13:41:36 +02:00
Phil Davis
bae552f386
Minor shell integration typos
...
all in comments or other places that have no effect on the user.
2015-09-10 17:14:08 +05:45
Klaas Freitag
16d6418d10
Use a themable WebDAV path all over.
...
This is needed for enterprise#481
2015-09-10 13:04:26 +02:00
Klaas Freitag
995b42d0fc
Units: Back to the "usual" mix units.
...
Now we display units again numerically wrong (based on 1024) but back
to how it was before in ownCloud.
2015-09-10 12:08:20 +02:00
Daniel Molkentin
c0f8ff1030
Account: Display non-standard port as part of the hostname
...
Addresses #3658
2015-09-10 10:17:31 +02:00
Daniel Molkentin
8e2b9c6f12
Merge pull request #3797 from phil-davis/minorstuff
...
Minor build etc typos
2015-09-10 09:49:16 +02:00
Phil Davis
7d191763b5
Minor build etc typos
...
Just some random stuff I noticed while looking at how this beast is put
together.
2015-09-10 13:20:11 +05:45
Jenkins for ownCloud
144a1a1922
[tx-robot] updated from transifex
2015-09-10 02:19:05 -04:00
Daniel Molkentin
be3529ebcb
Adjust strings in settings dialogs
...
Implements #3745 & #3793
2015-09-10 01:46:28 +02:00
hh.lohmann
e00cc4ed5b
/doc/autoupdate.rst: "Migrate to the following directory" => "Edit this Registry key"
...
Registry keys are no directories; you would not "migrate" to keys if you are just about to switch to them; resembling formulas as "Edit these / this Registry key/s" ease fast reading, for that also ":" instead of "::" at the end (formatting what follows)
2015-09-10 01:37:40 +02:00
Daniel Molkentin
b7061618b1
Merge pull request #3789 from hh-lohmann/Terminology
...
/doc/autoupdate.rst: "32-/64-bit" => "32-/64-bit-Windows"
2015-09-10 01:37:10 +02:00
Phil Davis
613736aa41
Coin the term 'folder sync connection'
...
Proposed wording for issue
https://github.com/owncloud/client/issues/3757
2015-09-10 01:35:58 +02:00
Daniel Molkentin
d823809021
Merge pull request #3781 from phil-davis/FSC
...
Coin the term 'folder sync connection'
2015-09-10 01:35:25 +02:00
Daniel Molkentin
b83c723e3f
Allow (partial) translations even when run from build dir
...
Makes it easier to catch translation issues earlier
2015-09-10 01:25:16 +02:00
Individual IT Services
6b222c3db7
fix unicode issue #3753
...
fixes the unicode issue #3753
I don't know much CPP and Qt but after some google research I found this http://wiki.qt.io/Strings_and_encodings_in_Qt
it does mention trUtf8() that has done the trick for me on Linux with Gnome 3.16.
Haven't tested it on other systems
2015-09-10 01:24:11 +02:00
Klaas Freitag
088c0d471a
AccountSettings: Do not prepend the folder alias to the undecided folders
...
This fixes bug #3685
2015-09-09 17:52:39 +02:00
Jocelyn Turcotte
5e657aadee
Fix Finder crashing when showing the context menu on OS X <= 10.9
...
OwnCloudFinderRequestManager::_shareMenuTitle was not retained anymore
after the FinderSync refactoring which would cause it to contain any
kind of garbage value for some reason.
Fix the issue by also enabling ARC for RequestManager.m.
We can't enable ARC for the whole project since Finder.h is included
by many .m files and it's not trivial to port to ARC.
2015-09-09 17:45:24 +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
Klaas Freitag
df534753b1
csync_update: Handle permission denied as soft error in discovery.
...
For that, treat the not accessible directory as if it were ignored.
This will fix #3767
2015-09-09 14:12:13 +02:00
Klaas Freitag
02c077e3f8
vio_local_win: Properly set errno in case of error happened.
...
Without a proper errno value, the calling function can not detect
the kind of problem.
2015-09-09 14:10:23 +02:00
hh.lohmann
0329a8be2e
/doc/autoupdate.rst: "Migrate to the following directory" => "Edit this Registry key"
...
Registry keys are no directories; you would not "migrate" to keys if you are just about to switch to them; resembling formulas as "Edit these / this Registry key/s" ease fast reading, for that also ":" instead of "::" at the end (formatting what follows)
2015-09-09 12:33:25 +02:00
hh.lohmann
79f64abfc3
/doc/autoupdate.rst: "32-/64-bit" => "32-/64-bit-Windows"
...
Should be stated clearly that there are no alternative 32- / 64-bit-ownCloud-Clients, but just a 32-bit-ownCloud-Client that is treated differently in 32- / 64-bit-Windows
2015-09-09 12:10:10 +02:00
Jenkins for ownCloud
ba2145032e
[tx-robot] updated from transifex
2015-09-09 02:19:02 -04:00
Markus Goetz
63636aca9b
Merge pull request #3777 from owncloud/individual-it-utf8-patch
...
fix unicode issue #3753
2015-09-08 16:06:42 +02:00
Markus Goetz
bff9d646f7
Merge pull request #3691 from individual-it/2.0
...
Nautilus: don't show share menu item for top level folders
2015-09-08 16:03:48 +02:00
Phil Davis
fdfab07d07
Coin the term 'folder sync connection'
...
Proposed wording for issue
https://github.com/owncloud/client/issues/3757
2015-09-08 17:22:57 +05:45
Individual IT Services
cc5f8e5122
fix unicode issue #3753
...
fixes the unicode issue #3753
I don't know much CPP and Qt but after some google research I found this http://wiki.qt.io/Strings_and_encodings_in_Qt
it does mention trUtf8() that has done the trick for me on Linux with Gnome 3.16.
Haven't tested it on other systems
2015-09-08 13:59:43 +05:45
Jenkins for ownCloud
8495d097bb
[tx-robot] updated from transifex
2015-09-08 02:19:14 -04:00
Olivier Goffart
21dbf97a02
Merge remote-tracking branch 'origin/2.0'
2015-09-07 10:32:16 +02:00
Daniel Molkentin
66f340734c
Consistency: Use folder instead of directory in user visible strings
2015-09-07 08:51:40 +02:00
Jenkins for ownCloud
794f071561
[tx-robot] updated from transifex
2015-09-07 02:18:55 -04:00
Christian Kamm
c6794afc3a
Tray: Enable workaround for Qt5 only #3765
2015-09-07 07:44:07 +02:00
Jenkins for ownCloud
8920ba3de2
[tx-robot] updated from transifex
2015-09-06 02:19:00 -04:00
Olivier Goffart
39bff056a6
Merge remote-tracking branch 'origin/2.0'
2015-09-05 18:14:30 +02:00
Jocelyn Turcotte
128d46e19a
Remove *Credentials::_fetchJobInProgress
...
Now that fetchFromKeychain is solely called from AccountState::slotInvalidCredentials
and that this one already protects the fetch call using _waitingForNewCredentials,
we can remove that extra check.
2015-09-05 16:00:45 +02:00
Jocelyn Turcotte
6d027ebd40
Separate the credential dialog from their fetch #3350
...
This moves the responsibility of asking the user or not for
credentials from the Credentials classes back to the AccountState.
fetch() now only extract credentials from the keychain, reports
the result to the AccountState which then decides if askFromUser()
should be called or not. The result is once more reported to the
AccounState.
This also replaces the HttpCredentials::queryPassword virtual
which now lets HttpCredentialsGui and HttpCredentialsText do it
the way that they prefer.
2015-09-05 16:00:45 +02:00