mirrors/nextcloud-desktop
1
0
Fork 0
mirror of https://github.com/nextcloud/desktop.git synced 2024-12-20 12:52:06 +03:00
Code Issues Projects Releases Packages Wiki Activity
10674 commits 487 branches 258 tags 463 MiB
Commit graph

137 commits

Author SHA1 Message Date
Olivier Goffart
716b0c68da Merge remote-tracking branch 'origin/master' into new-ui 2015-05-12 15:20:40 +02:00
Daniel Molkentin
b54f2b3b31 Merge remote-tracking branch 'origin/1.9' 
Conflicts:
	VERSION.cmake
	src/libsync/propagatedownload.cpp
	src/libsync/propagateupload.cpp
 2015-05-12 10:03:38 +02:00
Christian Kamm
9507bb4be6 ShareDialog: Password ui fixes. #3189 
* Change the textedit-empty text to be just "Password"
* Hide the 'Copy link' button when the share isn't created yet
* Show the checked and disabled 'Password required' checkbox
  when a password is required.
 2015-05-08 14:53:38 +02:00
Christian Kamm
441eca86c4 ShareDialog: Improve error reporting for share API fails. 
This would have made debugging #3204 and #3136 easier.
 2015-05-07 14:16:13 +02:00
Olivier Goffart
a932eac832 Multi-account WIP 2015-04-17 17:56:17 +02:00
Olivier Goffart
2da3bfb96f Merge branch 'master' into new-ui 2015-04-16 12:50:21 +02:00
Olivier Goffart
afdd01488f AccountManager: Move out of libsync 
The AccountManager does not belong in the libsync because it is not
part of the synchronisation algorithm, but is just an helper class
for the UI to maintain the account and read/save the config
 2015-04-09 16:19:17 +02:00
Olivier Goffart
f3cb5f8a9d Merge remote-tracking branch 'origin/1.8' 2015-04-09 14:24:26 +02:00
Klaas Freitag
4a6f4919d7 More GUI refinements. 2015-04-07 13:38:01 +02:00
Klaas Freitag
b98040c7d5 ShareDialog: handle resize properly with elided text 2015-04-07 13:38:01 +02:00
Klaas Freitag
1240a8163d ShareDialog: Some GUI rework requested by Jan. 2015-04-07 13:38:01 +02:00
Christian Kamm
dfd9d8725c Merge remote-tracking branch 'origin/1.8' 
Conflicts:
	doc/installing.rst
 2015-03-27 11:19:59 +01:00
Roeland Jago Douma
4b56cc6e08 On creation of a share always retrieve the share 
This makes sure that if a default expiration date is set this is reflected in
the dialog. #2889
 2015-03-26 13:48:33 +01:00
Daniel Molkentin
457f9b587d Merge remote-tracking branch 'origin/1.8' 
Conflicts:
	src/gui/sharedialog.cpp
	src/gui/sharedialog.h
 2015-03-13 14:03:03 +01:00
Klaas Freitag
a2aab28ba6 ShareDialog: Connect the proper DateEdit signal. 2015-03-11 15:46:05 +01:00
Klaas Freitag
8e7b7caf04 ShareDialog: If the password is empty, disable button 2015-03-11 14:57:55 +01:00
Klaas Freitag
8cc5ff0e70 ShareDialog: Consider if resharing is not allowed on a share. 
If a file or directory is shared without resharing permission, the
share dialog displays an error. This is not the optimal solution, but
best for now, as we do not have the permissions available for the file
manager plugin.

This fixes #2923
 2015-03-11 14:12:08 +01:00
Klaas Freitag
b09e08c06f ShareDialog: Made it less "webbish" for better usability. 
- Check the share checkbox automatically on open of the dialog
- Use the date picker with popping up calendar
- Proper initial size
- no resizing and appearing and disappearing.

Fixes probably #2917, also #2764
 2015-03-09 14:33:02 +01:00
