51602f67e0
Merge pull request #8712 from owncloud/l10n-fully-translatable-webdav
...
fully translatable user_webdav
2014-06-02 15:53:18 +02:00
708758f34e
remove unused table sizing CSS
2014-06-02 15:52:57 +02:00
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
b16b17f920
ceanup encryption code, improved return codes
2014-06-02 13:15:11 +02:00
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
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
d39216c5e7
[tx-robot] updated from transifex
2014-06-02 01:54:37 -04:00
36b0c599f5
[tx-robot] updated from transifex
2014-06-01 01:55:19 -04:00
cff9440a37
[tx-robot] updated from transifex
2014-05-31 01:55:46 -04:00
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
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
c8a19adc3a
Merge pull request #8779 from owncloud/sel-webdav-onclick
...
select webdav address on click
2014-05-30 17:18:54 +02:00
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
d7e63d8fab
select webdav address on click
2014-05-30 15:39:25 +02:00
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
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
5e4e773446
Removed "Share with" column
2014-05-30 10:06:30 +02:00
e084183d1e
Added owner display name in action
2014-05-30 10:06:29 +02:00
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
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
0879a63320
Mimetype for sharing overview
2014-05-30 10:06:29 +02:00
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
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
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
d21b8108c8
Fixed navigation order
2014-05-30 10:06:29 +02:00
89ff2857fc
Add unit tests for fileActionsReady
2014-05-30 10:06:29 +02:00
8bdce6698c
Added unit test for file action context argument
2014-05-30 10:06:29 +02:00
0f105ec747
Removed selection checkboxes
2014-05-30 10:06:29 +02:00
85648def56
Fixed sharing permissions
2014-05-30 10:06:29 +02:00
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
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
9baf47c2b4
Group shares by type
2014-05-30 10:06:29 +02:00
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
dbbb6c5945
extend OCS Share API to allow the user to ask for files shared with him
2014-05-30 10:06:28 +02:00
929882a32a
[tx-robot] updated from transifex
2014-05-30 01:55:11 -04:00
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
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
99d46af0b4
Use instanceOfStorage instead of instanceof
2014-05-29 13:52:58 +02:00
368006c7af
[tx-robot] updated from transifex
2014-05-29 01:54:40 -04:00
b713f15b99
document always links to the current version of OC
2014-05-29 01:30:24 +02:00
43c6ece31a
fully translatable user_webdav
2014-05-29 00:23:23 +02:00
f7cc07ba41
show delete hint text on hovering trash
2014-05-28 20:27:28 +02:00
9ed5083efd
get mount point from mount manager
2014-05-28 17:28:31 +02:00
80641cae72
[tx-robot] updated from transifex
2014-05-28 01:56:09 -04:00
4e2cdb2f8a
Merge pull request #8713 from owncloud/typo-files-encr
...
fix grammar
2014-05-27 23:03:32 +02:00
8eee8e76d1
forgotten infobox messages translations
2014-05-27 16:39:22 +02:00
a9661962fe
Merge pull request #8736 from owncloud/appinfo-newrequirefields
...
App info new fields "requiremin" and "requiremax"
2014-05-27 14:28:47 +02:00
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
c64e920b4d
Adjust core apps to use "requiremin" instead of "require"
...
Also added a few missing authors.
2014-05-27 11:54:44 +02:00
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
a756666585
[tx-robot] updated from transifex
2014-05-27 01:54:54 -04:00
36f63ea990
allow resharing of files with only share permissions
2014-05-26 20:32:24 +02:00
95bd7fee9c
don't lose file size during rename
2014-05-26 14:11:33 +02:00
790c0e8e7c
[tx-robot] updated from transifex
2014-05-26 01:55:36 -04:00
59125cb796
fix grammar
2014-05-25 20:42:52 +02:00
f880734827
make user_ldap fully translatable
2014-05-25 14:41:59 +02:00
3348019bfa
Merge pull request #8705 from wakeup/master
...
fix typo
2014-05-25 11:00:34 +02:00
3029029afd
[tx-robot] updated from transifex
2014-05-25 01:54:35 -04:00
426f492f57
fix typo
...
Suggested by [mnestis](https://www.transifex.com/accounts/profile/mnestis/ ) on transifex
2014-05-24 14:36:10 +02:00
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
2afdd1bf1a
[tx-robot] updated from transifex
2014-05-24 01:55:34 -04:00
864cd2455c
Merge pull request #8699 from owncloud/sharing_improvements
...
fix share label creation
2014-05-23 20:53:32 +02:00
ff4bb3a9e6
fix share label creation
2014-05-23 16:21:15 +02:00
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
7be0ce6ada
remove noise texture from interface (not necessary, and blurry on high-res)
2014-05-23 14:15:36 +02:00
10c1fc8d24
Show less whitespace above publicly shared images
2014-05-23 13:36:16 +02:00
71e1d919de
Merge pull request #8675 from owncloud/sharing-improvements
...
Sharing improvements
2014-05-23 06:41:34 -04:00
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
3b279c9056
prevent default action when clicking on the share notification
2014-05-23 11:17:13 +02:00
6ffb139a46
Merge pull request #8658 from realriot/master
...
Changed access mode for Dropbox to 'auto'
2014-05-23 10:14:09 +02:00
157b139b57
Dont scale up the preview for publicly shared images
2014-05-22 16:45:51 +02:00
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
1166d62d9b
fileList needs be be declared before the if-statement
2014-05-22 14:31:16 +02:00
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
201cc59fe0
php upload errors are written to log
2014-05-22 12:20:27 +02:00
d6e1643a0e
Fix dropping files below the table
2014-05-22 11:16:42 +02:00
12338e0ef0
allow admin to disable sharing for specific groups of users
2014-05-22 10:43:44 +02:00
856c48bc25
Use default priority of 100 if backend default is not set
2014-05-21 22:31:18 +01:00
da03ef25d9
Add priority overriding comments
2014-05-21 22:29:16 +01:00
0a8a319915
Fix priority merging logic and add unit test
2014-05-21 22:18:22 +01:00
eae45dca71
Add unit tests
2014-05-21 22:18:22 +01:00
2254678a0c
Use constants for priority type and add comments
2014-05-21 22:17:21 +01:00
a0ccb060fa
Use more strict type comparisons
2014-05-21 22:17:21 +01:00
e4d3ee7866
Preserve priority if already set
2014-05-21 22:17:21 +01:00
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
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
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
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
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
88d26aac7b
Merge pull request #8612 from owncloud/share-updateshareiconsafterrename
...
[master] Fixed issues with renaming
2014-05-21 06:27:07 -04:00
319942bccb
Merge pull request #8646 from owncloud/publicshare-fixes
...
[master] Fixed for public link page
2014-05-21 05:41:35 -04:00
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
4b2888cd9a
Changed access mode for Dropbox to 'auto'
2014-05-21 09:40:03 +02:00
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
160a2bc36f
Fixed download URL in public page
2014-05-20 13:24:52 +02:00
40fc1d5b4b
[tx-robot] updated from transifex
2014-05-20 01:54:53 -04:00
51a6764f31
Merge branch 'master' into cleanup-list-code
...
Conflicts:
apps/files_sharing/ajax/list.php
2014-05-19 20:52:25 +02:00
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
95741f3936
Merge pull request #8435 from owncloud/fix-8322-master
...
Expose permission via WebDAV
2014-05-19 16:52:03 +02:00
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
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
d52252998a
[tx-robot] updated from transifex
2014-05-19 01:54:46 -04:00
a7509e5fd9
[tx-robot] updated from transifex
2014-05-18 01:55:01 -04:00
a1b356c7b6
[tx-robot] updated from transifex
2014-05-17 01:57:38 -04:00
e7aebc5c32
Fix whitespace issues
2014-05-16 22:23:36 +01:00
5b1ffd7611
Reduce double-space with single-space.
2014-05-16 22:21:57 +01:00
e04d956cac
Remove spaces around | operator in doc block.
2014-05-16 22:21:57 +01:00
6930ae22e4
Fix more missing or broken PHPDoc
2014-05-16 22:21:57 +01:00
a17f9111a0
PHPDoc fixes for user_ldap
2014-05-16 22:21:57 +01:00
c4f1de63a8
Fix PHPDoc in /apps
2014-05-16 22:21:57 +01:00
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
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
7a48f24459
use default expire date only for link shares
2014-05-16 18:12:13 +02:00
5a0281add8
Fixed issues with renaming
...
- summary is now untouched on rename instead of bogus incrementation
- fixes "Share" status icon by only triggring "fileActionsReady" once
- row is now reinserted even when rename is cancelled, this removes the
hacky/buggy code that tried to rename the element back
- added unit tests to cover the fixed cases
2014-05-16 17:42:38 +02:00
b6e14af861
allow admin to enforce passwords for public link shares
2014-05-16 17:41:09 +02:00
d5f60a8eb0
Merge pull request #8610 from owncloud/ie8-filesdndbug
...
Fix drag and drop in IE8
2014-05-16 17:27:50 +02:00
1fb0d5412c
Merge pull request #6260 from owncloud/jan-navigation-filesidebar
...
Files app navigation sidebar
2014-05-16 13:00:35 +02:00
f3d421d24b
Fix drag and drop in IE8
...
For some reason IE8 didn't like the sort function, so using the one from
underscore instead.
2014-05-16 11:25:36 +02:00
43d6650d19
[tx-robot] updated from transifex
2014-05-16 01:55:55 -04:00
6fd084243b
Fixed many issues, clean up
...
- fixed upload and storage statistics
- fixed infinite scroll to use the correct contain for scroll detection
- fixed unit test that sometimes fail for rename case
- controls are now sticky again
- fixed selection overlay to be aligned with the table
- fixed "select all" checkbox that had id conflicts
- fixed public page
- fixed global actions permissions detection
- fix when URL contains an invalid view id
- viewer mode now hides the sidebar (ex: text editor)
- added unit tests for trashbin
- clean up storage info in template (most is retrieved via ajax call now)
2014-05-15 17:51:04 +02:00
9d38e3602b
Namespacing for FileList, FileActions and trashbin app
...
- FileList is now an instantiable class
- FileActions is now in namespace
- added App class for trashbin app
- moved trashbin overrides into classes extending FileList
- replaced many static calls with "this." or "self." to make the classes
reusable/extendable
- new URL parameter "view" to specify which view is shown, for example
"files" or "trashbin"
- added OC.Util.History utility class in core for handling history
- moved URL handling/routing to OCA.Files.App
- popstate will correctly update the current view and notify the view of
the URL change so it can update the current dir
- added JS unitt tests for the trashbin app
- fixed public app to work with the new namespaces
2014-05-15 17:51:04 +02:00
fb10bf4048
Files app navigation can now switch
...
- added new OCA.Files namespace for files classes
- the sidebar can now switch between views/containers
- the trashbin renders in its own container but currently doesn't work
due to overrides
- added app.js as entry point for JS code (ideally all other files should
only contain classes and not trigger anything)
2014-05-15 17:51:04 +02:00
88ebb15f1d
Added navigation manager in files app for the sidebar
...
Apps can now register navigation items into the sidebar of the files app.
For every sidebar item there is a container.
The container's content is rendered based on the script name given at
registration time.
2014-05-15 17:51:04 +02:00
9ccb3279dd
Added app navigation for files app
...
- Added links to trashbin and shared dir
- Moved "WebDAV" settings block to the app nav's settings section
- Added sidebar support in trashbin app as well
2014-05-15 17:51:04 +02:00
818c77684d
Fixed trashbin to use correct class
...
It seems that \OC_Filesystemview has been removed.
Now using the correct class \OC\Files\View()
2014-05-15 15:21:27 +02:00
a0f309bbd8
Merge pull request #8589 from fibsifan/files_external_sftp_port
...
rename URL-fields to Host for SFTP/FTP and SMB external Storage backends
2014-05-15 13:22:22 +01:00
06c084cc3c
changing label "URL" to "Host"
2014-05-15 14:09:10 +02:00
d9d684197a
[tx-robot] updated from transifex
2014-05-15 01:55:53 -04:00
c98edf18cc
Merge pull request #8584 from Bagera/master
...
avoid row resize on filename edit
2014-05-14 10:05:59 +02:00
7b39704c61
Set row height in files table
...
Sets row height to avoid resize when name is edited
2014-05-14 08:32:48 +02:00
c9df98abae
[tx-robot] updated from transifex
2014-05-14 01:55:31 -04:00
166f2af5d8
Merge pull request #8582 from owncloud/remove-outdated-update-sc
...
We do not support updates from 4.5 > 7.0 or even 3.0 > 7.0
2014-05-14 00:28:05 +02:00
58857b8df5
@returns -> @return
2014-05-13 19:09:15 +01:00
55fc693750
@breif -> @brief
2014-05-13 19:09:15 +01:00
5757d02b76
fixes #7949
...
Sets height to form to avoid resizing when filename link is not shown
2014-05-13 20:02:22 +02:00
2d1296bb03
We do not support updates from 4.5 > 7.0
2014-05-13 18:54:43 +02:00
b8de1e5d71
Merge pull request #8398 from owncloud/enc_backup_keys
...
backup the encryption key after the encryption was disabled
2014-05-13 09:25:16 -04:00
a9ac11718e
backup the encryption key after the encryption was disabled so that the user
...
can restore them if needed
2014-05-13 12:35:25 +02:00
08a8a409d6
Extract mount point merging logic into separate function
2014-05-13 00:14:30 +01:00
408189b7e4
Merge pull request #8556 from owncloud/kill-legacy-code-master
...
Kill legacy code master
2014-05-12 20:55:24 +02:00
aea44ee0d5
Merge pull request #8538 from owncloud/make-my-ide-less-complain-about-ldap
...
Use proper PHPDoc and variable names in the LDAP lib
2014-05-12 19:31:43 +02:00
cd7fc5cb80
Use array as type
2014-05-12 19:31:21 +02:00
e0dd69e4e6
remove legacy aka deprecated code: OC_FilesystemView
2014-05-12 16:30:39 +02:00
33987eea83
remove legacy aka deprecated code: OC_Cache
2014-05-12 16:23:33 +02:00
4dd1a49a68
remove legacy aka deprecated code: OC_Filesystem
2014-05-12 16:20:07 +02:00
9a9665f361
Merge pull request #8041 from owncloud/files-sortcolumns
...
File list sorting by clicking on column headers
2014-05-12 12:50:27 +02:00
f4e8de3cbb
[tx-robot] updated from transifex
2014-05-12 01:55:44 -04:00
2ae1be762c
That's bool and not always true
2014-05-11 16:29:59 +02:00
57640742af
Use WizardResult|false instead of mixed
2014-05-11 16:28:50 +02:00
416f8b186d
Use @return instead of @returns
2014-05-11 16:27:18 +02:00
Frank Karlitschek
Jan-Christoph Borchardt
Morris Jobke
Bjoern Schiessle
Vincent Petry
Arthur Schiwon
Jenkins for ownCloud
Thomas Müller
Lukas Reschke
Volkan Gezer
icewind1991
Robin McCorkell
Robin Appelman
Volkan Gezer
Sascha Schmidt
Morris Jobke
Andreas Fischer
fibsifan
jbtbnl
Bagera