geez0x1
7576dde0a3
Update the modified date in UI on file reversion
2014-06-17 22:22:03 +02:00
Vincent Petry
58c204abb4
Added JS unit tests for ext storage
...
Added JS unit tests for the external storage file list extension.
2014-06-17 18:29:07 +02:00
icewind1991
8d1cf79152
Merge pull request #8399 from owncloud/server-server-sharing
...
Add server<->server sharing
2014-06-17 17:40:05 +02:00
Robin Appelman
07fdeba50b
Fix moving movablemount over webdav
2014-06-17 14:10:11 +02:00
Robin Appelman
2219087df6
organize js a bit better
2014-06-17 13:47:36 +02:00
Robin Appelman
f2ebac5c76
Better error handeling in testremote
2014-06-17 13:15:34 +02:00
Robin Appelman
361607c72d
testremote is for public access
2014-06-17 13:08:24 +02:00
Morris Jobke
e7365c9507
fix broken buttons for IE8-11
2014-06-17 11:45:55 +02:00
Morris Jobke
17685adb87
fixing layout issue - mostly alignment
2014-06-17 11:24:39 +02:00
Jenkins for ownCloud
ce179dcdcb
[tx-robot] updated from transifex
2014-06-17 01:55:43 -04:00
Robin Appelman
3ed4e5b26b
Prevent warning
2014-06-16 16:12:32 +02:00
Robin Appelman
9c2918a626
Fix setupFromToken when a password is set
2014-06-16 16:09:56 +02:00
Robin Appelman
0616eb4007
Fix multiple users having the same external share mountpoint
2014-06-16 15:57:01 +02:00
Bagera
bc65b25303
Aligning in the table header as well
...
Aligning the columns and in the rows
2014-06-16 14:15:55 +02:00
Bagera
28f420b337
Aligning with line height
...
Remove "top:" in favour of setting "line-height" and fixing the
resulting problem with the input field being positioned wrongly.
2014-06-16 14:11:58 +02:00
Bagera
e11abccded
Fix delete action height
...
Fix #8530 and align the all actions in the row
2014-06-16 14:11:55 +02:00
Morris Jobke
b75fe439e7
fix CSS for upload button - fixes #8939
2014-06-16 13:51:49 +02:00
Robin Appelman
5b1b6572f7
Make testremote more robust
2014-06-16 13:21:00 +02:00
Robin Appelman
6e06e1da0e
Add route which went missing during rebase
2014-06-16 13:20:39 +02:00
Morris Jobke
4fbab3c12d
Merge pull request #9040 from owncloud/fix-xss
...
Sanitize name of sharee
2014-06-16 13:13:28 +02:00
Morris Jobke
3069091e61
Merge pull request #9030 from owncloud/default-allow-user-mount-backends
...
AllowUserMount defaults now to all backends fixes #7958
2014-06-16 13:10:01 +02:00
Robin Appelman
a469efb1f1
Add some safety checks
2014-06-16 12:42:28 +02:00
Morris Jobke
0a2c676cda
fix camelCase and avoiud re-wrapping $()
2014-06-16 11:35:48 +02:00
Morris Jobke
78b6f59523
fix typo - Backups -> Backends
2014-06-16 11:33:51 +02:00
Vincent Petry
d21845557e
Merge pull request #9027 from owncloud/fix-password-saved-share-layout
...
fix layout of password protected shares
2014-06-16 11:11:03 +02:00
Jenkins for ownCloud
ec5448bf7d
[tx-robot] updated from transifex
2014-06-16 01:54:35 -04:00
Jenkins for ownCloud
4d6fc6f309
[tx-robot] updated from transifex
2014-06-15 01:55:06 -04:00
Lukas Reschke
1066f4ec9a
Sanitize name of sharee
...
Fixes a XSS introduced with 271684dcfe
2014-06-14 20:45:10 +02:00
Morris Jobke
06ec82fd68
Fix path
2014-06-14 15:26:27 +02:00
Robin Appelman
9670d3e98b
Always send a POST body
2014-06-14 10:22:38 +02:00
Robin Appelman
be93b0d01d
Fix permissions functions for webdav external storages
2014-06-14 10:22:38 +02:00
Robin Appelman
4bc8a2550d
Fix public share webdav permissions
2014-06-14 10:22:38 +02:00
Robin Appelman
49f9b7ea8e
fix modified date for external shares
2014-06-14 10:22:38 +02:00
Robin Appelman
455fbafb48
Fix undefined index error
2014-06-14 10:22:38 +02:00
Bjoern Schiessle
3bf7b54cd5
block server-to-server share if files_external is not activates, can be reverted once we moved to the webdav implementation in core
2014-06-14 10:22:38 +02:00
Bjoern Schiessle
84a651e46d
add settings to disable server to server sharing
2014-06-14 10:22:38 +02:00
Robin Appelman
e7b58ed2bd
Properly expose read only public shares as read only
2014-06-14 10:14:08 +02:00
Robin Appelman
87e311b996
Fix storage being passed to cache/watcher and scanner when using storage wrappers
2014-06-14 10:14:08 +02:00
Robin Appelman
decb51aee6
Fix deleting of external shares
2014-06-14 10:14:08 +02:00
Robin Appelman
3f2cb39aba
Properly set read permissions for webdav storages
2014-06-14 10:14:08 +02:00
Robin Appelman
c8c8106168
generate better storage ids
2014-06-14 10:14:08 +02:00
Robin Appelman
ce0aa7d4a8
Use the movable mount system for external shares
2014-06-14 10:14:08 +02:00
Robin Appelman
c61f759a8b
Fix check for shared files inside shares
2014-06-14 10:14:08 +02:00
Robin Appelman
790d51ea1e
Fix checking for external share in encryption
2014-06-14 10:14:07 +02:00
Bjoern Schiessle
277f25222a
if file doesn't exist, check parent folder
2014-06-14 10:14:07 +02:00
Robin Appelman
2005c162bd
Fix prompting for password
2014-06-14 10:14:07 +02:00
Robin Appelman
64ced76beb
Save mountpoints relative to the user
2014-06-14 10:14:07 +02:00
Robin Appelman
43c56fcd07
Generate a unique name
2014-06-14 10:14:07 +02:00
Robin Appelman
e6f3850890
Update for changes in master
2014-06-14 10:14:07 +02:00
Bjoern Schiessle
c580aeb455
exclude mounted server-to-server shares from encryption
2014-06-14 10:14:07 +02:00
Bjoern Schiessle
961317d911
make sure to enable incognito mode when mounting a public link and update init status of the encryption app
2014-06-14 10:14:07 +02:00
Robin Appelman
87b0021e56
Scan the entire remote share at once by requesting the full file tree from the remote server
2014-06-14 10:14:07 +02:00
Robin Appelman
30f5b2bd7c
Improve detection of whether we're in the files app
2014-06-14 10:13:24 +02:00
Robin Appelman
21ced89beb
Dont return false for internalPath
2014-06-14 10:13:24 +02:00
Robin Appelman
a900c7aa94
Fix removing remote shares
2014-06-14 10:13:24 +02:00
Robin Appelman
1c149da52f
Support path lengths up to 4000 chars
2014-06-14 10:13:24 +02:00
Robin Appelman
c6a83b2f17
Fix exposing single files over webdav
2014-06-14 10:13:24 +02:00
Robin Appelman
cf5a72c103
Add interface for adding a public share to a different ownCloud instance
2014-06-14 10:13:24 +02:00
Robin Appelman
d7de35376d
Add interface for accpeting external shares
2014-06-14 10:13:23 +02:00
Robin Appelman
0156ef8166
Add coments to database and dont use sql keywords as table names
2014-06-14 10:10:38 +02:00
Robin Appelman
a44baaf8eb
add remote/add external shares to manager
2014-06-14 10:10:37 +02:00
Robin Appelman
65f3b2fad2
Add server<->server sharing backend
2014-06-14 10:10:37 +02:00
Jenkins for ownCloud
4a26219ecf
[tx-robot] updated from transifex
2014-06-14 01:55:24 -04:00
Morris Jobke
86e1d8ca54
AllowUserMount defaults now to all backends fixes #7958
2014-06-13 18:14:41 +02:00
Morris Jobke
fc9787ed64
fix layout of password protected shares
...
* add password icon
* fix upshifted arrow button - fixes #9024
2014-06-13 16:38:42 +02:00
Jörn Friedrich Dreyer
42bf466fa1
move mail template editor from core to standalone templateeditor repo
2014-06-13 12:00:23 +02:00
Jörn Friedrich Dreyer
7e8784c075
access admin settings result message correctly
2014-06-13 11:59:14 +02:00
Morris Jobke
b91db84050
Merge pull request #8714 from owncloud/minor-fixes
...
fix some minor issues
2014-06-13 08:30:57 +02:00
Jenkins for ownCloud
083cf63cc2
[tx-robot] updated from transifex
2014-06-13 01:54:32 -04:00
Volkan Gezer
cea2c77fd2
fix some minor issues
2014-06-13 00:16:36 +02:00
Volkan Gezer
565f0b281c
some strings to localize external mount api responses. fix #8094
2014-06-12 20:31:07 +02:00
Jörn Friedrich Dreyer
72436b68bf
fix liskov substitution principle in admin mail template settings, fixes #8997
2014-06-12 12:38:34 +02:00
Jenkins for ownCloud
55b5ddd735
[tx-robot] updated from transifex
2014-06-12 01:54:34 -04:00
Vincent Petry
452b45ed1d
Merge pull request #8986 from owncloud/disable_tests
...
disable failing tests
2014-06-11 18:34:35 +02:00
Vincent Petry
75a53b3c49
Merge pull request #8901 from owncloud/permissions-update-cache
...
Save the permissions in the filecache if it's not saved yet
2014-06-11 18:28:55 +02:00
Bjoern Schiessle
4cef7f9d4b
disable failing tests
2014-06-11 17:21:57 +02:00
Vincent Petry
491c96eaa9
Merge pull request #8966 from owncloud/fix_failing_tests_on_master
...
Fix failing tests on master
2014-06-11 10:05:38 +02:00
Jenkins for ownCloud
f769c52522
[tx-robot] updated from transifex
2014-06-11 01:55:07 -04:00
Bjoern Schiessle
f4a183e753
wwe no longer have a versions table
2014-06-10 14:47:32 +02:00
Bjoern Schiessle
1d9b4aadbf
no need to prepare a statement twice
2014-06-10 14:46:47 +02:00
Jenkins for ownCloud
6546b589ce
[tx-robot] updated from transifex
2014-06-10 01:54:54 -04:00
jbtbnl
b2c86b7a07
Merge pull request #8928 from owncloud/too-long-filename-fix-v2
...
Ellipcises too long filenames
2014-06-09 13:09:18 +02:00
Robin Appelman
a978607011
Use &=
2014-06-09 12:47:00 +02:00
Thomas Müller
961e4e5c7c
adjust unit test assert values
2014-06-09 12:44:40 +02:00
Thomas Müller
aa38bd2b31
adding PHPDoc
2014-06-09 12:34:35 +02:00
Jenkins for ownCloud
e5c47a5e30
[tx-robot] updated from transifex
2014-06-09 01:54:32 -04:00
Morris Jobke
e3429b63a2
improve ellipsis of filename for different screen sizes
2014-06-08 17:48:53 +02:00
raghunayyar
f3a605230a
@jancborchardt's commit for cross browser compatibility of extension.
2014-06-08 15:06:01 +05:30
Jenkins for ownCloud
1f2722053f
[tx-robot] updated from transifex
2014-06-08 01:56:13 -04:00
raghunayyar
09206f8a49
Adds class name to span element inside filename.
2014-06-07 23:54:21 +05:30
raghunayyar
d71bb7dbe4
Adds multiple media queries for filename.
2014-06-07 14:23:49 +05:30
Jenkins for ownCloud
e0446a1df5
[tx-robot] updated from transifex
2014-06-07 01:56:13 -04:00
Vincent Petry
506f7adb12
Merge pull request #8925 from owncloud/extstorage-sidebar
...
Added external storage list in files app
2014-06-06 18:59:37 +02:00
Thomas Müller
647dcce514
Merge pull request #8253 from owncloud/pk-on-all-tables-master
...
Primary keys on all tables master
2014-06-06 16:40:11 +02:00
Vincent Petry
e39e6a5584
Fixed delete button CSS in ext storage list
2014-06-06 15:33:33 +02:00
Vincent Petry
d3d0035a9a
Use actual file path on rename/delete
...
When renaming or deleting a file that is in a subdirectory, performing
the action from the sharing overview or another file list view, the
actual directory of the file must be used instead of the current
directory.
2014-06-06 15:17:55 +02:00
Vincent Petry
710d017eec
Added more columns to ext storage list
...
Now using system mount and personal mount calls to get the relevant
mount points including backend information.
2014-06-06 15:06:26 +02:00
Vincent Petry
a47ef52ae2
Fixed ext storage list sorting
2014-06-06 15:06:26 +02:00
Vincent Petry
01c2c3107a
Added external storage list in files app
2014-06-06 15:06:26 +02:00
Jan-Christoph Borchardt
933c05566e
Merge pull request #8922 from owncloud/design-controls-transparency
...
Bugfixes for mobile
2014-06-06 14:52:55 +02:00
Jan-Christoph Borchardt
1a519b851d
Merge pull request #8923 from owncloud/app-settings-input
...
app settings: display input fields at full width
2014-06-06 14:52:23 +02:00
raghunayyar
1d1f958bea
Ellipcises too long filenames
2014-06-06 17:30:18 +05:30
Thomas Müller
fe8bae31dc
adding PK to table encryption
...
adding auto increment/PK to table files_trash
adding PK to table ldap_user_mapping and ldap_group_members
adding PK to table ldap_group_mapping
truncate permissions table to allow smooth creation of primary key
adding unit test for creating an auto increment column on a table which already contains data
remove unneeded table files_trashsizes
fix unit test
no need to truncate *PREFIX*permissions
On Oracle adding auto increment columns is not working out of the box - Oracle migrations are to be done manually
2014-06-06 13:33:56 +02:00
Vincent Petry
5cebb6fb9b
Merge pull request #4553 from owncloud/update_search_classes
...
Update search classes
2014-06-06 13:24:16 +02:00
Jan-Christoph Borchardt
08b5f787cc
app settings: display input fields at full width
2014-06-06 13:01:24 +02:00
Jörn Friedrich Dreyer
7af67eb630
increase version number of files and migration trigger
2014-06-06 12:28:36 +02:00
Jan-Christoph Borchardt
23c83c076c
unify controls bar, remove duplicate from user management
2014-06-06 12:22:09 +02:00
Jörn Friedrich Dreyer
a59b5249d3
add more and fix office mimetypes, migrate wrong mimetypes
2014-06-06 12:00:25 +02:00
icewind1991
c47d4ebbac
Merge pull request #8666 from owncloud/mount-remove
...
Support for (re)moving mountpoints
2014-06-06 11:57:43 +02:00
Thomas Müller
289accc31b
Merge pull request #8159 from owncloud/mobile-sidebar-swipe
...
Mobile sidebar swipe
2014-06-06 11:27:04 +02:00
Jörn Friedrich Dreyer
2801f0f222
use non static access to search
2014-06-06 11:02:05 +02:00
Vincent Petry
b2bae9313d
Fixed viewer mode for sidebar swipe
2014-06-06 10:04:28 +02:00
Bjoern Schiessle
0b2ae314c7
check if permissions exists
2014-06-06 09:56:02 +02:00
Robin Appelman
60ea4388ed
Limit permissions to share permissions
2014-06-06 09:56:02 +02:00
Bjoern Schiessle
86d7371d0c
fix unshareFromSelf()
2014-06-06 09:56:02 +02:00
Bjoern Schiessle
09970e1816
update unit tests and make sure that we return the right permissions for files within a shared folder and for the shared folder itself
2014-06-06 09:56:02 +02:00
Bjoern Schiessle
574de2d91b
the mount point always have delete permissions to allow unmount
2014-06-06 09:56:01 +02:00
Bjoern Schiessle
ca6631a710
add some tests
2014-06-06 09:56:01 +02:00
Bjoern Schiessle
ad5d8d7980
nake sure ti create new db entry when user renames a group share
2014-06-06 09:56:01 +02:00
Robin Appelman
ea07f0a18e
Fix unit test
2014-06-06 09:56:01 +02:00
Robin Appelman
28615cca9c
Fix unit tests
2014-06-06 09:56:01 +02:00
Bjoern Schiessle
a5752a8463
fix db query
2014-06-06 09:56:01 +02:00
Robin Appelman
42a362f249
Fix phpdoc and comments
2014-06-06 09:56:01 +02:00
Bjoern Schiessle
501f98f084
update share API tests, file shares never have delete permissions
2014-06-06 09:56:00 +02:00
Bjoern Schiessle
9a48e87253
make sure that we have a path relative to data/user/files to work with
2014-06-06 09:56:00 +02:00
Bjoern Schiessle
0ce07bb6c4
update mount point if file_target changed
2014-06-06 09:56:00 +02:00
Bjoern Schiessle
844b1e3fc6
add additional unit tests
2014-06-06 09:56:00 +02:00
Bjoern Schiessle
cf5eb0fef5
remove unused variable
2014-06-06 09:56:00 +02:00
Bjoern Schiessle
24f3f6823e
get unique_name value directly from the share array
2014-06-06 09:56:00 +02:00
Bjoern Schiessle
5132ae5e69
fix mount point move up if the parent no longer exists
2014-06-06 09:56:00 +02:00
Bjoern Schiessle
884b9a0ecf
bring back updateFileTarget() got lost during last rebase
2014-06-06 09:56:00 +02:00
Bjoern Schiessle
329bfd81c3
remove encryption keys if user unshares a file
2014-06-06 09:55:59 +02:00
Bjoern Schiessle
1b0b977678
remove share mount
2014-06-06 09:55:59 +02:00
Robin Appelman
dea5219244
Fix folder name for storage root
2014-06-06 09:55:59 +02:00
Bjoern Schiessle
bf5e9357fc
don't allow to share single files with delete permissions, user should only be possible to unshare a single file but never to delete it
2014-06-06 09:55:59 +02:00
Robin Appelman
a66c2e6a47
Fix the removeMount for personal mounts
2014-06-06 09:55:59 +02:00
Robin Appelman
14ce44acc8
Move shared mount moving from the storage to the mount
2014-06-06 09:55:59 +02:00
Robin Appelman
cabe2873c4
Make personal external mount points (re)movable from the files app
2014-06-06 09:55:59 +02:00
Jenkins for ownCloud
ca739a59f0
[tx-robot] updated from transifex
2014-06-06 01:57:10 -04:00
Jan-Christoph Borchardt
9063a25bb4
slightly widen sidebar to 250px, works better with apps and on mobile
2014-06-05 21:19:28 +02:00
Jörn Friedrich Dreyer
9b63f945e3
decode filename for scrollto
2014-06-05 19:23:44 +02:00
Jan-Christoph Borchardt
990405d6ee
fix position of sidebar toggle, fix Files controls position problems
2014-06-05 17:21:49 +02:00
Thomas Müller
e9011a8c55
adding unit tests for encryption data migration
2014-06-05 16:54:04 +02:00
Bjoern Schiessle
eb29b2984c
use oc_preferences instead of oc_encryption to store encyption settings
2014-06-05 16:54:04 +02:00
Arthur Schiwon
928945ec7e
fix typo in var name
2014-06-05 16:16:08 +02:00
Jan-Christoph Borchardt
dca5a03f8b
fix files multiselect bar now that the app list is gone
2014-06-05 13:23:08 +02:00
Thomas Müller
e34b51124b
Merge pull request #8894 from owncloud/public-share-js-overwrite
...
Dont overwrite OCA.Sharing
2014-06-05 13:04:30 +02:00
Thomas Müller
f955209a5a
Merge pull request #8890 from owncloud/cleanup-trashsizes-table-master
...
table files_trashsizes was still used in some locations -> removed
2014-06-05 13:00:50 +02:00
Robin Appelman
690e0b5070
Dont overwrite OCA.Sharing
2014-06-05 12:52:08 +02:00
Thomas Müller
d0eb8f8668
Merge pull request #8880 from owncloud/webdav-read-permissions
...
Use the permissions exposed by ownCloud for webdav external storages
2014-06-05 11:38:02 +02:00
Bernhard Posselt
844c6c3328
use slide toggle for files app
2014-06-05 11:26:24 +02:00
Vincent Petry
e0c4e960d9
Merge pull request #8861 from owncloud/share-overview-linklist
...
Added Shared with link sidebar section in files app
2014-06-05 10:59:54 +02:00
Thomas Müller
1c20c72efe
Merge pull request #8620 from owncloud/design-navigation-two
...
Toggle app navigation not only on mobile, but on desktop as well
2014-06-05 10:53:22 +02:00
Thomas Müller
6fcd135d0e
table files_trashsizes was still used in some locations -> removed
2014-06-05 10:44:32 +02:00
icewind1991
09cc7c2d44
Merge pull request #8862 from owncloud/share-overview-fixmimetype
...
Fix mime type returning for shared with others files
2014-06-05 10:29:03 +02:00
Thomas Müller
ff3ded6cb2
Merge pull request #8852 from owncloud/kill-permissions-master
...
Kill permissions table
2014-06-05 10:05:05 +02:00
Thomas Müller
da3974bcb2
- drop permissions table and related code
...
- the file/folder's permission is now stored in the file cache
- BackGroundWatcher has been removed - this has meanwhile be replaced by occ files:scan which can be executed in a cron jobs
- increase version to trigger database migration
2014-06-05 08:22:01 +02:00
Jenkins for ownCloud
cb61d8a226
[tx-robot] updated from transifex
2014-06-05 01:57:20 -04:00
Thomas Müller
c044ff99ce
Merge pull request #8724 from owncloud/update-sabre-2.0
...
Update SabreDAV to 1.8.10
2014-06-04 23:05:34 +02:00
Morris Jobke
7a20d22daa
Merge pull request #8824 from owncloud/mail_template_editing_in_webui
...
minimal mail template editor for administrators
2014-06-04 18:44:44 +02:00
Robin Appelman
9eb177e8bc
Use the permissions exposed by ownCloud for webdav external storages
2014-06-04 18:19:52 +02:00
Thomas Müller
a2db53b928
Merge pull request #8471 from owncloud/versioning_no_longer_track_the_size
...
[versioning] let the file cache track the size of the versions
2014-06-04 18:19:48 +02:00
Morris Jobke
ca43fba513
Merge pull request #8791 from owncloud/share-overview-sharewithstatus
...
Update share action text to display owner/recipients
2014-06-04 17:04:30 +02:00
Jan-Christoph Borchardt
411e6525b1
remove obsolete position rule from files app
2014-06-04 16:50:55 +02:00
Thomas Müller
fc1d6f4c3c
fixes during test
2014-06-04 15:01:36 +02:00
Jan-Christoph Borchardt
e2e05c4798
adjust controls bar position for removed nav bar
2014-06-04 14:29:46 +02:00
Thomas Müller
76e04027bc
Upgrade SabreDAV to 1.8.10
...
Updating SabreDAV namespaces
2014-06-04 12:22:23 +02:00
Vincent Petry
816db7aef1
Fixed wording to "Shared by link"
2014-06-04 11:32:30 +02:00
Vincent Petry
c88509902e
Fix mime type returning for "shared with others" files
...
Use "path" instead of "file_target", as the latter is not always set /
reliable.
2014-06-04 11:26:03 +02:00
Vincent Petry
b3fdda1751
Added "Shared with link" sidebar section in files app
...
Added section to only show link shares.
Please note that the filtering is currently done on the client side
which might not be the most efficient way of doing it.
2014-06-04 11:10:11 +02:00
Vincent Petry
af6a65cbf3
Do not update action icon recipients for file list
...
Since the files app doesn't have the recipient information on load it
cannot initially render the recipients in the action icons.
For this reason the action icon will not be updated with the recipients
after changing the shares, for consistency.
2014-06-04 10:48:01 +02:00
Vincent Petry
07f1b263c9
Use recipient display names when updating shares in the UI
...
Since OC.Share didn't have any array containing the list of shares for
the current file, OC.Share.currentShares has been introduced to contain
the full share item structure instead of the reduced one
OC.Share.itemShares.
The event "sharesChanged" is now passing OC.Share.currentShares, which
itself includes the display name to be displayed for the recipients in
the action icon.
2014-06-04 10:37:04 +02:00
Thomas Müller
4ab77f90d2
Merge pull request #8662 from owncloud/f-lock
...
f-lock
2014-06-04 10:26:02 +02:00
Thomas Müller
9e31118675
Merge pull request #8842 from owncloud/ldap_cli_methods
...
command line tools to see, modify and test existing LDAP configurations
2014-06-04 09:37:04 +02:00
Thomas Müller
86623358f0
Merge pull request #8849 from owncloud/trash_expire_fix
...
get files in trash from file cache
2014-06-04 09:36:40 +02:00
Thomas Müller
9f3fcf036c
fixing typo
2014-06-04 09:36:27 +02:00
Jan-Christoph Borchardt
6b2b903ea6
Merge pull request #8468 from owncloud/remove-infieldlabels
...
Remove infieldlabels
2014-06-04 09:28:20 +02:00
Thomas Müller
917f389747
workaround to get the unit test going
2014-06-04 08:21:28 +02:00
Jenkins for ownCloud
f5c4754c2b
[tx-robot] updated from transifex
2014-06-04 01:57:48 -04:00
Bjoern Schiessle
2c8288d8f9
get the storage from the view
2014-06-04 07:55:46 +02:00
Bjoern Schiessle
3a698bce6e
don't ask for fileInfo if we already have one
2014-06-04 07:55:45 +02:00
Bjoern Schiessle
e6712bc12e
make sure to close the stream at the end of each test
2014-06-04 07:55:45 +02:00
ringmaster
dc1e3620d2
Continued flock work.
2014-06-04 07:55:44 +02:00
ringmaster
5365ae416e
flock changes. Work in progress.
2014-06-04 07:55:44 +02:00
Thomas Müller
6764d5b122
Merge pull request #8698 from owncloud/sharing_improve_permissions
...
get permissions directly from share storage to avoid additional db calls
2014-06-03 19:13:51 +02:00
Thomas Müller
70ae7fa091
Fix casing and PHPDoc
2014-06-03 19:10:18 +02:00
blizzz
21d1e5eccc
Merge pull request #7930 from owncloud/fix_7785_master
...
LDAP: put out fetching of user meta data into a fully tested class of it...
2014-06-03 19:09:33 +02:00
Thomas Müller
8ee15025f0
Fix merge conflict
2014-06-03 19:05:21 +02:00
Jörn Friedrich Dreyer
b5a145b297
convert mail template editor to app framework for a restful api
2014-06-03 16:53:03 +02:00
Morris Jobke
f87a91fa00
Merge pull request #8837 from owncloud/issue/8720
...
Fix cursor and background of app navigation
2014-06-03 16:46:04 +02:00
Bjoern Schiessle
05cf34ea1f
get files in trash from file cache
2014-06-03 16:45:11 +02:00
Thomas Müller
cfc1d5623e
Merge pull request #8840 from owncloud/share_settings
...
by default don't show option to send mail notifications for shares
2014-06-03 16:42:44 +02:00
Jan-Christoph Borchardt
4ef94ddd2e
infield label removal: remove last occurences of infield labels
2014-06-03 15:30:09 +02:00
Jan-Christoph Borchardt
69e5d5b8c0
remove specific sidebar size from Files app
2014-06-03 13:24:44 +02:00
Arthur Schiwon
e962999896
get rid of @read in PHP doc after rebase
2014-06-03 13:01:14 +02:00
Arthur Schiwon
ba82d80f32
adjust group tests
2014-06-03 12:59:11 +02:00
Arthur Schiwon
3fed96af0e
clean up
2014-06-03 12:59:11 +02:00
Arthur Schiwon
f9a9085faf
class descriptions
2014-06-03 12:59:10 +02:00
Arthur Schiwon
5336e9a156
newlines
2014-06-03 12:59:10 +02:00
Arthur Schiwon
d52fbd7e55
adjust test to changed convention in storing quota
2014-06-03 12:59:10 +02:00
Arthur Schiwon
342e1fd3bf
port of PR #8038
2014-06-03 12:59:10 +02:00
Arthur Schiwon
11f7823e1b
precaution: lowercase string for comparison
2014-06-03 12:59:10 +02:00
Arthur Schiwon
e07ebdd7d0
adjust user backend test
2014-06-03 12:59:10 +02:00
Arthur Schiwon
e32fa3de4a
fix parameter order
2014-06-03 12:59:10 +02:00
Arthur Schiwon
b0d1b2557c
adjust Access test
2014-06-03 12:59:09 +02:00
Arthur Schiwon
6d64d7ec3f
LDAP: put out fetching of user meta data into a fully tested class of its own and update them (mail, quota, etc.) directly after mapping. Fixes #7785 properly on master
2014-06-03 12:59:09 +02:00
Arthur Schiwon
75d320cc91
fix description texts
2014-06-03 12:36:42 +02:00
Arthur Schiwon
4bfb162558
command line tools to see, modify and test existing LDAP configurations
2014-06-03 12:35:18 +02:00
Thomas Müller
d3e830e938
Merge pull request #8729 from owncloud/add-phpseclib-master
...
use phpseclib from 3rdparty
2014-06-03 12:19:04 +02:00
Thomas Müller
17cbfc714a
use phpseclib from 3rdparty
...
rename class Crypt_Blowfish to Legacy_Crypt_Blowfish
2014-06-03 12:18:30 +02:00
Joas Schilling
1d0ac9a2c5
Fix tests
2014-06-03 11:45:53 +02:00
Bjoern Schiessle
8e583f55dc
set "allow users to send mail notification for shared files default" setting to "no" now that we have the activity app
2014-06-03 11:29:28 +02:00
Vincent Petry
1297b2b883
Multiple fixes to sharing overview
...
- scrolling to next page now correctly renders share icons
- reshareing/unsharing a reshare will now still keep "Shared by" label
2014-06-03 11:04:57 +02:00
Joas Schilling
74e2a4b154
Use active instead of hover for active sidebar option
...
Fix #8720
2014-06-03 09:57:18 +02:00
Joas Schilling
74c647bb6a
Do not overwrite cursor in sidebar
2014-06-03 09:55:50 +02:00
Morris Jobke
7ad7f59162
fix empty file handling option
2014-06-03 09:38:19 +02:00
Jan-Christoph Borchardt
6270902650
Merge pull request #8821 from owncloud/kill-zip-download-restriction
...
drop allowZIPdownload and maxZIPSize as options
2014-06-03 01:47:40 +02:00
Frank Karlitschek
f12a5248a3
Merge pull request #8820 from owncloud/design-details
...
Design details
2014-06-02 21:26:43 +02:00
Bjoern Schiessle
916f859377
check if it is a share storage
2014-06-02 20:39:20 +02:00
Thomas Müller
2a10e78c58
no need to empty array in a special way
2014-06-02 20:17:40 +02:00
Bjoern Schiessle
e0a5f3b570
get permissions directly from share storage to avoid additional db calls
2014-06-02 20:17:40 +02:00
Jörn Friedrich Dreyer
37afab87b5
minimal mail template editor for administrators, refs #7177
2014-06-02 19:22:58 +02:00
Thomas Müller
2bb902d028
use OC_DB::dropTable()
2014-06-02 18:57:53 +02:00
Bjoern Schiessle
a7f6a051ad
return size '0' if the trashbin folder doesn't exists yet
2014-06-02 18:56:04 +02:00
Bjoern Schiessle
7ad0fee0b5
let file cache handle the versions size
2014-06-02 18:55:13 +02:00
Vincent Petry
640fbc016d
Now using shareOwner for the share owner
...
Makes it consistent with the regular file list fileData
2014-06-02 18:52:31 +02:00
Morris Jobke
da090099f4
fix unit tests
2014-06-02 18:39:52 +02:00
Morris Jobke
9a67986473
add OCP\Config:deleteSystemValue
2014-06-02 18:31:43 +02:00
Morris Jobke
390d8e53b4
Merge pull request #8676 from owncloud/encryption_improvements
...
cleanup encryption code, improved return codes
2014-06-02 18:28:18 +02:00
Vincent Petry
0944565f60
More unit tests and fixes for share
2014-06-02 18:08:56 +02:00
Morris Jobke
dd8b7b7af8
Merge pull request #8613 from owncloud/filesize-alignment
...
Improve aligment of file size
2014-06-02 17:37:53 +02:00
Jan-Christoph Borchardt
cd61fb06eb
move Deleted Files to bottom of sidebar
2014-06-02 17:33:42 +02:00
Morris Jobke
bdfad3440c
fix success status symbol to a circle
2014-06-02 17:25:08 +02:00
Morris Jobke
079b709f28
bump version
2014-06-02 16:47:15 +02:00
Morris Jobke
57ef089aac
drop allowZIPdownload and maxZIPSize as options
2014-06-02 16:29:03 +02:00
Jan-Christoph Borchardt
3b4004f9e5
more subtle hover effect on sortable column, text instead of background
2014-06-02 16:23:22 +02:00
Vincent Petry
d677e3860d
Added unit tests for share.js and share icon
2014-06-02 15:59:06 +02:00
Jan-Christoph Borchardt
a447caf8d3
fix misalignment of modified dates, shift to right
2014-06-02 15:55:49 +02:00
Frank Karlitschek
51602f67e0
Merge pull request #8712 from owncloud/l10n-fully-translatable-webdav
...
fully translatable user_webdav
2014-06-02 15:53:18 +02:00
Jan-Christoph Borchardt
708758f34e
remove unused table sizing CSS
2014-06-02 15:52:57 +02:00
Morris Jobke
5d457dafc1
display "<1 kB" for really small files
...
* added parameters for humanFileSize to trigger that behaviour
* add unit tests for that
2014-06-02 15:33:09 +02:00
Bjoern Schiessle
b16b17f920
ceanup encryption code, improved return codes
2014-06-02 13:15:11 +02:00
Vincent Petry
7961d4a87e
Update share action text to display owner/recipients
...
- when a share was changed, update the share action text
- added file data attribute "data-share-recipients"
2014-06-02 12:12:57 +02:00
Arthur Schiwon
f0e69b2b99
Port LDAP: fix filter can be reset and broken after upgrade from OC 5 #8579
...
LDAP: set filter mode to raw, so filters will not be changed and broken after upgrade from oc5, when visiting the LDAP settings and opening filter tabs
get the correct version number for compare -.-
bump version and don't overwrite values on next update if not necessary
simpler and better readable assignment
2014-06-02 12:08:01 +02:00
Jenkins for ownCloud
d39216c5e7
[tx-robot] updated from transifex
2014-06-02 01:54:37 -04:00
Jenkins for ownCloud
36b0c599f5
[tx-robot] updated from transifex
2014-06-01 01:55:19 -04:00
Jenkins for ownCloud
cff9440a37
[tx-robot] updated from transifex
2014-05-31 01:55:46 -04:00
Thomas Müller
5dd3e34f57
Merge pull request #8444 from owncloud/cleanup-list-code
...
Cleanup code of files_sharing/ajax/ a little bit
2014-05-30 22:40:28 +02:00
Lukas Reschke
b7f163a701
Merge pull request #8695 from owncloud/jserrorfixes
...
Fixed undefined object error that appears after a delay
2014-05-30 17:20:09 +02:00
Vincent Petry
c8a19adc3a
Merge pull request #8779 from owncloud/sel-webdav-onclick
...
select webdav address on click
2014-05-30 17:18:54 +02:00
Lukas Reschke
756b158230
Merge pull request #8663 from owncloud/files-dndissue
...
Fixed drag and drop from external files, added tests
2014-05-30 16:28:20 +02:00
Volkan Gezer
d7e63d8fab
select webdav address on click
2014-05-30 15:39:25 +02:00
icewind1991
2ba5701b1a
Merge pull request #8778 from owncloud/storage-instanceof
...
Add storage->instanceOfStorage() to handle instanceof with storage wrappers
2014-05-30 14:58:59 +02:00
Vincent Petry
7fac2b62e9
Fixed warning when file_target is not set
...
In some cases (like in the unit tests) "file_target" is not set yet
whenever the target file system hasn't been mounted yet.
2014-05-30 12:35:04 +02:00
Vincent Petry
5e4e773446
Removed "Share with" column
2014-05-30 10:06:30 +02:00
Vincent Petry
e084183d1e
Added owner display name in action
2014-05-30 10:06:29 +02:00
Vincent Petry
1d9129eac3
Sharing overview fixes and unit tests
...
- Fixed renaming and fileActionsReady event
- Added unit tests for shares list
- Fixed public page with defer
- Fixed file actions in sharing overview
- Fixed sharing counterpart list (10 entries max)
- Fixed file path attribute to be used in download action
- Fix sharing list headers
- OC.Share icons now operate on fileList instance
- Fix OC.Share.updateIcon when more than one list in DOM
2014-05-30 10:06:29 +02:00
Vincent Petry
6fbf4d8548
Fix table header colors
...
Table headers should be 999 even when using links (introduced by the
sorting feature)
When selecting with checkboxes, they must appear black.
2014-05-30 10:06:29 +02:00
Vincent Petry
0879a63320
Mimetype for sharing overview
2014-05-30 10:06:29 +02:00
Vincent Petry
ef59c69dc8
Distinguish legacy file actions from regular file actions
...
Legacy file actions are registered by legacy apps through
window.FileActions.register(). These actions can only be used by the
main file list ("all files") because legacy apps can only deal with a
single list / container.
New file actions of compatible apps must be registered through
OCA.Files.fileActions. These will be used for other lists like the
sharing overview.
Fixed versions and sharing actions to use OCA.Files.fileActions, which
makes them available in the sharing overview list.
2014-05-30 10:06:29 +02:00
Vincent Petry
fa32243d84
Small fixes to sharing overview
...
- Removed file size from file summary in sharing overview
- Fixed document title
- Fixed empty content text for shared overview
2014-05-30 10:06:29 +02:00
Vincent Petry
06e53b359a
Added "dir" in file actions handler context and fixed versions
...
Added "dir" in file actions handler context so that handlers can know
what the path of the file was without having to look it up from the file
list.
Fixed versions app to use the context.dir instead of the old $('#dir')
element. This makes the versions popup work in the sharing overview.
2014-05-30 10:06:29 +02:00
Vincent Petry
d21b8108c8
Fixed navigation order
2014-05-30 10:06:29 +02:00
Vincent Petry
89ff2857fc
Add unit tests for fileActionsReady
2014-05-30 10:06:29 +02:00
Vincent Petry
8bdce6698c
Added unit test for file action context argument
2014-05-30 10:06:29 +02:00
Vincent Petry
0f105ec747
Removed selection checkboxes
2014-05-30 10:06:29 +02:00
Vincent Petry
85648def56
Fixed sharing permissions
2014-05-30 10:06:29 +02:00
Vincent Petry
60bcdc550e
Fixed file actions for sharing views
...
FileActions can now be clone to be use for separate file list views
without having the side-effect of affecting the main file list view.
Added "Open" action in sharing overview file lists to redirect to the
regular file list when clicking on a folder.
2014-05-30 10:06:29 +02:00
Vincent Petry
279ede33af
Improved FileActions with context
...
A context hash is now passed to file action handlers which makes it
possible to have file list specific file actions.
2014-05-30 10:06:29 +02:00
Vincent Petry
9baf47c2b4
Group shares by type
2014-05-30 10:06:29 +02:00
Vincent Petry
6ebc436505
Added sharing overview page (WIP)
...
- added sharing overview entries in the sidebar
- use OCS Share API to get the list of files
2014-05-30 10:06:29 +02:00
Bjoern Schiessle
dbbb6c5945
extend OCS Share API to allow the user to ask for files shared with him
2014-05-30 10:06:28 +02:00
Jenkins for ownCloud
929882a32a
[tx-robot] updated from transifex
2014-05-30 01:55:11 -04:00
Lukas Reschke
b14564480e
Merge pull request #8773 from owncloud/l10n-tipsy-delete
...
show delete hint text on hovering trash
2014-05-29 21:30:50 +02:00
Robin McCorkell
32a50563d3
Merge pull request #8771 from owncloud/enc_get_mount_from_mountmanager
...
get mount point from mount manager
2014-05-29 17:52:28 +01:00
Robin Appelman
99d46af0b4
Use instanceOfStorage instead of instanceof
2014-05-29 13:52:58 +02:00
Jenkins for ownCloud
368006c7af
[tx-robot] updated from transifex
2014-05-29 01:54:40 -04:00
Volkan Gezer
b713f15b99
document always links to the current version of OC
2014-05-29 01:30:24 +02:00
Volkan Gezer
43c6ece31a
fully translatable user_webdav
2014-05-29 00:23:23 +02:00
Volkan Gezer
f7cc07ba41
show delete hint text on hovering trash
2014-05-28 20:27:28 +02:00
Bjoern Schiessle
9ed5083efd
get mount point from mount manager
2014-05-28 17:28:31 +02:00
Jenkins for ownCloud
80641cae72
[tx-robot] updated from transifex
2014-05-28 01:56:09 -04:00
Thomas Müller
4e2cdb2f8a
Merge pull request #8713 from owncloud/typo-files-encr
...
fix grammar
2014-05-27 23:03:32 +02:00
Volkan Gezer
8eee8e76d1
forgotten infobox messages translations
2014-05-27 16:39:22 +02:00
Vincent Petry
a9661962fe
Merge pull request #8736 from owncloud/appinfo-newrequirefields
...
App info new fields "requiremin" and "requiremax"
2014-05-27 14:28:47 +02:00
Vincent Petry
d38f867055
Merge pull request #8721 from owncloud/sharing_don_lose_filesize
...
don't lose file size during rename
2014-05-27 12:25:55 +02:00
Vincent Petry
c64e920b4d
Adjust core apps to use "requiremin" instead of "require"
...
Also added a few missing authors.
2014-05-27 11:54:44 +02:00
Vincent Petry
a79f3fd1c0
Merge pull request #8728 from owncloud/sharing_fix_reshare
...
allow resharing of files with only share permissions
2014-05-27 09:02:52 +02:00
Jenkins for ownCloud
a756666585
[tx-robot] updated from transifex
2014-05-27 01:54:54 -04:00
Bjoern Schiessle
36f63ea990
allow resharing of files with only share permissions
2014-05-26 20:32:24 +02:00
Bjoern Schiessle
95bd7fee9c
don't lose file size during rename
2014-05-26 14:11:33 +02:00
Jenkins for ownCloud
790c0e8e7c
[tx-robot] updated from transifex
2014-05-26 01:55:36 -04:00
Volkan Gezer
59125cb796
fix grammar
2014-05-25 20:42:52 +02:00
Volkan Gezer
f880734827
make user_ldap fully translatable
2014-05-25 14:41:59 +02:00
Thomas Müller
3348019bfa
Merge pull request #8705 from wakeup/master
...
fix typo
2014-05-25 11:00:34 +02:00
Jenkins for ownCloud
3029029afd
[tx-robot] updated from transifex
2014-05-25 01:54:35 -04:00
Volkan Gezer
426f492f57
fix typo
...
Suggested by [mnestis](https://www.transifex.com/accounts/profile/mnestis/ ) on transifex
2014-05-24 14:36:10 +02:00
Lukas Reschke
1b215b0131
Merge pull request #8688 from owncloud/public-image-positioning
...
Show less whitespace above publicly shared images
2014-05-24 12:49:12 +02:00
Jenkins for ownCloud
2afdd1bf1a
[tx-robot] updated from transifex
2014-05-24 01:55:34 -04:00
Björn Schießle
864cd2455c
Merge pull request #8699 from owncloud/sharing_improvements
...
fix share label creation
2014-05-23 20:53:32 +02:00
Bjoern Schiessle
ff4bb3a9e6
fix share label creation
2014-05-23 16:21:15 +02:00
Vincent Petry
caf283615d
Fixed undefined object error that appears after a delay
...
Now binding properly with the file list instance object.
2014-05-23 16:13:35 +02:00
Jan-Christoph Borchardt
7be0ce6ada
remove noise texture from interface (not necessary, and blurry on high-res)
2014-05-23 14:15:36 +02:00
Robin Appelman
10c1fc8d24
Show less whitespace above publicly shared images
2014-05-23 13:36:16 +02:00
Björn Schießle
71e1d919de
Merge pull request #8675 from owncloud/sharing-improvements
...
Sharing improvements
2014-05-23 06:41:34 -04:00
Vincent Petry
0b0e038b8b
Merge pull request #8671 from owncloud/log-upload-errors
...
php upload errors are written to log
2014-05-23 11:33:14 +02:00
Bjoern Schiessle
3b279c9056
prevent default action when clicking on the share notification
2014-05-23 11:17:13 +02:00
Thomas Müller
6ffb139a46
Merge pull request #8658 from realriot/master
...
Changed access mode for Dropbox to 'auto'
2014-05-23 10:14:09 +02:00
Robin Appelman
157b139b57
Dont scale up the preview for publicly shared images
2014-05-22 16:45:51 +02:00
Bjoern Schiessle
11aa2cf74b
always check for unique filename, if a file gets added from outside the mount
...
point should be adjusted to ne unique again
2014-05-22 14:31:22 +02:00
Bjoern Schiessle
1166d62d9b
fileList needs be be declared before the if-statement
2014-05-22 14:31:16 +02:00
Björn Schießle
050df76830
Merge pull request #8599 from owncloud/sharing_disable_for_groups
...
allow admin to disable sharing for specific groups of users
2014-05-22 08:19:27 -04:00
Thomas Müller
201cc59fe0
php upload errors are written to log
2014-05-22 12:20:27 +02:00
Vincent Petry
d6e1643a0e
Fix dropping files below the table
2014-05-22 11:16:42 +02:00
Bjoern Schiessle
12338e0ef0
allow admin to disable sharing for specific groups of users
2014-05-22 10:43:44 +02:00
Robin McCorkell
856c48bc25
Use default priority of 100 if backend default is not set
2014-05-21 22:31:18 +01:00
Robin McCorkell
da03ef25d9
Add priority overriding comments
2014-05-21 22:29:16 +01:00
Robin McCorkell
0a8a319915
Fix priority merging logic and add unit test
2014-05-21 22:18:22 +01:00
Robin McCorkell
eae45dca71
Add unit tests
2014-05-21 22:18:22 +01:00
Robin McCorkell
2254678a0c
Use constants for priority type and add comments
2014-05-21 22:17:21 +01:00
Robin McCorkell
a0ccb060fa
Use more strict type comparisons
2014-05-21 22:17:21 +01:00
Robin McCorkell
e4d3ee7866
Preserve priority if already set
2014-05-21 22:17:21 +01:00
Robin McCorkell
9151d72507
Treat 'all users' as 'global'
...
A mount applicable to all users is as good a definition of global as can be
2014-05-21 22:17:21 +01:00
Robin McCorkell
05642733a3
Add storage priority support
...
Each storage backend has a default priority, assigned to any system mounts
created in ownCloud. mount.json can be manually modified to change these
priorities.
The priority order is as follows:
* Personal
* User
* Group
* Global
Within each mount type, the mount with the highest priority is active.
The storage backend defaults were chosen to be the following:
* Local - 150
* Remote storage - 100
* SMB / CIFS with OC login - 90
2014-05-21 22:17:21 +01:00
Björn Schießle
14a953fbe0
Merge pull request #8416 from owncloud/sharing_keep_mount_points_visible
...
[sharing] move the mount point up if the parent folder no longer exists
2014-05-21 14:07:49 -04:00
Vincent Petry
542b395858
Fixed drag and drop from external files, added tests
...
- Fixed detection whether the drop zone is inside the currently visible
table
- Now dragging outside the table does nothing instead of uploading,
because the user might drop on the sidebar
- Added unit tests for the drop handler
2014-05-21 17:38:09 +02:00
Bjoern Schiessle
5f403f3e92
move the mount point up if a share is mounted to a subfolder and the subfolder no longer exists
2014-05-21 13:19:17 +02:00
Björn Schießle
88d26aac7b
Merge pull request #8612 from owncloud/share-updateshareiconsafterrename
...
[master] Fixed issues with renaming
2014-05-21 06:27:07 -04:00
Björn Schießle
319942bccb
Merge pull request #8646 from owncloud/publicshare-fixes
...
[master] Fixed for public link page
2014-05-21 05:41:35 -04:00
Vincent Petry
9b23a210c9
Merge pull request #8637 from owncloud/enc_improved_error_handling
...
[encryption] improved error handling during password change
2014-05-21 09:57:45 +02:00
Sascha Schmidt
4b2888cd9a
Changed access mode for Dropbox to 'auto'
2014-05-21 09:40:03 +02:00
Vincent Petry
7d98bcf9a2
Fixed JS issues in public page
...
- fixed subdir detection when uploading into subdir
- add class detection before overriding to avoid JS errors
2014-05-20 13:37:58 +02:00
Vincent Petry
160a2bc36f
Fixed download URL in public page
2014-05-20 13:24:52 +02:00
Jenkins for ownCloud
40fc1d5b4b
[tx-robot] updated from transifex
2014-05-20 01:54:53 -04:00
Thomas Müller
51a6764f31
Merge branch 'master' into cleanup-list-code
...
Conflicts:
apps/files_sharing/ajax/list.php
2014-05-19 20:52:25 +02:00
Morris Jobke
dc36d30953
Remove all occurences of @brief and @returns from PHPDoc
...
* test case added to avoid adding them later
2014-05-19 17:50:53 +02:00
Thomas Müller
95741f3936
Merge pull request #8435 from owncloud/fix-8322-master
...
Expose permission via WebDAV
2014-05-19 16:52:03 +02:00
Bjoern Schiessle
d9f715bdad
only start migration if the encryption was initialized; allow to overwrite keys if no files exists
2014-05-19 15:53:50 +02:00
Andreas Fischer
6c4b650524
Merge pull request #8585 from owncloud/phpdoc-improvements-apps
...
PHPDoc improvements /apps
* owncloud/phpdoc-improvements-apps:
Fix whitespace issues
Reduce double-space with single-space.
Remove spaces around | operator in doc block.
Fix more missing or broken PHPDoc
PHPDoc fixes for user_ldap
Fix PHPDoc in /apps
2014-05-19 14:08:42 +02:00
Jenkins for ownCloud
d52252998a
[tx-robot] updated from transifex
2014-05-19 01:54:46 -04:00
Jenkins for ownCloud
a7509e5fd9
[tx-robot] updated from transifex
2014-05-18 01:55:01 -04:00
Jenkins for ownCloud
a1b356c7b6
[tx-robot] updated from transifex
2014-05-17 01:57:38 -04:00
Robin McCorkell
e7aebc5c32
Fix whitespace issues
2014-05-16 22:23:36 +01:00
Andreas Fischer
5b1ffd7611
Reduce double-space with single-space.
2014-05-16 22:21:57 +01:00
Andreas Fischer
e04d956cac
Remove spaces around | operator in doc block.
2014-05-16 22:21:57 +01:00
Robin McCorkell
6930ae22e4
Fix more missing or broken PHPDoc
2014-05-16 22:21:57 +01:00
Robin McCorkell
a17f9111a0
PHPDoc fixes for user_ldap
2014-05-16 22:21:57 +01:00
Robin McCorkell
c4f1de63a8
Fix PHPDoc in /apps
2014-05-16 22:21:57 +01:00
Björn Schießle
42b99b6d0f
Merge pull request #8555 from owncloud/sharing_default_expire_only_public_links
...
use default expire date only for link shares
2014-05-16 14:57:11 -04:00
Björn Schießle
b52cb8f557
Merge pull request #8604 from owncloud/sharing_encforce_password
...
allow admin to enforce passwords for public link shares
2014-05-16 12:23:01 -04:00