Christian Kamm
842e5ba5e0 Sharing: Fix for folders containing &. #2892 2015-02-26 09:58:09 +01:00
Roeland Jago Douma
fba9020950 Added copyright header 2015-02-25 18:32:25 +01:00
Klaas Freitag
506cc3908a Add proper copyright headers to some files, fixes #2869 2015-02-25 17:00:27 +01:00
Klaas Freitag
ca00b02b0a ShareDialog: Improve some GUI, fix #2850 
This improves some wording and fixes some show/hide issues with password
setting.
 2015-02-25 13:44:27 +01:00
Klaas Freitag
201075827f Sharedialog: Add a Share button. 2015-02-25 13:44:27 +01:00
Volkan Gezer
bd4f68233f some typos, grammar and sentence fixes 2015-02-14 23:47:07 +01:00
Christian Kamm
40dbc78407 concatUrl: Remove manual parsing, add test. #2817 2015-02-13 14:53:55 +01:00
Klaas Freitag
d37dd040d0 Sharedialog: Use new share link from ownCloud Server 8 on. 
This is derived from pull request https://github.com/owncloud/client/pull/2813
 2015-02-12 17:04:03 +01:00
Klaas Freitag
f4144d6d38 Merge pull request #2827 from rullzer/fix_2812 
Added push button to sharedialog to set password
 2015-02-12 13:49:56 +01:00
Klaas Freitag
eada70ba44 Sharedialog: Removed Thumbnail retrieval. 
It uses an unstable API that the server does not really support.
We need to postpone that. Removed for now.
 2015-02-12 13:47:07 +01:00
Roeland Jago Douma
8523803d94 Added push button to sharedialog to set password 
Added button to explicitly set the password (makes is clear the user has to do
somethign!). Patch for #2812
 2015-02-11 22:14:51 +01:00
Christian Kamm
91ae912373 ShareDialog: Don't crash with bad response. #2811 2015-02-11 16:02:50 +01:00
Klaas Freitag
0bf6a220ae Merge pull request #2807 from rullzer/sharedialog_force_password_multshare 
Reset _public_share_id after we delete the share, thanks
 2015-02-10 12:18:10 +01:00
Roeland Jago Douma
c44abf4918 Reset _public_share_id after we delete the share 2015-02-10 07:53:35 +01:00
Roeland Jago Douma
d7f5e89a1d Sharedialog: retrive thumbnail from server for shares 
Initial patch for #2726. Request a thumbnail from the server if files are to be
shared.
 2015-02-09 22:17:37 +01:00
Klaas Freitag
4849c31add Sharing: Handle "Enforce password" for public shares properly. 
If a 403 is received from the attempt to create a public link, the
dialog shows the password field, as this is server enforced.

This fixes #2774
 2015-02-06 16:27:11 +01:00
Markus Goetz
7c0d3b8485 Sharing: tr()s added 2015-02-06 11:11:09 +01:00
cmeh
1554f41441 Orthography: "an folder" corrected to "a folder" 2015-02-06 10:22:49 +01:00
Roeland Jago Douma
48254579a2 Sharedialog: add copy button text and actually connect the button 2015-02-03 13:02:52 +01:00
Klaas Freitag
d2f1e6e03e ShareDialog: Disable sharing of external files. 
See https://github.com/owncloud/client/issues/2732 for discussion.
 2015-01-29 18:11:04 +01:00
Christian Kamm
2cee591b0e Merge branch 'sharedialog_fixes' of git://github.com/rullzer/client 
Fix missing OcsShareJob constructor.

Conflicts:
	src/gui/sharedialog.cpp
 2015-01-28 12:19:40 +01:00
ckamm
8a71d7d254 Merge pull request #2730 from rullzer/filebrowser_integration 
Sharedialog: 404 is also an acceptable response when retriving shares
 2015-01-28 12:09:33 +01:00
Christian Kamm
37680a0909 ShareDialog: Prepare for multiaccount. #43 
Also fix a possible bug with the share dialog when no account
is configured.
 2015-01-28 10:52:55 +01:00
