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
Christian Kamm
9b7e6cc5c1
Fix warnings.
...
* remove Unused variable
* zorder for spacers makes no sense
2015-01-14 11:28:53 +01:00
Klaas Freitag
209276efa8
ShareDialog: Moved open slot from Application object to Gui object.
...
Also set auto delete flag for the dialog explicitely.
2015-01-13 13:50:41 +01:00
Jenkins for ownCloud
d2fc3e8023
[tx-robot] updated from transifex
2015-01-13 02:06:12 -05:00
Jenkins for ownCloud
1afdeb7216
[tx-robot] updated from transifex
2015-01-13 01:25:24 -05:00
Klaas Freitag
b754ffb047
Nautilus: Add a context menu that opens the sharing dialog.
2015-01-12 14:49:22 +01:00
Klaas Freitag
89eb4727b4
Nautilus overlays: Add a script to patch the branding name into pyhton script.
2015-01-12 14:49:22 +01:00
Daniel Molkentin
5619947685
Relocate Windows shell extensions
...
The directory was redundant
2015-01-12 14:40:42 +01:00
Daniel Molkentin
31e584e3e3
Fix win32 build
2015-01-12 13:53:40 +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
Klaas Freitag
2c6f0950f6
Merge pull request #2674 from rullzer/filebrowser_integration
...
Add Sharing from the desktop, SocketAPI and Dialog.
2015-01-12 11:16:28 +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
Daniel Molkentin
5e0d4ab31d
Further Windows compile fix
2015-01-12 09:50:37 +01:00
Daniel Molkentin
488f993f45
Fix compilation on Windows
2015-01-12 09:40:11 +01:00
Jenkins for ownCloud
876407e2e7
[tx-robot] updated from transifex
2015-01-12 01:25:23 -05:00
Roeland Jago Douma
811cbc27c0
Sharedialog: Construct correct public url for existing shares
2015-01-11 14:16:49 +01:00
Daniel Molkentin
214f925b2f
Merge pull request #2692 from owncloud/typo
...
fix typo
2015-01-11 14:12:43 +01:00
Volkan Gezer
cefa31eb82
fix typo
...
suggested by transifex translator
2015-01-11 14:07:04 +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
Daniel Molkentin
6034bd0946
Wizard: Never attempt to hide server page
...
The wizard code used to call hide() on hardcoded wizards.
This means that for a brief moment, the first page with the URL
(disabled line edit) may be seen. I think that's completely
legitimate from a feedback perspective. The alternative would
be to unhide on error, but this is rather unelegant...
2015-01-11 07:38:09 +01:00
Jenkins for ownCloud
6abe714dff
[tx-robot] updated from transifex
2015-01-11 01:25:22 -05:00
Jenkins for ownCloud
37606dab4b
[tx-robot] updated from transifex
2015-01-10 01:25:25 -05:00
Markus Goetz
f9b98d6d1d
OS X: Fix exclude file install
2015-01-09 14:38:27 +01:00
Klaas Freitag
786a877986
SocketAPI: Some cleanups plus added some consts
2015-01-09 11:44:01 +01:00
Jenkins for ownCloud
b637ae1e53
[tx-robot] updated from transifex
2015-01-09 04:26:16 -05:00
Jenkins for ownCloud
cc8a54d314
[tx-robot] updated from transifex
2015-01-09 01:25:28 -05:00
Daniel Molkentin
c86d8e5acf
Clean up BSD support patch
2015-01-08 22:40:47 +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
Olivier Goffart
7671ae8df7
Application: Initialize the folderman after we checked for existance
...
So we don't start the SocketAPI if we are going to quit.
We also do not log any message anymore before we install the hooks
Should solve #2666
2015-01-08 16:52:23 +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
df555d5321
Merge remote-tracking branch 'origin/master' into accountstate
...
Conflicts:
src/cmd/cmd.cpp
2015-01-08 15:38:41 +01:00
Daniel Molkentin
c3468b7ed6
Merge remote-tracking branch 'origin/master' into accountstate
...
Conflicts:
src/gui/owncloudsetupwizard.cpp
src/gui/owncloudsetupwizard.h
src/libsync/propagatedownload.cpp
src/libsync/propagatedownload.h
2015-01-08 15:33:39 +01:00
Olivier Goffart
bbf0e7c0a5
owncloudcmd: add --unsyncedfolders to test selective sync
2015-01-08 15:27:02 +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
dd063d0207
Add hack to make old themes work
2015-01-08 14:21:58 +01:00
Christoph Dann
309ff2997c
potential fix for #1865
...
Do not show ignored files in context menu
2015-01-08 11:42:14 +01:00
Daniel Molkentin
8e8ca97eec
Fix build
2015-01-08 09:42:26 +01:00
Jenkins for ownCloud
b734958ab9
[tx-robot] updated from transifex
2015-01-08 01:25:22 -05:00