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