Klaas Freitag
ed0b4e48d5 Sharedialog: Fix some error display. 2015-01-23 11:50:42 +01:00
Roeland Jago Douma
f9938c90ff Sharedialog: 404 is also an acceptable response when retriving shares 
When we try to get the shares for a file/dir that has no shares yet 404 is an
acceptable response from the server.
 2015-01-23 10:29:12 +01:00
Roeland Jago Douma
bcdc19f0e3 Sharedialog: Moved more logic to OcsShareJob 
To make the Sharedialog a bit cleaner and to only have the logic in one place.
The postdata is now passed as a QList<QPair<QString, QString>> to the
OcsShareJob.
 2015-01-23 09:41:10 +01:00
Roeland Jago Douma
fb967427e8 Sharedialog: We always want json return format 
Cleanup the code a bit and set that we want json as return format for all
replies.
 2015-01-23 09:17:00 +01:00
Roeland Jago Douma
0b10761291 Sharedialog: emit proper error code, only show error label if there is one 2015-01-23 09:10:02 +01:00
Klaas Freitag
95f7e83c5c Sharedialog: Some more refinements after the merge of the branch. 
- Some dialog changes: Made it less vertical space comsuming
- Some variable cleanups
- Allow to share files that are not within the synced dir by
  copying them to the root of a sync dir first.
 2015-01-21 15:05:23 +01:00
Roeland Jago Douma
63f18a7ebb Sharedialog: Pass QDate around instead of QString 
Now pass a QDate object around so we only do the conversion in one place in
case the API changes.
 2015-01-17 09:57:17 +01:00
Roeland Jago Douma
233f0423fa Sharedialog: Also reply on delete should be checked 2015-01-17 09:48:18 +01:00
Roeland Jago Douma
d5bddca01d Sharedialog: More Q_FOREACH 2015-01-17 09:29:13 +01:00
Roeland Jago Douma
00cb6f71da Sharedialog: Set correct minimum date 
The minimum date should always be the current date + 1 day.
 2015-01-17 09:10:42 +01:00
Roeland Jago Douma
9ac35d5869 Sharedialog: Use arg instead of append 2015-01-17 09:01:24 +01:00
Roeland Jago Douma
bd1db30eea Sharedialog: Minor fixes 
The server generates a new share when a password is set/deleted so we need to
refetch the shares once that is done.

It is not possible to set an expiration date in the past for a share. So do not
allow the user to select a date in the past.
 2015-01-17 08:50:28 +01:00
Roeland Jago Douma
6c3a5b1d69 Sharedialog: Do not hard code error reply messages 
The server provides error messages in the json return code. Use those error
messages.
 2015-01-17 08:29:20 +01:00
Roeland Jago Douma
c233baab5b Sharedialog: grouped sharelink stuff in one widget 
A bit of grouping in the UI requiring less ->hide() and ->show() calls
 2015-01-17 08:10:18 +01:00
Roeland Jago Douma
71560ace71 Sharedialog: Show general info about a share 
A start with some general share info in the share dialog.
 2015-01-16 14:48:56 +01:00
Roeland Jago Douma
0fba4eee98 Sharedialog: Removed user/group sharing 2015-01-16 14:06:34 +01:00
Roeland Jago Douma
cd0c9b2ddb Sharedialog: More error checking 2015-01-14 19:47:25 +01:00
Roeland Jago Douma
b80bbe6587 Sharedialog: more const 2015-01-14 19:36:42 +01:00
Roeland Jago Douma
879d41bf2d Sharedialog: Fix spinners and passwordfield 
The password field now show correct info when a password is entered etc.
Maybe we should have an extra info part where we state that the user needs to
press enter to submit the password
 2015-01-14 19:08:04 +01:00
Roeland Jago Douma
7b1cfd69d7 Sharedialog: use QProgressIndicator 
This is a merge from the movie in the original commit (which was local) to the
QProgressIndicator. However, on all connections I tested it, it did not add
much since the API is in gernal pretty quick. So maybe we can just remove this.
 2015-01-14 18:42:56 +01:00
