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
60f6d82dcd
$owner is not defined here
...
Fixes https://github.com/owncloud/core/issues/8539
2014-05-11 15:34:54 +02:00
cd3ed01483
Fix Typo
...
I guess that should be `default` and not `defautl`, wondering how this ever worked.
2014-05-11 15:24:42 +02:00
fc8be5abc3
Use proper PHPDoc and variable names in the LDAP lib
...
My IDE was so sad about this that it marked the whole file in red and yellow and forced me to fix this.
2014-05-11 15:17:27 +02:00
b6d76e9985
[tx-robot] updated from transifex
2014-05-11 01:57:00 -04:00
0cc7d84e16
Merge pull request #8520 from owncloud/jslint_polishing_in_file_upload
...
polish jslint for files-upload.js
2014-05-10 22:43:50 +02:00
05ea8c8a10
[tx-robot] updated from transifex
2014-05-10 01:55:50 -04:00
f0f059576e
polish jslint for files-upload.js
2014-05-09 15:22:11 +02:00
9919ec48df
[tx-robot] updated from transifex
2014-05-09 01:55:42 -04:00
6e7c274d2e
Merge pull request #8499 from owncloud/shareextstoragemountpointfix
...
Fix sharing of ext storage mount points
2014-05-08 22:35:01 +02:00
af2b7634ee
Merge pull request #8293 from owncloud/files_external_fix_readData
...
Fix issue with personal mount points and sharing
2014-05-08 11:01:54 +02:00
f73a168694
Added unit test for sharing ext storage mount points
2014-05-08 11:00:19 +02:00
28f0e6307f
Fix sharing of ext storage mount points
...
When sharing an ext storage mount point, it will now use the name of the
mount point instead of an empty string for the target path.
2014-05-08 10:03:07 +02:00
390549c286
Merge pull request #8221 from owncloud/type-hinting-sharing
...
Type hinting fixes for sharing
2014-05-08 09:30:50 +02:00
4da6645a94
[tx-robot] updated from transifex
2014-05-08 01:55:39 -04:00
f85e968883
Merge branch 'sharing_cleanup' of github.com:owncloud/core into sharing_cleanup
2014-05-07 17:57:32 +02:00
d3f957c21e
remove error_log output
2014-05-07 17:56:52 +02:00
dbb93074b3
Fix endless loop on windows servers
...
Directory seperator is \ on windows
However we can just check for path != dirname(path) because that is
the same for '' (empty string), '.' and DIRECTORY_SEPARATOR on all OS
2014-05-07 17:38:29 +02:00
31bf2d4b33
we can take the permission directly from the share, no need to call the share api first
2014-05-07 16:49:07 +02:00
799d8ca381
check if we have a fileinfo
2014-05-07 11:47:52 +02:00
bee48f851e
ignore part files
2014-05-07 11:47:27 +02:00
283b483100
[tx-robot] updated from transifex
2014-05-07 01:55:48 -04:00
45f8d2d3ff
Merge pull request #8456 from owncloud/extstorage-unittestssuite
...
Added ext storage app in autotest unit test run
2014-05-05 19:48:35 +02:00
0c8ae6eb66
Added ext storage app in autotest unit test run
...
To make sure that the dynamic mount config and config classes from
external storages are tested, these are now added into the autotest.sh
test run by enabling the app.
2014-05-05 15:03:10 +02:00
1a454f61ed
Merge pull request #8386 from owncloud/fix_6946_master
...
Fix 6946 master
2014-05-05 14:08:45 +02:00
341fcdc37a
Merge pull request #8407 from owncloud/scale-pics-on-public-sharing-master
...
Images on public sharing get downscaled to increase use experience - thi...
2014-05-05 10:12:40 +02:00
51d1e6c8b1
[tx-robot] updated from transifex
2014-05-05 01:55:47 -04:00
2c483fdca2
Add missing \
2014-05-04 15:52:25 +02:00
0b7d9e2668
Cleanup code a little bit
...
- Use OCP\Response constants instead of the HTTP error code
- Use checkAppEnabled() instead of OC_App::isEnabled with an if statement
- Remove uneeded variable $baseURL
- Rename $isvalid to $isValid
2014-05-04 15:51:08 +02:00
9385b97b5f
[tx-robot] updated from transifex
2014-05-04 01:56:15 -04:00
cf20de185c
[tx-robot] updated from transifex
2014-05-03 01:56:11 -04:00
95fe55f9e7
fix broken unit test
2014-05-02 20:35:03 +02:00
9e18be6422
Merge pull request #8377 from youngguns-nl/issue_8376
...
RecursiveDirectoryIterator does not work on NFS
2014-05-02 18:45:09 +02:00
d163441f3e
load image via javascript and use $(document).width() to determine the proper side of the image to be returned
2014-05-02 18:36:58 +02:00
c92c577b5e
- Introduce isShared() and isMounted() on FileInfo class
...
- Reuse these methods on determineIcon()
- Generate permission string for the desktop client
- expose {http://owncloud.org/ns }permissions as additional WebDAV property containing the permission string
2014-05-02 17:37:16 +02:00
20893cc3b3
Images on public sharing get downscaled to increase use experience - this will speed up loading time
...
- adding keep aspect to core/ajax/preview.php
- remove duplicate method Preview::show()
- no more hard coded mimetype of preview
- remove .png from the preview urls
- keep old route preview.png for backwards compatibility
- aspect preserving previews are now cached
2014-05-02 17:02:57 +02:00
49d9631eee
Merge pull request #8400 from owncloud/download-button-public-folder
...
reintroduce download button on public shares
2014-05-02 16:59:09 +02:00
6e75b37d04
disable download button if zip download is disabled
2014-05-02 15:53:46 +02:00
899c7c0443
fix position and look of public download button
2014-05-02 15:26:21 +02:00
6519b9672a
[tx-robot] updated from transifex
2014-05-02 01:55:53 -04:00
bf681713c8
Merge pull request #8415 from owncloud/sharing_fix_rename
...
[sharing] return the new name if a mount point was renamed
2014-05-01 14:58:29 -04:00
17f5a18922
[tx-robot] updated from transifex
2014-05-01 01:56:01 -04:00
33883a46f5
return the new name if a mount point was renamed
2014-04-30 20:29:21 +02:00
9ee88104e9
Merge pull request #8412 from owncloud/sharing_fix_part_file_rename
...
[sharing] fix rename of part files
2014-04-30 17:52:29 +02:00
38989c3458
Merge pull request #8404 from owncloud/fix-checkboxes
...
Fixed too generic checkbox and link selectors
2014-04-30 14:51:29 +02:00
dca2d9311a
Merge pull request #8408 from owncloud/delete-spinner
...
Show spinner for all files when deleting all
2014-04-30 14:51:02 +02:00
20e4ad382b
get the correct owner path for part files
2014-04-30 12:49:16 +02:00
57b671ebec
only update the values which really changed
2014-04-30 12:48:16 +02:00
654a6e6c6a
[tx-robot] updated from transifex
2014-04-30 01:57:53 -04:00
61db16321f
Clear selection on reload (when changing sort)
2014-04-29 18:49:11 +02:00
10bc67bef9
Show spinner for all files when deleting all
2014-04-29 17:59:30 +02:00
003049e8a6
remove file name from upper right button
2014-04-29 17:16:14 +02:00
2f58e798ec
Fixed too generic checkbox and link selectors
...
It turns out that the sharing dropdown is embedded into the table row
for some reason.
This fix makes use of a more specific selector for the checkboxes and
file name links to make sure it doesn't spill into any other potential
elements like the sharing dialog.
2014-04-29 16:28:43 +02:00
df32254133
reintroduce download button on public shares
2014-04-29 15:28:35 +02:00
49822dfcdb
refs #8376 ; spaces=>tabs
2014-04-29 14:59:47 +02:00
6b02126dc1
Merge pull request #8382 from owncloud/enc_fix_decrypt_all
...
fix shouldEncrypt() method and improved decryptAll() unit tests
2014-04-29 12:15:11 +02:00
b95aa43a5d
Merge pull request #8285 from owncloud/better_getmountby_handling
...
Handle return values better from Filesystem::getMountBy*
2014-04-29 11:22:11 +02:00
b4a5093da8
[tx-robot] updated from transifex
2014-04-29 01:56:49 -04:00
54f482ff9c
refs #8376 ; added comment and applied patch on other files
2014-04-28 19:32:25 +02:00
535302b25e
typos, indentation and remove of unused code
2014-04-28 17:59:50 +02:00
66b1ad0a9b
Merge branch 'master' into type-hinting-sharing
...
Conflicts:
apps/files_sharing/lib/share/file.php
apps/files_sharing/tests/api.php
lib/private/share/share.php
2014-04-28 17:59:41 +02:00
05dc265ea2
html input tag has no closing tag
2014-04-28 17:58:23 +02:00
ac9e07c589
$RUNTIME_APPTYPES is no longer used - left over from pre OC4
2014-04-28 17:56:20 +02:00
af22e7ec95
Added unit test in files app for sort function in helper class
...
Added unit test for the Helper class in the files app that tests the
different sort orders.
2014-04-28 17:42:04 +02:00
c0e5975ab6
Set default sort of trashbin to timestamp descending
2014-04-28 17:42:04 +02:00
688f6162da
Add sorting to files list, trashbin and public files
2014-04-28 17:42:04 +02:00
bf61d841a2
typos, naming, remove unused code, identation
2014-04-28 16:51:57 +02:00
f99f451026
Fixed drag and drop into folder and onto breadcrumb
...
Fixed drag and drop code to use FileList.getSelectedFiles() instead of
the visible DOM elements.
2014-04-28 14:55:01 +02:00
a15b68c10f
Fixed selection summary calculation issue
2014-04-28 14:55:01 +02:00
c29e8b0bae
Cleanup of event handlers
...
Now using _.bind() for event handlers so we can use "this" which is more
readable than a static access to FileList.
2014-04-28 14:55:01 +02:00
3c006a5a4d
Cleanup and fix trashbin "clear all files" operation
2014-04-28 14:55:01 +02:00
3159c2ee64
Fixed drag shadow file sorting
2014-04-28 14:55:01 +02:00
fd982df6ae
Fixed selection to be based on FileList.files
...
The file selection is now based on the internal model array
FileList.files instead of the visible checkboxes.
This makes it possible to virtually select files that haven't been
rendered yet (select all, then deselect a visible one)
Added more unit tests for selection (with shift and ctrl as well)
2014-04-28 14:55:01 +02:00
a952d80ad9
Fix trashbin previews and "delete selected"
2014-04-28 14:55:01 +02:00
8909b574fa
Make sure there are always enough elements visible on the page
2014-04-28 14:55:01 +02:00
2883f231d0
Fixed insertion of files
...
Removed "insert" flag, inserting is by default for FileList.add().
Added "animate" flag to FileList.add().
Added logic to correctly detect when to insert/append elements whenever
the insertion point is visible or not.
Fixed "render next page" logic to work correctly when many pages of
files have been added.
2014-04-28 14:55:01 +02:00
f6586f6bdf
Fixed file sorting to work with scrolling
...
The FileList.files model is now updated with file operations.
Adding files to the list will add to the model first, then to the DOM.
If the insertion point isn't visible yet, the file won't be added to the
DOM until the user scrolls down.
Updated unit tests to include checking for the correct insertion point.
2014-04-28 14:55:00 +02:00
9c2fbea6a4
Fix file selection for infinite scrolling
...
- moved file selection code to FileList
- fix selection summary when all files are selected
- nextPage now auto-selects files if "select all" checkbox is checked
- fixed trashbin to use the same selection logic as FileList
2014-04-28 14:55:00 +02:00
9f62059efa
Fix file summary to use the whole file list
...
- moved the summary code into a new class FileSummary
- FileSummary is calculated only once, then updated with add/remove
- added new OC.Util namespace for JS utility functions
2014-04-28 14:49:39 +02:00
73a2d87ab4
fix shouldEncrypt() method and improved decryptAll() unit tests
2014-04-28 14:49:19 +02:00
efdf0c4df0
Added infinite scrolling (in-memory list)
2014-04-28 14:34:28 +02:00
45e42c25de
Group Database backend must not gather user details itself but ask user
...
backends. This is a port to master from PR #7745
remove OC_GROUP_BACKEND_GET_DISPLAYNAME option for group backends
Conflicts:
lib/private/group/backend.php
LDAP: getDisplayNamesInGroup is not an option for group backends anymore
Conflicts:
apps/user_ldap/group_ldap.php
apps/user_ldap/group_proxy.php
clean up group backends
Conflicts:
lib/private/group/database.php
remove now unnecessary test
implement getDisplayNames in group manager
adjust user manager tests
test for group manager's displayNamesInGroup
trim must not be used in empty in PHP < 5.5
keep the constant to not provoke PHP warnings
Conflicts:
lib/private/group/backend.php
2014-04-28 13:49:56 +02:00
9128900c56
drop files_irods from apps_external
2014-04-28 12:39:28 +02:00
727e3e2359
Merge pull request #8327 from owncloud/l10n-files_external-fields
...
Add translatable mount configs
2014-04-28 08:52:50 +02:00
642f57c1d5
[tx-robot] updated from transifex
2014-04-28 01:56:24 -04:00
8e5c9eea3a
[tx-robot] updated from transifex
2014-04-27 01:54:54 -04:00
6de6f68ae2
fix single quote sanitization
2014-04-26 18:58:01 +02:00
7ac7546b71
Merge pull request #8353 from owncloud/publicshare-webdav
...
Expose public shares over webdav
2014-04-26 15:55:37 +02:00
c591cf0836
[tx-robot] updated from transifex
2014-04-26 01:55:32 -04:00
ace0293bd1
fix layout of external storage config table
2014-04-25 16:34:48 +02:00
7599fa94ce
Merge pull request #8350 from owncloud/share-search-mime
...
fix search by mime for shared single files
2014-04-25 15:54:36 +02:00
b176708505
Expose public shares over webdav
2014-04-25 14:45:18 +02:00
b42418246f
Also fixed the returned internal path when getting the root shared item by id
2014-04-25 14:04:22 +02:00
c53c4b9791
fix search by mime for shared single files
2014-04-25 12:28:10 +02:00
6c20a014ea
merge master into webdav-injection
2014-04-25 11:47:06 +02:00
77e3d067f0
Better handle return values from Filesystem::getMountBy*
...
getMountByStorageId and getMountByNumericId return an empty array on error,
which should be detected to avoid possible errors. This commit also adds in
some new logging points and throws to aid debugging
2014-04-25 09:50:34 +01:00
3fc809dfd8
[tx-robot] updated from transifex
2014-04-25 01:56:28 -04:00
f520305848
Merge pull request #8026 from owncloud/remove_shared_folder
...
remove the "Shared" folder
2014-04-24 18:45:45 +02:00
435672feaa
[tx-robot] updated from transifex
2014-04-24 01:55:33 -04:00
da61acd1e2
Add translatable mount configs
...
Will close #8070
2014-04-23 17:58:14 +02:00
645ecb7644
Merge pull request #6297 from leo-b/fix_ldap_errors
...
only check ldap_errno if an ldap_* function actually fails
2014-04-23 16:26:43 +02:00
3aee23ee2b
Merge pull request #8233 from owncloud/fix-newdialog-ie
...
fix shift of icons in 'New' menu in IE8/9, fix #7987
2014-04-23 16:17:24 +02:00
c2f7848aeb
Adjust renaming of directories, fixes #8280
...
Directories will not be considered to have an extension, even if a dot is
found.
Stop Scrutinizer being annoyed
But the spaced version looked good!
Stop jsHint being annoyed
These code quality tools are really pestering
2014-04-23 16:04:01 +02:00
7ef8f6d352
always allow to rename the share mount point
2014-04-23 12:54:26 +02:00
b102222fed
split-up the update script and add unit tests for it
2014-04-23 12:54:26 +02:00
93469ca468
make it possible to move files out of a shared mount point
2014-04-23 12:54:26 +02:00
dd1e47b3b8
typos, use, unused and return fixed
2014-04-23 12:54:26 +02:00
2049bedcaf
Dont throw an error when a storage isn't found for shared cache
2014-04-23 12:54:26 +02:00
fb88aba8f4
some fixes to make the gallery work, this made it necessary to adjust some tests and the encryption code
2014-04-23 12:54:26 +02:00
d468cdacf2
add unit tests which got lost during rebase
2014-04-23 12:54:26 +02:00
652d417a58
we don't allow to share a folder if it contains a share mount point
2014-04-23 12:54:26 +02:00
b712393e72
fix etag propagation
2014-04-23 12:54:26 +02:00
aae22b2d6a
update script, create Shared folder and adjust target path for the shares
2014-04-23 12:54:26 +02:00
bffcbac7a7
allow to rename group share mount points
2014-04-23 12:54:25 +02:00
3f6e9e0102
cleanup the shared storage, always keep the whole share resource
2014-04-23 12:54:25 +02:00
22e0a4b9a8
external storages: allow to mount a folder called "Shared", it is no longer a reserved name
2014-04-23 12:54:25 +02:00
c9bd2f7a6c
also fetch the etag from file cache
2014-04-23 12:54:25 +02:00
d4085d8148
make sure that path is not 'false'
2014-04-23 12:54:25 +02:00
33cdd93890
fix deleting of shared files
2014-04-23 12:54:25 +02:00
bfabd247f4
fix updating of shared files
2014-04-23 12:54:25 +02:00
a86d97295e
fix encryption tests after the removal of the shared folder
2014-04-23 12:54:25 +02:00
ed981294f1
fix share api tests
2014-04-23 12:54:25 +02:00
27c5a978f9
we no longer need to handle the Shared folder different from any other folder
2014-04-23 12:54:25 +02:00
83d6810725
don't overwrite shared folder icon
2014-04-23 12:54:25 +02:00
4967435237
show "shared by ..." for share mount point
2014-04-23 12:54:25 +02:00
6b19482f3e
generate unique target name
2014-04-23 12:54:25 +02:00
6d87dacad4
fix getMimeType call, we always need to check the source path
2014-04-23 12:54:24 +02:00
a02fb3722b
user should be able to rename/delete shared files if the owner allowed it
2014-04-23 12:54:24 +02:00
b02b6d3c23
no exception for the root of the mount point (formerly Shared/), just get the file cache information from the cache
2014-04-23 12:54:24 +02:00
c377893f0e
make sure that we have the right permissions for the mount points
2014-04-23 12:54:24 +02:00
a27db9e4ca
first steps to remove the shared folder:
...
- mount shares to the root folder instead of "Shared/"
- navigate in shared folder and sub-folders
- show previews
- show correct file permissions
- download/edit files
2014-04-23 12:54:24 +02:00
97f21712cd
Merge pull request #8164 from owncloud/fix-6651
...
LDAP: fix random resets of filter
2014-04-23 11:09:35 +02:00
e0cac32442
fixing some JSHint warnings
2014-04-23 10:08:14 +02:00
3f453d1641
[tx-robot] updated from transifex
2014-04-23 01:56:35 -04:00
c1c2f2c49e
add additional comments, PHPdoc and check whether it's really applicable
2014-04-22 18:36:43 +02:00
1c71d5c444
LDAP: cache display names immediately on retrieval, saves tens of unecessary queries to LDAP server in the share dialog for example
2014-04-22 18:36:37 +02:00
b42ce6c30a
Prevent error if previously cached data doesn't have an etag
2014-04-22 15:24:38 +02:00
3821a09689
merge master into webdav-injection
2014-04-22 12:25:49 +02:00
d56072cf2e
Merge pull request #8255 from owncloud/fix-public-download-button
...
keep long file names in one line to not overflow download button on mobile
2014-04-22 15:44:29 +05:30
54873c7aae
Merge pull request #8247 from owncloud/l10n-files_trasbin-fix
...
Fix localization issues of files_trashbin
2014-04-22 11:34:49 +02:00
5049664285
Merge pull request #8239 from owncloud/directlink-overflow
...
add max-width to directLink input to prevent overflow
2014-04-22 11:23:10 +02:00
4d9ff49f61
Merge pull request #8283 from owncloud/translatable-max-in-upload
...
make max. text translatable
2014-04-22 10:23:08 +02:00
a9b4fba528
[tx-robot] updated from transifex
2014-04-22 01:54:58 -04:00
abfd7ecb72
Permit personal mount points to be used for sharing
...
An issue existed where `readData` used `OCP\User::getUser()` to get the user
for personal mount points, which worked in all situations apart from when a
personal mount point was used for sharing, so the return from `getUser()` is
not the user that owns the share. As such, any personal mount points would not
work correctly when shared.
`readData` and `writeData` have been changed from using a `$isPersonal`
boolean to using a `$user` string|null. `$isPersonal = false` can now be
written as `$user = NULL` (or left out in the case of `readData`), and
`$isPersonal = true` can be written as `$user = OCP\User::getUser()`.
2014-04-21 21:42:35 +01:00
4fe5ca1908
[tx-robot] updated from transifex
2014-04-21 01:56:06 -04:00
1aa7774178
make max. text translatable
2014-04-21 02:41:33 +02:00
93ed6a695e
Merge pull request #8169 from owncloud/change-to-show
...
Change from showHTML to show
* owncloud/change-to-show:
Change from showHTML to show
2014-04-20 15:53:33 +02:00
1abd9c1305
[tx-robot] updated from transifex
2014-04-19 01:56:06 -04:00
f434c3a213
Fix localization issues of files_trashbin
2014-04-17 21:10:21 +02:00
36c8dec10a
Merge pull request #8220 from owncloud/type-hinting-ldap
...
Fix PHPdoc in user_ldap
2014-04-17 18:15:40 +02:00
d82a31d121
keep long file names in one line to not overflow download button on mobile
2014-04-17 17:11:28 +02:00
0b4431216d
Merge pull request #8236 from owncloud/header-right-fix
...
remove duplication of header and 'header-right' element, also ellipsize when too wide
2014-04-17 15:18:40 +02:00
13b463cc17
Merge pull request #8189 from Xenopathic/misc_fixes
...
Various fixes
2014-04-17 11:56:51 +01:00
a7d7ca2fb3
[tx-robot] updated from transifex
2014-04-17 01:56:06 -04:00
81751cb616
Add missing param hint
2014-04-16 17:54:10 +02:00
9434ed44f8
add max-width to directLink input to prevent overflow
2014-04-16 16:43:35 +02:00
9c6f8e59ae
fix header code duplication, code style fixes
2014-04-16 16:26:41 +02:00
547ddf7775
remove duplication of 'header-right' element, also make it overflow when too wide
2014-04-16 15:53:38 +02:00
924aee718c
fix shift of icons in 'New' menu in IE8/9, fix #7987
2014-04-16 14:58:27 +02:00
f6551d214f
Merge pull request #7815 from owncloud/ldap_fix_usercount_master
...
correct LDAP user count on setup with many users (occ user:report)
2014-04-16 10:36:19 +02:00
23f2c48a43
[tx-robot] updated from transifex
2014-04-16 01:57:34 -04:00
8bc7174bdc
Merge pull request #8104 from owncloud/lukepolo-master
...
Added the ability to Drag and Drop folders [chrome]
2014-04-15 21:39:32 +02:00
83e8981e24
add link to further discussion about that folder check
2014-04-15 21:39:13 +02:00
bad41c05b8
Fix PHPdoc in user_ldap
...
using scrutinizer patch
2014-04-15 21:05:49 +02:00
999e74e834
Fix PHPdoc in apps/files_sharing
...
using scrutinizer patch
2014-04-15 21:05:44 +02:00
c82adb8c5d
merge master into webdav-injection
2014-04-15 20:03:00 +02:00
2dbb2db7e0
Merge pull request #7780 from owncloud/share-file-exists
...
Verify that a file exists before we share it
2014-04-15 11:23:17 +02:00
340089f270
Merge pull request #8059 from owncloud/countUsersInGroup
...
add optional countUsersInGroup method to group backends
2014-04-14 20:45:12 +02:00
2a2aabbdaf
[tx-robot] updated from transifex
2014-04-14 01:55:09 -04:00
8bb003868c
Fix user_ldap default setting value
2014-04-13 16:49:23 +01:00
869e7a51f0
Prevent error in files_trashbin
...
`glob` can return FALSE when the directory is empty, instead of an empty array,
causing an error at `foreach`.
"Note: On some systems it is impossible to distinguish between empty match and
an error."
See http://www.php.net/manual/en/function.glob.php -> Return Values
2014-04-13 14:51:33 +01:00
fa8814902e
Adjust logic for deciding if trashbin empty
...
Any error in opening the trashbin directory returns 'true' for isEmpty.
An error is prevented by checking if the directory exists before trying to
open it.
2014-04-13 13:49:04 +01:00
2454759af7
Check whether the user has permissions to add personal storage backends
2014-04-13 11:01:50 +02:00
982d2bcc5b
[tx-robot] updated from transifex
2014-04-13 01:55:12 -04:00
329b8f3e99
[tx-robot] updated from transifex
2014-04-12 01:56:11 -04:00
6343391e58
Change from showHTML to show
...
There is no need to use `showHTML` here.
2014-04-11 20:38:27 +02:00
e704bc2bf0
Merge pull request #7807 from sarciszewski/patch-1
...
Update crypt.php
2014-04-11 19:19:02 +02:00
10dc1de644
Merge pull request #8069 from owncloud/fix-localization-issues-with-file-encrypt-app
...
Fix some localization issues with file encryption/decryption strings
2014-04-11 17:22:13 +02:00
d67cba973e
Typo fix.
2014-04-11 15:23:43 +02:00
07ea57465b
drop folder support on public shared folders
2014-04-11 14:54:13 +02:00
1c57ffa16f
Give hint when composing filter failed
2014-04-11 14:08:12 +02:00
e28227ecdc
fix comparison in determineMode, fixes problems with restoring the filter mode (assisted or manually) on page refresh
2014-04-11 13:56:06 +02:00
6f1e9f8920
Merge branch 'ldap-filter-reset-fix' of github.com:ben-denham/core into fix-6651
2014-04-11 13:48:45 +02:00
36107e1bad
[tx-robot] updated from transifex
2014-04-11 01:55:15 -04:00
d229856fc5
Merge pull request #8076 from owncloud/enable-dav-browser
...
Re-enable the sabredav browser plugin to fix sync client setup
2014-04-10 21:47:03 +02:00
0edacf372c
fix single file upload in firefox
2014-04-10 18:07:36 +02:00
7c072510d3
[tx-robot] updated from transifex
2014-04-10 01:55:39 -04:00
e8be2ac554
In cases folder drag and drop is not supported a proper message is displayed
2014-04-09 23:32:12 +02:00
2fc9e27ced
use FileList.findFileEl
2014-04-09 22:16:41 +02:00
d2961dcf11
Merge branch 'master' into lukepolo-master
...
Conflicts:
apps/files/js/filelist.js
2014-04-09 22:00:25 +02:00
d8f56e3c00
Merge pull request #8049 from owncloud/filepickersvg
...
Fix file picker SVG issues
2014-04-09 15:05:40 +02:00
b19671d204
Merge pull request #8126 from owncloud/remove_obsolete_code_in_sharing_js
...
remove obsolete code
2014-04-09 14:50:15 +02:00
9feebeaf40
Merge pull request #7837 from owncloud/fix_7530
...
LDAP: fix determining objectclasses takes long
2014-04-09 12:27:17 +02:00
dbebf6bb5e
add comment to clearify when a skip in the foreach happens
2014-04-09 12:25:48 +02:00
9b0f289143
remove obsolete code
2014-04-09 12:09:28 +02:00
ee3368d2ad
replace hardcoded limit of 400 with user controlled ldapPagingSize value
2014-04-09 11:38:51 +02:00
2e5adadad7
Put inner loop into own method, let's see whether it makes scrutinizer happier
2014-04-09 11:31:56 +02:00
bdc418d1f9
var count is assigned in the inner loop so it must be checked inside there to be properly used as part of the exit condition of the outer loop
2014-04-09 11:31:56 +02:00
43402c56dd
initialize variable
2014-04-09 11:31:56 +02:00
40f9875f11
LDAP: fix user report i.e. count for LDAP servers with really many users
2014-04-09 11:31:56 +02:00
8bb27551bd
LDAP: make sure cache key for paged result cookie matches when limit or offset is null or 0
2014-04-09 11:31:56 +02:00
796f719548
[tx-robot] updated from transifex
2014-04-09 01:56:49 -04:00
35ab6fe5a9
Disable sharing in trashbin app
2014-04-08 17:13:59 +02:00
2407321625
add tests for LDAP
2014-04-08 12:57:06 +02:00
142fc5f3af
fix return value when a search string was passed to return integer instead of array
2014-04-08 12:53:59 +02:00
96cb75f5cf
implement countUsersInGroup in LDAP group backend
2014-04-08 12:04:38 +02:00
411a810ebe
Merge pull request #8032 from owncloud/fs-backend-registration
...
Files External: allow dynamic backend registration
2014-04-08 11:27:02 +02:00
4ad4b9768c
[tx-robot] updated from transifex
2014-04-08 01:57:51 -04:00
68b7822cf5
js style fixes according to our jshintrc rules
2014-04-07 23:45:35 +02:00
d15a4719d2
fix folder upload in js
2014-04-07 23:04:08 +02:00
971a311fee
adding parentId to file info array
2014-04-07 23:03:19 +02:00
6d373e97c3
remove unused exit()
2014-04-07 23:02:49 +02:00
3587c88fe9
Merge branch 'master' of https://github.com/lukepolo/core-1 into lukepolo-master
...
Conflicts:
apps/files/js/file-upload.js
2014-04-07 22:28:16 +02:00
3ac009c2b4
unit tests for dynamic backend registration
2014-04-07 20:18:57 +02:00
21a54ba50f
Merge pull request #8086 from owncloud/fix_copy_conflict_translations_in_js
...
Fix copy conflict dialog translation
2014-04-07 14:38:00 +02:00
3c9f588449
Merge pull request #6221 from leo-b/ldap_get_all_groups
...
fix updateGroups background job for ldap servers with > 1000 groups
2014-04-07 13:00:32 +02:00
c90b0ac00b
Fix copy conflict dialog translation
2014-04-07 11:46:47 +02:00
e295d48fd4
[tx-robot] updated from transifex
2014-04-07 01:56:11 -04:00
593977f016
Re-enable the sabredav browser plugin
2014-04-06 14:49:39 +02:00
a9d49de465
[tx-robot] updated from transifex
2014-04-06 01:56:11 -04:00
286323f7a4
Fix some localization issues with file encryption/decription strings
2014-04-05 19:28:53 +02:00
01d93f81f6
Show higher resolution previews for high dpi screens
2014-04-04 17:10:46 +02:00
a4eafca77f
Moved code to replace svg with png to OC.Util
...
- Moved code that replaces the "svg" extension for the given file to
core as OC.Util.replaceSVGIcon.
- Added unit test for OC.Util.replaceSVGIcon
- Moved "replaceSVG" to OC.Util.replaceSVG and deprecated the global
"replaceSVG" function.
- Added alias for SVGSupport() as OC.Util.hasSVGSupport() (for now)
2014-04-04 11:34:26 +02:00
8a10c44eb3
Merge pull request #8015 from owncloud/storageinfo-reuse
...
Allow reusing FileInfo for getStorageInfo
2014-04-04 10:18:02 +02:00
0805f678cc
[tx-robot] updated from transifex
2014-04-04 01:57:01 -04:00
bf7624fb25
Merge pull request #6968 from owncloud/files-ajaxload
...
Ajaxify files list for files + trashbin + public page
2014-04-03 22:02:05 +02:00
e3b9a86184
remove duplicate method checkDependencies()
2014-04-03 17:17:44 +02:00
c6976d89a6
use command -v to detect if smbclient exists
2014-04-03 17:09:40 +02:00
d1e78d7a6b
Correctly set svg for crumb divider
2014-04-03 17:08:06 +02:00
14a5381977
Merge branch 'master' into fs-backend-registration
...
Conflicts:
apps/files_external/templates/settings.php
2014-04-03 17:04:16 +02:00
7c9537f33a
Fixed dirInfo check for non existing dir in files ajax call
2014-04-03 17:04:13 +02:00
c0ebc1dfb1
Update backends and their configurations
2014-04-03 16:57:26 +02:00
3101663129
Removed redundant free space and upload limit in public page
2014-04-03 16:50:21 +02:00
730bca98b4
Moved dependency checks to end of class files
...
Dependency messages now appear below the configuration options instead of above
Reworked dependency check method to support consolidated messages for multiple backends
Conflicts:
apps/files_external/lib/google.php
apps/files_external/lib/swift.php
apps/files_external/templates/settings.php
2014-04-03 16:46:22 +02:00
ff9a4a6d91
Added cURL dependency for Amazon S3, Dropbox and SWIFT
...
Conflicts:
apps/files_external/lib/amazons3.php
apps/files_external/lib/swift.php
2014-04-03 16:38:43 +02:00
e2969062ca
Merge pull request #7969 from Xenopathic/files_external_fix
...
Fix error log spam
2014-04-03 16:31:58 +02:00
46379113a1
Changed dependency check messages from warnings to notes
...
Added check for duplicate dependency check messages to display only the first
2014-04-03 16:31:54 +02:00
8ca897df76
Added cURL dependency check to Google Drive and WebDAV backend
...
Added check for backend's checkDependencies method to OC_Mount_Config::getBackends() when backend is configured to have some instead of blindly calling it and crashing
Conflicts:
apps/files_external/lib/config.php
apps/files_external/lib/google.php
2014-04-03 16:30:48 +02:00
f7da4280ca
Modified app to dynamically register backends instead of hard-coding them
...
Moved dependency check to the individual backends instead of the config
Conflicts:
apps/files_external/appinfo/app.php
apps/files_external/lib/config.php
2014-04-03 16:21:52 +02:00
a2efdb8722
Merge pull request #7970 from owncloud/webdav-upload-hash
...
Fix uploading files containing a # in the path for webdav
2014-04-03 16:09:44 +02:00
eaad6a4e27
Fix error log spam
...
Regression from e002b7242c
2014-04-03 13:43:02 +01:00
7dafdfbe88
add tests for sharing files the users doesn't have access to
2014-04-03 13:14:34 +02:00
54783550e8
[tx-robot] updated from transifex
2014-04-03 01:56:12 -04:00
6d378515f8
Merge pull request #8014 from owncloud/uploadsize-reuse
...
Reuse known free space in the files app
2014-04-02 18:40:34 +02:00
a6de5efbab
Merge pull request #7978 from owncloud/enc_cleanup
...
there is no need to re-calculate the shares after a touch
2014-04-02 18:23:33 +02:00
da5541ac02
Allow reusing FileInfo for getStorageInfo
2014-04-02 17:10:57 +02:00
1e6a79e244
Reuse known free space in the files app
2014-04-02 16:53:45 +02:00
0be9de5df5
Files, trashbin, public apps use ajax/JSON for the file list
...
Files app:
- removed file list template, now rendering list from JSON response
- FileList.addFile/addDir is now FileList.add() and takes a JS map with all required
arguments instead of having a long number of function arguments
- added unit tests for many FileList operations
- fixed newfile.php, newfolder.php and rename.php to return the file's
full JSON on success
- removed obsolete/unused undo code
- removed download_url / loading options, now using
Files.getDownloadUrl() for that
- server side now uses Helper::getFileInfo() to prepare file JSON response
- previews are now client-side only
Breadcrumbs are now JS only:
- Added BreadCrumb class to handle breadcrumb rendering and events
- Added unit test for BreadCrumb class
- Moved all relevant JS functions to the BreadCrumb class
Public page now uses ajax to load the file list:
- Added Helper class in sharing app to make it easier to authenticate
and retrieve the file's real path
- Added ajax/list.php to retrieve the file list
- Fixed FileActions and FileList to work with the ajax list
Core:
- Fixed file picker dialog to use the same list format as files app
2014-04-02 15:33:47 +02:00
b616cc1f2d
Merge pull request #8003 from owncloud/extstorage-sftp-upgradephpseclib
...
Upgraded phpseclib to version 0.3.6 (SFTP ext storage)
2014-04-02 14:10:09 +02:00
1782dcbb50
Merge pull request #7977 from owncloud/fix_enc_if_sharing_is_disabled
...
always encrypt files to owner
2014-04-02 13:20:51 +02:00
3f9beb8c6b
Upgraded phpseclib to version 0.3.6
2014-04-02 12:31:59 +02:00
73dd5ff26c
[tx-robot] updated from transifex
2014-04-02 01:56:39 -04:00
d762e25cc5
Merge pull request #7989 from owncloud/files-deletefileregressionfix
...
Fixed broken delete file action
2014-04-01 22:54:05 +02:00
d811026ec9
Merge pull request #7935 from owncloud/getpath-shared
...
Make getPath work for shared files
2014-04-01 21:59:09 +02:00
630b5b648f
Merge pull request #7997 from owncloud/correct-remember-trashbin-state
...
Correct the remembering of the trashbin app state in encryption test
2014-04-01 21:23:53 +02:00
f37a76c396
Remember before change works better
2014-04-01 19:46:46 +02:00
0e93c3fd9a
Merge pull request #7986 from owncloud/files-fixredirectwhendirnotexists
...
Fix dirInfo check when dir does not exist
2014-04-01 16:51:30 +02:00
017d7953d7
Merge pull request #7984 from owncloud/wording-applicable2
...
External Storage: change confusing 'applicable' to 'available for', default to »All Users«
2014-04-01 16:44:31 +02:00
aaa8d6ec02
Fixed broken delete file action
2014-04-01 16:09:48 +02:00
0bede65947
Fix dirInfo check when dir does not exist
2014-04-01 15:15:03 +02:00
27eff1ac30
Merge pull request #7293 from owncloud/update-shares-postgres
...
fix update to remove shares where file doesn't exist on postgres
2014-04-01 14:56:37 +02:00
acfb3cfff5
external storage: set storages to be available for All Users by default
2014-04-01 14:31:22 +02:00
0a112de676
external storage: change confusing 'applicable' to 'available for'
2014-04-01 14:26:06 +02:00
c45793033d
Merge pull request #7912 from owncloud/enc_move_checks_to_pre_hook
...
move check if a file should be encrypted to the pre hook
2014-04-01 13:56:46 +02:00
5807681c09
Merge pull request #7975 from owncloud/fix-7973-master-2
...
remove pl_PL - fixes #7973
2014-04-01 12:38:47 +02:00
18acfa8bb3
Merge pull request #7915 from owncloud/replace-personalblock
...
Replace personalblock with .section
2014-04-01 11:20:16 +02:00
7a4a836abe
[tx-robot] updated from transifex
2014-04-01 01:56:15 -04:00
c578ab68fe
there is no need to re-calculate the shares after a touch
2014-03-31 18:24:53 +02:00
8e34812393
always encrypt files to owner
2014-03-31 18:19:48 +02:00
fe2c6f4e6d
remove pl_PL - fixes #7973
2014-03-31 18:03:42 +02:00
76c63a5760
Fix uploading files containing a # in the path for webdav
2014-03-31 17:00:32 +02:00
aa867ad647
don't call getFileInfo() to avoid to open the same file twice
2014-03-31 15:29:16 +02:00
8ebb1f15d3
move check if a file should be encrypted to the pre hook
2014-03-31 15:29:16 +02:00
0c2585f3ac
Improve phpdoc
2014-03-31 14:29:55 +02:00
2be2a5d2c5
external storage: fix merge conflict, indentation
2014-03-31 13:12:04 +02:00
6ac85480f7
replace last personalblock fieldset within files_external
2014-03-31 13:00:46 +02:00
bfb0b9a044
[tx-robot] updated from transifex
2014-03-30 01:55:42 -04:00
fe78d963d9
Implement getPath for shared files
2014-03-28 15:26:15 +01:00
7adb5ae2c5
Merge pull request #7929 from owncloud/enc_dont_write_file_if_enc_fails
...
don't write file if opening a stream to encrypt the data fails
2014-03-28 14:59:05 +01:00
b158939283
adapt description of paging size configuration
2014-03-28 14:20:01 +01:00
0d9d70b51c
change default ldap paging size to 500
2014-03-28 14:02:19 +01:00
d0012e729a
Merge pull request #7879 from owncloud/sharing_cleanup_public_api
...
sharing api cleanup, first step
2014-03-28 12:23:11 +01:00
b9100bc2de
don't write file if opening a stream to encrypt the data fails
2014-03-28 12:02:49 +01:00
0757f87dba
Merge pull request #7872 from owncloud/trash-disablestoragestats
...
Do not retrieve storage stats for trash bin
2014-03-28 11:22:19 +01:00
f3d6b2f3e9
Do not retrieve storage stats for trash bin
2014-03-28 11:21:33 +01:00
e806b6d9a0
Merge pull request #7842 from Xenopathic/files_external_config_optional
...
Enable the use of 'optional' on password fields for mount configuration
2014-03-28 10:02:28 +00:00
5fa8f7cf12
Merge pull request #7107 from owncloud/load-apps-proper-master
...
Load apps proper master
2014-03-28 10:33:55 +01:00
e3b951f412
Merge pull request #7724 from owncloud/mobile
...
[WIP] Mobile optimization for base layout and Files app
2014-03-28 10:27:15 +01:00
ccc55f40e6
[tx-robot] updated from transifex
2014-03-28 01:55:47 -04:00
d2e5dd2a15
Merge pull request #7913 from owncloud/fix-logo
...
fix SVG replacement for logo so it works in IE8, fix #7866
2014-03-28 02:29:35 +01:00
6a8e93ffa6
fix breadcrumbs for IE8
2014-03-27 23:53:19 +01:00
531f3cf1a8
Merge pull request #7911 from owncloud/ext-fixswifttouchoperation
...
Fix swift touch operation
2014-03-27 18:10:45 +01:00
25326b89da
replace personalblock fieldset with section class in core user_ apps
2014-03-27 17:00:47 +01:00
6de572c6e6
replace personalblock fieldset with section class in files apps
2014-03-27 17:00:47 +01:00
832d3c954e
enable SVG->PNG fallback for 'New' menu
2014-03-27 14:48:54 +01:00
f88b24d532
enable SVG->PNG fallback for newly uploaded files and folders
2014-03-27 14:48:35 +01:00
2a08e35d72
Fix swift touch operation
...
The touch() operation now uses "UpdateMetadata()" instead of "Update()"
which doesn't clear the object's contents.
This fixes syncing, as the sync client needs to use touch to update the
object's mtime.
2014-03-27 12:34:30 +01:00
1f6259d9c2
Merge pull request #7875 from Xenopathic/files_external_smb_auto
...
SMB/CIFS mounts using ownCloud login, fixes #7843
2014-03-27 12:18:51 +01:00
1469ce7b38
Merge pull request #7898 from owncloud/ext-swiftmtime
...
Fixed mtime reading from OpenStack API
2014-03-27 09:31:37 +01:00
ed0cba0ff4
[tx-robot] updated from transifex
2014-03-27 01:56:30 -04:00
fa00a18677
Fixed mtime reading from OpenStack API
...
The API seems to return floating point values, which prevents
the hasUpdated() check to work and causes the scanner to rescan
everything every time.
2014-03-26 17:20:40 +01:00
50dba97bde
Miscellaneous text fixes for core apps
2014-03-26 15:43:03 +00:00
eeaefd84c3
change mobile breakpoint for shared view to 768px as well
2014-03-26 16:32:09 +01:00
a1dca821f9
Use braces on single line if statements
2014-03-26 15:11:09 +00:00
cd5ebac7c4
Fix error in $isPersonal setting
2014-03-26 14:37:29 +00:00
b077528087
Perform proper checking for share availability
...
To check for shares, the code attempts to connect anonymously to the share.
In most cases this will fail with NT_STATUS_ACCESS_DENIED, so the regex array
used for parsing the output of smbclient in smb4php has been overridden to
treat such output as success.
The 'test' method for storage classes can now take a single parameter,
$isPersonal, which allows the storage to adjust the tests performed based on
if they are being configured as personal shares or as system shares.
2014-03-26 14:36:45 +00:00
cac4aaa8c4
Rename SMB_Auto to SMB_OC and change visible name
...
SMB_Auto is now SMB_OC, and the name has been changed from
"SMB / CIFS Auto" to "SMB / CIFS using OC login"
2014-03-26 14:35:07 +00:00
86aa6104e6
Revoke sharable permission on automatic SMB shares
...
Shares authenticated with user credentials (aka not hard coded) cannot be
accessed by other users, breaking sharing. This change completely revokes
sharing for such shares
2014-03-26 14:35:07 +00:00
3445c062ec
Use loginname instead of display name
...
getDisplayName would return the display name of the user, not great if it is a
canonical string. The uid passed back from 'login' is the UUID of the user, so
also not suitable. The login name from the session is the username the user
used to log in to ownCloud in the first place, which is what is needed.
2014-03-26 14:35:07 +00:00
ba63e46b5e
SMB/CIFS mount using OwnCloud logon credentials
...
Selecting 'SMB/CIFS Auto' in the mounts configuration allows an SMB/CIFS
mount to be configured that uses the credentials of the user logging in to
authenticate to the server.
Optionally, the username can be used as the share name, permitting home shares
to be dynamically mounted.
2014-03-26 14:35:07 +00:00
b656c68ede
Merge pull request #7888 from owncloud/extstorage-multiplemountpointconfig
...
Fix merging of external storage configurations
2014-03-26 14:30:35 +01:00
371a924c92
merge master into webdav-injection
2014-03-26 14:26:07 +01:00
e002b7242c
Fix merging of external storage configurations
...
Merging of configurations is whenever the same config is available for
multiple users/groups, in which case the config is considered as a
single one by the UI, and shows multiple users/groups selected.
Fixed merging logic to make sure that class, mount point and options are
the same before merging them.
Fixed merging to work correctly when the same mount point path is used
for separate users and configs. These are now correctly shows in the UI
as separate entries.
2014-03-26 12:41:25 +01:00
8d95c0d013
Pretty print mount.json when possible
2014-03-26 11:32:03 +01:00
cbfd16089b
Fixed share upgrade cleanup tests to use the correct ids
2014-03-26 09:29:28 +01:00
75d8de378c
[tx-robot] updated from transifex
2014-03-26 01:56:21 -04:00
8958b9147b
adding ellipsis on file names to public file list as well
2014-03-26 00:14:38 +01:00
d0f84e936f
adding proper notification area for multi line messages
2014-03-26 00:04:11 +01:00
e6392163a4
adding ellipsis on file names
2014-03-25 23:40:40 +01:00
1ae10b9da3
Merge pull request #7420 from owncloud/cachehooks-first
...
Manually triger the filecache update hooks before any other hook
2014-03-25 22:41:09 +01:00
bbc2e37259
Merge pull request #7477 from owncloud/foldersize-reuse
...
Allow re-using already known fileinfo when calculating folder sizes
2014-03-25 22:33:24 +01:00
ec9260647a
Fixed share updater unit test
...
Now using \OC_DB::insertId() to retrieve the generated ids because
Oracle ignores the passed values.
2014-03-25 20:18:58 +01:00
5111fad006
Merge pull request #7689 from owncloud/last_cron_log
...
Log last cron execution
2014-03-25 19:17:36 +01:00
31681a3a27
finally fix the paths for the OCS Share API
2014-03-25 17:52:45 +01:00
3653a51af2
fix path creation for re-shares, issue #7662
2014-03-25 17:48:50 +01:00
f9279ac77a
killing some more calls to OC_App::loadApps(); - because we load all apps in handleRequest()
2014-03-25 17:42:41 +01:00
e72b2e6e3b
Fix public upload to not close session when encryption is on
...
The encryption app needs to create keys when uploading files, so the
session needs to be kept open in such case.
2014-03-24 17:34:37 +01:00
690c31ec20
Insert missing brace
2014-03-24 13:27:46 +00:00
09cc020535
Update crypt.php
...
Use a 256-bit random value
2014-03-24 08:57:33 -04:00
Robin McCorkell
Björn Schießle
Vincent Petry
Sascha Schmidt
Jenkins for ownCloud
Thomas Müller
Morris Jobke
Andreas Fischer
fibsifan
jbtbnl
Bagera
Lukas Reschke
Jörn Friedrich Dreyer
Joas Schilling
Jan-Christoph Borchardt
Sjors van der Pluijm
icewind1991
Bart Visscher
Arthur Schiwon
Volkan Gezer
Morris Jobke
Robin Appelman
Raghu Nayyar
Volkan Gezer
Philipp Kapfer
Alexander Bergolth
Scott Arciszewski