Thomas Müller
617aa3cf29
Instead of 'No preview available for ...' we simple display the mieme-type icon
2014-01-23 20:15:10 +01:00
Jan-Christoph Borchardt
799e744ad7
remove background and width from multiselect bar, fix Download button not showing on mobile
2014-01-23 15:35:30 +01:00
Jan-Christoph Borchardt
f0c9e8205f
remove %webroot from files_sharing app
2014-01-23 14:04:13 +01:00
Morris Jobke
4b7dfd34f8
fix conflicts and add missing closing tag
2014-01-23 13:51:51 +01:00
Thomas Müller
ade726ad32
focus link text only on click in the input field - closes #6817
2014-01-23 01:08:42 +01:00
Thomas Müller
f950ce82ae
Merge branch 'master' into mobile-style
...
Conflicts:
apps/files/js/files.js
apps/files_sharing/css/public.css
apps/files_sharing/js/public.js
apps/files_sharing/templates/public.php
2014-01-23 00:39:11 +01:00
Bjoern Schiessle
eaed786eed
add path relative to the files folder of the currently logged in user to the output of getFolderContent()
2014-01-22 17:11:37 +01:00
Morris Jobke
cf6e79cda8
Merge pull request #6719 from tripflex/fix_pubup_progbar
...
Fix public upload progress bar
2014-01-22 02:28:28 -08:00
Thomas Müller
9bab05fd45
Merge branch 'master' into fixing-gallery-password-protected-access-master
2014-01-21 19:36:20 +01:00
Thomas Müller
23a4d0d44e
OC_Util::setupFS($user) will create a data dir for the given string - no matter if the user really exists - OCP\JSON::checkUserExists($owner); introduces a ready to use check which will bail out with an JSON error
2014-01-21 11:32:30 +01:00
Thomas Müller
9fd4cb1b66
adding password protection check to getShareByToken()
2014-01-21 10:42:47 +01:00
Thomas Müller
4ec6debe2b
remove unused variable
2014-01-20 17:27:03 +01:00
Robin Appelman
3d6d8d1bb6
Reuse the data retrieved from the cache in checkUpdate
2014-01-20 15:21:21 +01:00
Vincent Petry
f4c198b907
Fixed isPreviewAvailable warnings in log
...
isPreviewAvailable wasn't always set as the files formatting code is
slightly different than the one from the files app.
Fixes #6423
2014-01-17 14:22:05 +01:00
Pellaeon Lin
4726a2021b
Add $freeSpace and $uploadLimit to files_sharing
2014-01-17 17:10:42 +08:00
raghunayyar
12e5d0f68d
Fixes typos, adds ; wherever not present.
2014-01-16 21:06:14 +05:30
Jan-Christoph Borchardt
d463edaf09
on mobile, show single shared image at full width without margin
2014-01-16 15:56:18 +01:00
Jan-Christoph Borchardt
5cdab5fff3
show publicly shared image on full width, without margin
2014-01-16 15:32:23 +01:00
Jan-Christoph Borchardt
c0590676a0
fix public share download button width
2014-01-16 15:28:39 +01:00
raghunayyar
775e08e0ee
Merge branch 'master' into core-em-to-px
...
Conflicts:
apps/files_sharing/css/public.css
apps/user_ldap/css/settings.css
core/css/multiselect.css
core/css/share.css
2014-01-16 14:42:37 +05:30
Myles McNamara
62040fe2d2
change em to px
2014-01-15 17:06:48 -05:00
Jan-Christoph Borchardt
3e7cf4110d
tweak color and position of username in public share
2014-01-15 15:49:42 +01:00
Jan-Christoph Borchardt
db837bf696
improvements to public files mobile view
2014-01-15 15:48:42 +01:00
Thomas Müller
50ae2ab14c
add download button on single file share page
2014-01-15 15:31:27 +01:00
Thomas Müller
b3a6683784
remove unused js code and css rules
2014-01-15 15:22:40 +01:00
Thomas Müller
807b885a0e
reuse file upload as used within files app - remove public upload button
2014-01-15 14:36:18 +01:00
Robin Appelman
d279ddd9a2
Show the name of the shared folder in the breadcrumb when viewing a publicly shared folder
2014-01-15 13:36:14 +01:00
Jan-Christoph Borchardt
2bdd014f83
first mobile style rules, hide extra columns in files view and scroll header
2014-01-14 22:14:06 +01:00
Bjoern Schiessle
fa7f53e89d
it is not an urgent error... a DEBUG message is enough at this point
2014-01-14 13:38:41 +01:00
Andreas Fischer
cb071a9f35
Merge pull request #6755 from owncloud/remove-ru_RU-master
...
remove ru_RU - it has bee removed from transifex
* owncloud/remove-ru_RU-master:
remove ru_RU - it has bee removed from transifex
2014-01-14 00:44:34 +01:00
Bjoern Schiessle
d1b47021f1
don't unshare on delete
2014-01-13 16:49:16 +01:00
Thomas Müller
92969052d7
remove ru_RU - it has bee removed from transifex
2014-01-13 16:41:10 +01:00
Myles McNamara
97be32e2e8
modify js to move upload wrapper, modify css to match core values
2014-01-10 14:07:20 -05:00
Myles McNamara
9ebffd6635
remove extra upload controls
2014-01-10 14:03:55 -05:00
Myles McNamara
0802b662be
fix upload button layout
2014-01-10 12:20:31 -05:00
Vincent Petry
1042733634
Fixed various file name escaping issues in core apps
...
- Refactored file tr lookup into FileList.findFileEl that uses
filterAttr to avoid escaping issues in jQuery selectors
- Fixed versions and sharing app to properly escape file names in
attributes
2014-01-10 15:02:26 +01:00
Vincent Petry
8eaa39f4e2
Removed special handling of part files in shared storage rename
...
This fixes the issue introduced by the transfer id which itself wasn't
taken into account by the shortcut code for part file in the shared
storage class.
2014-01-08 18:43:20 +01:00
Jenkins for ownCloud
6be2dee5bc
[tx-robot] updated from transifex
2014-01-08 01:55:41 -05:00
Jenkins for ownCloud
d2f2645a6a
[tx-robot] updated from transifex
2014-01-07 01:56:11 -05:00
Jenkins for ownCloud
e4616199df
[tx-robot] updated from transifex
2014-01-05 01:55:53 -05:00
Jenkins for ownCloud
095f9b8ee0
[tx-robot] updated from transifex
2014-01-02 01:56:21 -05:00
Thomas Müller
6523960de9
Merge pull request #6554 from owncloud/fix_5982
...
fix preview for reshared file
2013-12-24 04:03:20 -08:00
Jenkins for ownCloud
dbbd99db09
[tx-robot] updated from transifex
2013-12-24 01:55:40 -05:00
Georg Ehrke
c90e3e4f5b
fix preview for reshared file
2013-12-22 20:27:38 +01:00
Jenkins for ownCloud
f60ecfc7fd
[tx-robot] updated from transifex
2013-12-22 01:56:05 -05:00
Vincent Petry
963ee31efb
Removed numRows usage from encryption app
...
numRows on Oracle always seem to return 0.
This fix removes numRows usage from the encryption and sharing app.
This fixes unit tests and potentially the encryption app itself
(migration status) when running on Oracle
2013-12-19 15:51:24 +01:00
Jan-Christoph Borchardt
ee2ecbe543
Merge pull request #6366 from owncloud/fix-6335
...
Bump the footer down 20px to avoid overlap.
2013-12-17 14:59:24 -08:00
Jenkins for ownCloud
6488ff2c75
[tx-robot] updated from transifex
2013-12-17 16:43:17 -05:00
ringmaster
e2197c7108
Bump the footer down 20px to avoid overlap.
...
Fixes #6335 .
2013-12-12 13:06:57 -05:00
Vincent Petry
e9255e5d57
Added unit test for sharing permissions
2013-12-10 11:19:09 +01:00
Vincent Petry
89eb3759a8
Fixed sharing results to include the correct permissions
...
Passing $includeCollections would return more than one entry which gives
mixed up file permissions.
Added a method getFile() that doesn't set $includeCollections to make
sure we only get one result which is the file itself.
Fixes #6265
2013-12-09 18:14:58 +01:00
Jenkins for ownCloud
079d20a80e
[tx-robot] updated from transifex
2013-12-07 22:28:29 -05:00
Bjoern Schiessle
ace1d40ed6
get owner from share item, if we expire a share while the user updates his /Shared folder than the owner is different from the currently logged in user
2013-12-05 17:25:01 +01:00
Morris Jobke
62827376b8
fix trashbin and pbulic page controls
2013-12-03 10:59:22 +01:00
Morris Jobke
a6f10a59fc
fix and cleanup CSS for public page
2013-12-03 10:54:18 +01:00
Jan-Christoph Borchardt
5e9ac2f20f
change different shades of grey for public share page to white
2013-12-03 10:54:18 +01:00
Jan-Christoph Borchardt
7867604e22
remove app specific code
2013-12-03 10:54:18 +01:00
Jan-Christoph Borchardt
d673dd066a
fix details for buttons in header and controls bar
2013-12-03 10:54:18 +01:00
Jenkins for ownCloud
1b18c5a047
[tx-robot] updated from transifex
2013-11-29 14:10:40 -05:00
Bjoern Schiessle
eaedda2116
make sure that we don't try to access an already deleted files, fixes some file source not found warnings
2013-11-28 13:31:08 +01:00
Björn Schießle
5295993144
Merge pull request #6088 from owncloud/fix_public_previews
...
fix public preview creation if a user is logged in
2013-11-27 11:05:27 -08:00
Björn Schießle
34a8c3c4cd
Merge pull request #6039 from owncloud/trashbin_move_file_to_owners_trash
...
move files to owners trash
2013-11-27 10:24:55 -08:00
Bjoern Schiessle
aee7781f22
fix public preview creation if a user ios logged in
2013-11-27 18:44:01 +01:00
Vincent Petry
d2840a045d
Fixed sharing hook to not remove the share before the trashbin
...
Fixed the hook order between sharing app and trashbin
2013-11-27 17:22:48 +01:00
Bjoern Schiessle
9fb71af988
Merge branch 'master' into encryption_enable_public_upload
...
Conflicts:
apps/files_encryption/lib/helper.php
apps/files_encryption/lib/keymanager.php
apps/files_encryption/lib/stream.php
apps/files_encryption/lib/util.php
apps/files_encryption/tests/keymanager.php
2013-11-27 15:08:09 +01:00
Jenkins for ownCloud
fb7aa2f014
[tx-robot] updated from transifex
2013-11-26 10:47:07 -05:00
Jenkins for ownCloud
ba0e09adce
[tx-robot] updated from transifex
2013-11-24 00:14:51 -05:00
Bjoern Schiessle
9d16353e09
disable trahs in files_sharing/public.php
2013-11-21 12:06:35 +01:00
Bjoern Schiessle
c9646ddc4c
fix undefined index errors if public share view
2013-11-21 12:03:27 +01:00
Bjoern Schiessle
b27fc42e1f
public upload now also works with encryption enabled
2013-11-21 00:23:38 +01:00
Jenkins for ownCloud
c3746e866a
[tx-robot] updated from transifex
2013-11-15 22:56:31 -05:00
Jörn Friedrich Dreyer
11425d142d
readd sharing token to public template
...
necessary for https://github.com/owncloud/apps/pull/1476
2013-11-15 16:27:41 +01:00
Robin Appelman
a2015ee065
Use View::copy and View::rename when copying or renaming files in the shared storage
2013-11-11 17:58:20 +01:00
Morris Jobke
55331479cd
Merge pull request #5701 from owncloud/sharing-updateownerfoldersizes
...
Fixed watcher to also update the owner's folder sizes
2013-11-11 06:16:51 -08:00
Vincent Petry
da126f1692
Fixed unit tests for files sharing watcher
2013-11-06 09:39:52 +01:00
Vincent Petry
9f4fd0161e
Added unit tests for shared files watcher
...
- Added base class for sharing unit tests
- Added unit tests for shared files watched to check for folder size
propagation
2013-11-05 19:30:52 +01:00
Vincent Petry
eb6fc14f84
Removed unused method
2013-11-05 17:14:19 +01:00
Vincent Petry
e3868ba118
Fixed watcher to also update the owner's folder sizes
...
Note that the root folder size is mandatory for quota calculation.
2013-11-05 13:58:14 +01:00
Thomas Müller
3488202f67
Merge pull request #5582 from owncloud/files-previewcaching
...
Append file etag to preview URLs
2013-11-05 01:21:51 -08:00
Thomas Müller
d48ba5a5bf
Merge pull request #5540 from owncloud/scanner-enhancments-master
...
Scanner enhancments master
2013-11-04 23:58:42 -08:00
Thomas Müller
a7cb16aab1
use ===
2013-11-04 21:23:10 +01:00
Jenkins for ownCloud
e89f080f09
[tx-robot] updated from transifex
2013-11-03 14:39:28 -05:00
Jenkins for ownCloud
07e540613e
[tx-robot] updated from transifex
2013-11-03 12:44:12 -05:00
Jörn Friedrich Dreyer
fdaac99526
Merge pull request #5626 from owncloud/fix_search_in_shared_files
...
count correct array, then using 1000 as MAX_SQL_CHUNK_SIZE works as expected
2013-10-30 09:02:39 -07:00
Jörn Friedrich Dreyer
68e88b6e40
count correct array, then using 1000 as MAX_SQL_CHUNK_SIZE works as expected
2013-10-30 15:48:38 +01:00
Bjoern Schiessle
e1e4c7c214
Merge branch 'master' into fix_file_cache_updater_master
2013-10-29 17:47:33 +01:00
Morris Jobke
404e9c0053
fix style of public share page
2013-10-29 16:08:11 +01:00
Morris Jobke
7223b5acce
Merge pull request #5396 from owncloud/fix-sharing-code
...
Fix sharing error message - id -> file name
2013-10-29 07:33:23 -07:00
Bjoern Schiessle
fcfac51aa1
backport of https://github.com/owncloud/core/pull/5513
2013-10-29 15:08:12 +01:00
Jenkins for ownCloud
b0b76fe064
[tx-robot] updated from transifex
2013-10-29 07:31:51 -04:00
Vincent Petry
e62ca4ea4f
Append file etag to preview URLs
...
Fixes #5534
2013-10-28 14:14:55 +01:00
Jenkins for ownCloud
119ecc6f34
[tx-robot] updated from transifex
2013-10-27 02:32:11 -04:00
Thomas Müller
f91a4c89ca
adding storage_mtime handling to SharedCache
2013-10-25 12:39:21 +02:00
Thomas Müller
1317b7c03d
pass the name of the item source from the browser to the server - no need to get the data via complicated db queries
2013-10-23 18:39:37 +02:00
Bjoern Schiessle
2221aa9ca4
run first getUsersItemShared() with the owner
2013-10-23 16:34:26 +02:00
Bjoern Schiessle
60e219da43
update etags for user we haven't checked yet
2013-10-23 16:34:03 +02:00
Bjoern Schiessle
6ae761d946
keep a list of users we already checked to avoid loops
2013-10-23 16:33:44 +02:00
Bjoern Schiessle
dd972f65a8
fix infinite loop while updating etags, fix for #4365
2013-10-23 16:33:28 +02:00
Thomas Müller
e23433f771
display the original file name - this will change in case of renames
2013-10-22 14:02:44 +02:00
Vincent Petry
a1038c271c
Merge pull request #5424 from owncloud/sharing-directlink
...
Added direct link in public share page
2013-10-21 08:26:51 -07:00
Jan-Christoph Borchardt
5ac4ec3a84
unbold the 'Direct link' label
2013-10-21 00:12:38 +03:00
Jan-Christoph Borchardt
8a643ac5bc
reduce width of direct link input field
2013-10-21 00:09:45 +03:00
Jenkins for ownCloud
6aee83cadf
[tx-robot] updated from transifex
2013-10-19 08:27:13 -04:00
Vincent Petry
7abfe2bd4f
Added direct link in public share page
...
Fixes #1167
2013-10-18 17:40:41 +02:00
Frank Karlitschek
05523e7a70
Merge pull request #3219 from owncloud/disabled-links-ui
...
Disabled links UI fixes
2013-10-18 05:02:06 -07:00
Morris Jobke
1f1fcc6129
Remove "link" shares right after disabling the "allow_link_share" setting
2013-10-18 11:37:13 +02:00
Bjoern Schiessle
48cd9d9444
filter duplicates directly in the sql query
2013-10-18 10:23:34 +02:00
Björn Schießle
76be7cd1ac
Merge pull request #5382 from owncloud/sharing_api_include_reshares
...
add reshare option for the OCS Share API
2013-10-17 11:07:47 -07:00
Jenkins for ownCloud
2845747528
[tx-robot] updated from transifex
2013-10-17 13:48:52 -04:00
Morris Jobke
d8f22160a4
Merge pull request #5393 from owncloud/files-downloadzipwhenzipsizeiszero
...
Fixed zip download button for unlimited filesize in public mode
2013-10-17 08:23:20 -07:00
Bjoern Schiessle
e7dc6b21c8
split up reset()['path'] to make it compatible with older PHP versions
2013-10-17 15:47:36 +02:00
Vincent Petry
b4bffad99a
Fixed zip download button for unlimited filesize in public mode
...
Added missing condition to check whenever allowed zip size is unlimited.
Fixes #3717
2013-10-17 15:30:08 +02:00
Vincent Petry
467f864db4
Fixed sharing status update for new/uploaded files
...
Creating new files, folders or uploading files now have their sharing
icon updated accordingly.
For this, the global share status list that is cached in
OC.Share.statuses is reused for new files.
Performance should improve as the sharing list is now only loaded once
per navigation session.
In OC.Share, split loadIcons into loadIcons + updateIcons.
Fixes #4977
2013-10-17 12:55:10 +02:00
Bjoern Schiessle
99738ae0bc
add test for the reshare option
2013-10-17 12:23:37 +02:00
Bjoern Schiessle
ab6ee79e11
adjust tests
2013-10-17 11:23:07 +02:00
Bjoern Schiessle
abf10ac9bd
new option to add reshares to the result
2013-10-17 11:10:31 +02:00
Jenkins for ownCloud
630be99ddf
[tx-robot] updated from transifex
2013-10-16 00:31:48 -04:00
Björn Schießle
a6d9319328
Merge pull request #5269 from owncloud/ocs_share_api_add_received_from
...
ocs share api: add "received_from" and "received_from_displayname" field
2013-10-15 02:17:23 -07:00
Jenkins for ownCloud
f3336f8877
[tx-robot] updated from transifex
2013-10-13 20:33:30 -04:00
Björn Schießle
4336d42ab0
Merge pull request #5233 from owncloud/enc_filter_users
...
only encrypt file to users with encryption keys
2013-10-11 01:48:02 -07:00
Bjoern Schiessle
7a1705d28e
fix api tests
2013-10-11 10:28:01 +02:00
Jenkins for ownCloud
44a5b0bad0
[tx-robot] updated from transifex
2013-10-10 22:30:58 -04:00
Bjoern Schiessle
3dd313dca2
add "received_from" and "received_from_displayname" field in case of a reshared file to the output
2013-10-10 19:46:45 +02:00
Morris Jobke
cf554fd804
Merge pull request #5182 from owncloud/fix-sharring-with-password-screen
...
Fix password screen for public shares
2013-10-10 04:49:47 -07:00
VicDeo
1cb47bf777
Merge pull request #5221 from owncloud/fixing-5217-master
...
fixing php 5.3 compatibility
2013-10-10 01:55:18 -07:00
Bjoern Schiessle
a1719deabe
make sure that we are logged in ad user1 while performing the tests
2013-10-10 10:47:35 +02:00
Thomas Müller
8a06f2e128
php 5.3 compatibility for Test_Files_Sharing_Api
2013-10-08 23:05:19 +02:00
Vincent Petry
cddb85c588
Added filesApp flag as input field for files app detection
...
Since the files app can be reached under multiple URLs, either root,
files.php or public.php, a flag has been added to the DOM to help apps
(like file viewers) to detect whether they are currently in the files
app.
2013-10-08 17:19:58 +02:00
Morris Jobke
6284ab31de
fix escaping
2013-10-08 16:00:26 +02:00
Bjoern Schiessle
68e1dd1f23
make sure that we only remove file/folder shares
2013-10-08 16:00:18 +02:00
Morris Jobke
4af220d09e
Fix password screen for public shares
...
* Works in IE8, 9, 10, Firefox 24 and Chromium 30
* Credits to Julian Müller @Julian1998
2013-10-07 17:38:27 +02:00
Vincent Petry
6a36d7fa86
Added isPublic flag in files_sharing template
...
To make it possible for apps to find out whether they are running in
public mode, the flag "isPublic" will now be present in the DOM.
This is required to disable the editor app in public mode to fix #5059
2013-10-07 16:59:57 +02:00
Björn Schießle
981608cf6b
Merge pull request #5129 from owncloud/remove_deleted_shares_from_db
...
remove deleted files from oc_share
2013-10-07 02:07:11 -07:00
Bjoern Schiessle
288f01bf62
catch exception if db query execution fails
2013-10-07 11:06:24 +02:00
Bjoern Schiessle
4f67b7a6c3
Merge branch 'master' into remove_deleted_shares_from_db
2013-10-07 11:00:56 +02:00
Bjoern Schiessle
0346167bb2
clean up oc_share table from files which are no longer exists
2013-10-07 10:59:09 +02:00
raghunayyar
cf84154ee0
Cleans up Core apps for relative(em) to absolute(px) styles.
2013-10-06 23:38:24 +05:30
Morris Jobke
a927c145be
Merge pull request #5102 from owncloud/input-simplify
...
Input simplify
2013-10-04 10:40:32 -07:00
Bjoern Schiessle
401740166b
add comments
2013-10-04 16:50:53 +02:00
Jan-Christoph Borchardt
da0db7bcb2
fix multiselect bar opacity, webroot
2013-10-04 17:32:06 +03:00
Björn Schießle
2cdf54b77d
Merge pull request #4877 from owncloud/ocs_share_api
...
OCS Share API
2013-10-04 07:10:21 -07:00
Bjoern Schiessle
2e7f481e6b
update tests
2013-10-04 14:32:15 +02:00
Bjoern Schiessle
dd2bf69152
use true/false instead of yes/no for publicUpload and subfiles parameter
2013-10-04 12:16:47 +02:00
Bjoern Schiessle
a1fe5148b5
use always path as parameter to specify a file/folder
2013-10-04 12:10:11 +02:00
Jan-Christoph Borchardt
308d4383a3
simplify input elements for less cognitive load. No box-shadow, no text-shadow, smaller border-radius
2013-10-03 16:35:42 +03:00
Bjoern Schiessle
aa660a3475
remove deleted shares from the database table oc_share
2013-10-02 13:26:38 +02:00
Jenkins for ownCloud
a711399e62
[tx-robot] updated from transifex
2013-09-30 10:19:22 -04:00
Bjoern Schiessle
513dc20d4b
also return success if no shares are found.
2013-09-30 13:05:34 +02:00
Bjoern Schiessle
6d830087db
add testUpdateShareUpload()
2013-09-30 12:57:55 +02:00
Bjoern Schiessle
03db954e1a
add getShareFromFolder() test
2013-09-30 12:38:36 +02:00
Bjoern Schiessle
9a2e82c3c5
Make sure that testDeleteShare() has some shares to delete
2013-09-30 12:23:44 +02:00
Thomas Müller
258e8d58da
flipping arguments on assertEquals() - first argument contains the expected value and second argument contains the value to be asserted
2013-09-29 22:20:42 +02:00
Thomas Müller
63ea6844e8
- adding unit test testGetShareFromUnknownId()
...
- fixing getShareFromId() for Oracle
- fixing error message
2013-09-29 22:16:48 +02:00
Thomas Müller
687ba053b7
Merge branch 'master' into appframework-master
2013-09-27 14:25:47 +02:00
Thomas Müller
735608f513
Merge pull request #4207 from owncloud/search_shared_files
...
add initial search in shared files
2013-09-27 05:18:12 -07:00
Bjoern Schiessle
f935a38559
add some comments
2013-09-27 14:04:28 +02:00
Bjoern Schiessle
5b4f515e7b
add test getShareFromId
2013-09-27 14:01:04 +02:00
Bjoern Schiessle
b9d6539d76
Merge branch 'master' into ocs_share_api
2013-09-26 13:02:39 +02:00
Bjoern Schiessle
4077ed6ddb
add some additional assertions to the tests
2013-09-25 15:05:23 +02:00
Thomas Müller
db39fede97
Merge branch 'master' into appframework-master
...
Conflicts:
apps/files/lib/helper.php
apps/files_trashbin/lib/helper.php
2013-09-25 09:52:12 +02:00
Thomas Müller
333d3eda99
add error message to the assert
2013-09-25 09:43:16 +02:00
Thomas Müller
cd2421c7ee
adding PHPDoc comments to getBackend
...
ensure getChildren() is called on an instance of Share_Backend_Collection
2013-09-24 10:37:58 +02:00
Bjoern Schiessle
259f03bee2
remove debug output
2013-09-23 14:10:09 +02:00
Jörn Friedrich Dreyer
4b3e56bcf9
remove unneccessary lib in namespace
2013-09-20 16:46:33 +02:00
Jörn Friedrich Dreyer
9e39118b52
namespaces use upcasefirst parts
...
when _ is left in namespace and files are named after their classes the autoloader will also find classes in the lib folder of an app
its magic!
2013-09-20 16:37:07 +02:00
Bjoern Schiessle
7626540679
make sure that files are shared correctly before each test and unshared again after the test
2013-09-20 12:38:23 +02:00
Bjoern Schiessle
bd09910f67
disable encrpytion app before performing tests
2013-09-20 11:24:18 +02:00
Bjoern Schiessle
57092e817f
disable encryption app for share API tests
2013-09-19 20:14:34 +02:00
Jörn Friedrich Dreyer
6aeb0a99da
same for search by mime
2013-09-19 21:08:32 +03:00
Jörn Friedrich Dreyer
3b4020e811
add all results, sharing cache also returns entries for shared files in external storages
2013-09-19 21:08:32 +03:00
Jörn Friedrich Dreyer
466fd8acda
fix getAll(), refactor search by mime & search
2013-09-19 21:08:32 +03:00
Jörn Friedrich Dreyer
392c6b6832
return fixed path, skip shared files outside of 'files'
2013-09-19 21:08:32 +03:00
Jörn Friedrich Dreyer
27511d9187
divide ids into chunks of 1k
2013-09-19 21:08:32 +03:00
Jörn Friedrich Dreyer
e8bf576184
add initial search in shared files
2013-09-19 21:08:32 +03:00
Jörn Friedrich Dreyer
7e0631b3b8
Merge branch 'master' into fix_3728_with_file_exists_dialog
...
Conflicts:
apps/files/js/filelist.js
2013-09-19 17:00:54 +02:00
Bjoern Schiessle
39920955f2
set share id to 'unknown' if we can't retrive one
2013-09-19 16:52:44 +02:00
Bjoern Schiessle
c9f1538c1f
extend API to get the shares from all files in a given folder
2013-09-19 16:41:29 +02:00
Bjoern Schiessle
8cf8c0b161
remove some unused variables
2013-09-19 14:42:34 +02:00
Bjoern Schiessle
b947aab802
some unit test for the new ocs share api
2013-09-19 14:39:51 +02:00
Bjoern Schiessle
199121134f
return error if wrong shareType is given
2013-09-19 10:33:04 +02:00
Jenkins for ownCloud
6b1843d91b
[tx-robot] updated from transifex
2013-09-18 11:50:02 -04:00
Jörn Friedrich Dreyer
12ff268e60
move upload dialog css to separate file
2013-09-18 17:20:14 +02:00
Bjoern Schiessle
171b7ebffe
remove debug output
2013-09-18 10:11:20 +02:00
Jörn Friedrich Dreyer
b59ce403d8
Merge branch 'master' into fix_3728_with_file_exists_dialog
...
Conflicts:
apps/files/css/files.css
apps/files/js/file-upload.js
apps/files/js/filelist.js
apps/files/js/files.js
apps/files_sharing/js/public.js
core/js/jquery.ocdialog.js
core/js/oc-dialogs.js
2013-09-17 19:10:46 +02:00
Bjoern Schiessle
e52639e4e6
use share ID as REST resource
2013-09-17 15:27:46 +02:00
Thomas Müller
9b420e8660
use \OC::$server->getPreviewManager() instead of \OCP\Preview
2013-09-17 13:33:47 +02:00
Bjoern Schiessle
86dbb13823
more rest-style API
2013-09-17 11:53:38 +02:00
Bjoern Schiessle
ef3307f099
return error if public upload is disabled
2013-09-16 17:42:56 +02:00
Bjoern Schiessle
7aed24fa6c
allow to set a different permission during initial share operation
2013-09-16 17:28:17 +02:00
Bjoern Schiessle
14437ffd15
ocs api for file sharing
2013-09-16 17:04:49 +02:00
Thomas Müller
46f59b165e
Merge pull request #4838 from owncloud/refactor_upload_js
...
refactor upload js & html to always use only js to fill form data
2013-09-16 01:06:24 -07:00
Thomas Müller
a0c2c2473a
Merge pull request #4501 from owncloud/ajaxfilelist
...
Ajax calls for "files" and "files_trashbin" apps
2013-09-14 12:51:16 -07:00
Jenkins for ownCloud
556bd1ef23
[tx-robot] updated from transifex
2013-09-13 21:49:24 -04:00
Vincent Petry
1304b511e9
Ajax calls for "files" and "files_trashbin" apps
...
Frontend:
- The files app list now uses ajax calls to refresh the list.
- Added support the browser back button (history API).
- Added mask + spinner while loading file list
Backend:
- Added utility function in core JS for parsing query strings.
- Moved file list + breadcrumb template data code to helper
functions
- Fixed some file paths in trashbin app to be similar to the files app
2013-09-13 19:59:14 +02:00
Jörn Friedrich Dreyer
7854cf04ee
refactor upload js & html to always use only js to fill form data
2013-09-13 17:07:52 +02:00
Thomas Müller
d5ddbfb045
Merge pull request #4719 from owncloud/port_4701_master
...
Always check variable type before using readdir to avoid surprises
2013-09-12 15:44:20 -07:00
Thomas Müller
9d661eab23
adding calls to \OCA\files\lib\Helper::determineIcon($i) in files, trashbin and sharing
2013-09-12 00:40:35 +02:00
Jenkins for ownCloud
68015b2761
[tx-robot] updated from transifex
2013-09-11 06:50:06 -04:00
Jörn Friedrich Dreyer
cec932f292
Merge branch 'master' into fix_3728_with_file_exists_dialog
...
Conflicts:
apps/files/js/file-upload.js
2013-09-10 16:54:48 +02:00
Jenkins for ownCloud
72689f643b
[tx-robot] updated from transifex
2013-09-10 10:42:16 -04:00