Roeland Jago Douma
3e81839af5 Sharedialog: Removed duplicted code 
Handling of updated shares is identical from users and groups
 2015-01-14 15:27:15 +01:00
Roeland Jago Douma
e420a689dc Sharedialog: More reply checking and removing some duplicated code 2015-01-14 13:43:01 +01:00
Roeland Jago Douma
9addd56f9b Sharedialog: follow correct behavior for files when editing permissions 2015-01-14 13:43:01 +01:00
Roeland Jago Douma
a7e69a5dc5 Sharedialog: Started parsing server replies 2015-01-14 13:43:01 +01:00
Roeland Jago Douma
f6a83d5de2 ShareDialog: UI is different for files/dirs 
Bunch of if statements to make sure that we do not display delete/create on
files.
 2015-01-14 13:43:01 +01:00
Roeland Jago Douma
d1d8a40acf Sharedialog: fix unused var compiler warnings 2015-01-14 13:39:07 +01:00
Roeland Jago Douma
cb18dfaaef Sharedialog: Of course users can also have create and delete privileges 2015-01-14 13:39:07 +01:00
Roeland Jago Douma
a22a03e501 ShareDialog: Group sharing is now also possible 
Basically the same functionality as for user sharing. Maybe it would be wise to
merge the two functionalities. Should be rather straight forward if we also
merge the UI parts.
 2015-01-14 13:39:06 +01:00
Roeland Jago Douma
9a35b5670e ShareDialog: Allow sharing with users 
This commit needs a lot of cleaning up. And a lot of error checking needs to be
added. However it is now possible to change and add new shares with users.
Sharing with groups should be just copy paste.

Also the UI needs some love.
 2015-01-14 13:39:06 +01:00
Roeland Jago Douma
017b54f9a8 Sharedialog: Allow modifications of permission for users 2015-01-14 13:39:06 +01:00
Klaas Freitag
ad09f6491b ShareDialog: Fix const ref for arguments. 2015-01-12 11:35:11 +01:00
Klaas Freitag
efbe033bfb Sharedialog: Fix merge problem (use AccountPtr) plus cleanup. 2015-01-12 11:30:02 +01:00
Roeland Jago Douma
b680788f48 Sharedialog: Allow setting and retrieving of experiation data for public urls 2015-01-12 10:14:45 +01:00
Roeland Jago Douma
811cbc27c0 Sharedialog: Construct correct public url for existing shares 2015-01-11 14:16:49 +01:00
Roeland Jago Douma
25e90ff658 Sharedialog: use Q_FOREACH 2015-01-11 13:56:23 +01:00
Roeland Jago Douma
fa390299f9 Added Q_FUNC_INFO at several places 2015-01-11 13:41:15 +01:00
Roeland Jago Douma
accb036507 Removed some unused outcommented code 2015-01-11 13:36:45 +01:00
Roeland Jago Douma
44690ff596 ShareDialog: fixed "" -> QString 2015-01-11 13:27:32 +01:00
Roeland Jago Douma
e20f819c1d Sharedialog: QString("") -> QString() 2015-01-11 13:24:40 +01:00
Roeland Jago Douma
1d011a2f9a ShareDialog: make visible text translatable 2015-01-11 13:22:48 +01:00
Roeland Jago Douma
bc84a78b0f ShareDialog: Made slot arguments const 2015-01-11 11:19:12 +01:00
Roeland Jago Douma
facb6b2e81 Check box public link now works multiple times 
When deleting a share (public link) and recreating it we need to store the new
id.
 2014-12-28 20:13:11 +01:00
Roeland Jago Douma
0ad4fb7273 Create valid poststring 2014-12-28 20:13:10 +01:00
Roeland Jago Douma
b7d4c997a3 Fix rebase of branch 2014-12-28 20:13:10 +01:00
Alfie "Azelphur" Day
bd7f45e398 Everything works now, albeit without error checking. 2014-12-28 20:13:10 +01:00
Alfie "Azelphur" Day
748440ced3 Initial push for filebrowser integration, not finished yet but it's a start :) 2014-12-28 20:13:10 +01:00