6a4563f203
Fix breadcrumb to reinit dnd after ajax nav #5064
...
Now correctly reinitializing the breadcrumb drop zone after ajax
navigation.
This also fixes dropping onto the "files" app icon.
2013-10-07 11:07:33 +02:00
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
288f01bf62
catch exception if db query execution fails
2013-10-07 11:06:24 +02:00
4f67b7a6c3
Merge branch 'master' into remove_deleted_shares_from_db
2013-10-07 11:00:56 +02:00
0346167bb2
clean up oc_share table from files which are no longer exists
2013-10-07 10:59:09 +02:00
46fdb449a4
Merge pull request #4662 from owncloud/fix-4129
...
Fix 4129
2013-10-06 23:42:44 -07:00
3613e79e10
[tx-robot] updated from transifex
2013-10-06 19:16:10 -04:00
5470700c9a
Update file to meet coding standarts
2013-10-07 01:08:39 +02:00
72ad309920
Actually test the connection
2013-10-07 01:08:38 +02:00
b9a948b597
Fixes #4129
2013-10-07 01:08:38 +02:00
e1e16ec3b0
Merge pull request #5088 from owncloud/fix_trashbin_button
...
trash bin button needs to be an input field
2013-10-06 14:51:08 -07:00
2b521327c0
more elegant style for Personal and Admin settings
2013-10-05 11:23:49 +02:00
cc1e69c190
Merge pull request #5136 from owncloud/design-fixes
...
Design fixes
2013-10-04 14:56:09 -07:00
a927c145be
Merge pull request #5102 from owncloud/input-simplify
...
Input simplify
2013-10-04 10:40:32 -07:00
fcb9b49d1f
increase font size of file actions for better readability
2013-10-04 20:25:18 +03:00
0736bfb43a
Do not call changeDirectory() when no dir set on breadcrumb
...
Some apps like the files_trashbin app do not set a directory on its
"home" breadcrumb link.
This fix makes sure that the click event doesn't do anything in that
case and lets the browser open the link.
This fixes the "home" icon in the trashbin app which now correctly
reopens the files app.
2013-10-04 17:49:42 +02:00
401740166b
add comments
2013-10-04 16:50:53 +02:00
da0db7bcb2
fix multiselect bar opacity, webroot
2013-10-04 17:32:06 +03:00
2cdf54b77d
Merge pull request #4877 from owncloud/ocs_share_api
...
OCS Share API
2013-10-04 07:10:21 -07:00
041837de2c
merge master into input-simplify
2013-10-04 17:08:34 +03:00
7337b34110
Merge pull request #5085 from owncloud/versioning_preview
...
add previews to versions dialog
2013-10-04 06:13:54 -07:00
54dd91b859
remove hover effect from preview image
2013-10-04 15:13:05 +02:00
2e7f481e6b
update tests
2013-10-04 14:32:15 +02:00
ba0f2f10a7
Merge pull request #4933 from owncloud/1376-filesappplussigninurlbug
...
Replace plus sign with space in files app URL #4932
2013-10-04 05:30:30 -07:00
2cfb5fb2d2
vertical align versions text
2013-10-04 14:13:48 +02:00
51295e9a6b
Merge branch 'master' into sharing_mail_notification_master
...
Conflicts:
apps/files/index.php
apps/files/templates/index.php
2013-10-04 12:30:49 +02:00
dd2bf69152
use true/false instead of yes/no for publicUpload and subfiles parameter
2013-10-04 12:16:47 +02:00
a1fe5148b5
use always path as parameter to specify a file/folder
2013-10-04 12:10:11 +02:00
0c837cefb6
LDAP: allow different UUID attributes for groups and users
2013-10-04 11:47:40 +02:00
c38638fdf4
Merge pull request #4815 from owncloud/ldap_improve_testing
...
LDAP modularization and tests
2013-10-04 02:41:06 -07:00
5b7f76e702
Merge pull request #4691 from owncloud/encryption_improved_error_messages_4617
...
Encryption improved error messages
2013-10-04 02:28:18 -07:00
1992450b32
Merge pull request #4902 from owncloud/repeat_recovery_password
...
let user repeat the recovery key password to prevent typos
2013-10-04 02:23:01 -07:00
9d2595a7c5
Shortened notification message that was too long
...
The message for invalid private key was too long and didn't fit in the
notification box. This fix reduces the message to fit properly by
removing the extra information.
2013-10-04 11:11:24 +02:00
b7c3af11bf
fix hidden fieled name
2013-10-04 10:46:55 +02:00
47f59d2e42
we don't know \OCA\Encryption\Session if the encryption app is not enabled, so we have to set the status manually
2013-10-04 10:37:58 +02:00
c335169f6d
increase height of controls bar and elements to more clickable 44px
2013-10-04 08:41:16 +03:00
13218ec689
remove duplicate upload CSS from files.css
2013-10-03 17:08:29 +03:00
f3e0cbdeed
fix position of New and Deleted Files buttons
2013-10-03 16:49:49 +03:00
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
5501dd623e
add/remove specific CSS class - not all classes
2013-10-03 12:22:25 +02:00
9c23c3449b
Merge branch 'master' into sharing_mail_notification_master
...
Conflicts:
core/css/share.css
2013-10-02 23:33:50 +02:00
51c34777c4
extend test case
2013-10-02 22:28:19 +02:00
f8093699f7
Merge pull request #5093 from owncloud/file-actions
...
File Selected on Click instead of download.
2013-10-02 09:56:08 -07:00
0d5653c6b1
Takes nametext inside the anchor tag to fix the issue completely.
2013-10-02 22:11:03 +05:30
4a5f3442b5
Closes Label inside the a tag for not hiding the fileactions.
2013-10-02 21:40:34 +05:30
81b4904c78
File Selected on Click instead of download.
2013-10-02 21:13:07 +05:30
5feaa55779
simplify From Link icon in New menu
2013-10-02 18:27:39 +03:00
9853b33420
reduce rounded corners of New dropdown
2013-10-02 18:04:08 +03:00
b0a71bde15
maxX and maxY should be a integer
2013-10-02 16:34:05 +02:00
9be6114a52
trash bin button needs to be an input field
2013-10-02 16:13:08 +02:00
eb1216f949
add previews to versions dialog
2013-10-02 15:23:51 +02:00
aa660a3475
remove deleted shares from the database table oc_share
2013-10-02 13:26:38 +02:00
feb7028a78
Remove require in rawlist.php
...
Thanks @tanghus for pointing out the unneccessity of it.
2013-10-02 12:45:30 +02:00
013e9c27d2
Fix require in apps/files/ajax/rawlist.php
2013-10-02 12:21:52 +02:00
8b08b1b455
Merge branch 'master' into sharing_mail_notification_master
...
Conflicts:
lib/private/util.php
2013-10-02 10:11:18 +02:00
de43515cfa
fix recursive delete for smb
2013-10-01 22:33:58 +02:00
29deef38b2
fix using touch to create a file for smb
2013-10-01 22:31:22 +02:00
ea566868a8
return the correct result when doing an smb rename
2013-10-01 22:29:33 +02:00
ea6115bfaa
fix smb streamwrapper on non existing files
2013-10-01 22:18:03 +02:00
b58a464b86
Merge pull request #4967 from owncloud/dont_remember_login_if_enc_enabled
...
don't remember login if the encrypion app is enabled
2013-09-30 10:53:41 -07:00
a711399e62
[tx-robot] updated from transifex
2013-09-30 10:19:22 -04:00
4d79e7e673
Merge branch 'master' into encryption_improved_error_messages_4617
2013-09-30 15:08:53 +02:00
ecfde5faa1
Contains ownCloud's own implementation of the Sabre_DAV_Server regarding the handling of depth infinity
...
The clean way would have been to submit proper patches to the upstream project and reincorporate the code once released.
This will and has to follow!
2013-09-30 13:12:51 +02:00
480aeb804f
Merge pull request #4459 from owncloud/appframework-master
...
Public API for OC6+ (includes AppFramework)
2013-09-30 04:11:28 -07:00
513dc20d4b
also return success if no shares are found.
2013-09-30 13:05:34 +02:00
6d830087db
add testUpdateShareUpload()
2013-09-30 12:57:55 +02:00
03db954e1a
add getShareFromFolder() test
2013-09-30 12:38:36 +02:00
9a2e82c3c5
Make sure that testDeleteShare() has some shares to delete
2013-09-30 12:23:44 +02:00
952433eae6
Merge branch 'master' into move-aborted-upload-detection-into-plugin-master
2013-09-30 09:21:37 +02:00
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
63ea6844e8
- adding unit test testGetShareFromUnknownId()
...
- fixing getShareFromId() for Oracle
- fixing error message
2013-09-29 22:16:48 +02:00
5462e199d3
Merge branch 'master' into appframework-master
2013-09-29 20:07:56 +02:00
59e4ff7d24
[tx-robot] updated from transifex
2013-09-29 00:03:26 -04:00
0f5fed5409
fix license header line breaks
2013-09-27 17:02:57 +02:00
687ba053b7
Merge branch 'master' into appframework-master
2013-09-27 14:25:47 +02:00
735608f513
Merge pull request #4207 from owncloud/search_shared_files
...
add initial search in shared files
2013-09-27 05:18:12 -07:00
f935a38559
add some comments
2013-09-27 14:04:28 +02:00
5b4f515e7b
add test getShareFromId
2013-09-27 14:01:04 +02:00
3e1bdd8a04
remove outdated (thus failing) and anyway insufficient group tests - for now
2013-09-27 13:34:16 +02:00
05ee6606f1
give test file a proper name
2013-09-27 13:34:16 +02:00
2cebd8b92e
added user_ldap tests via public api calls
2013-09-27 13:34:16 +02:00
a1aff3e8a1
LDAP: don't throw exceptions in the wrapper, errors are handled in the code. nevertheless, log unexpected errors
2013-09-27 13:34:16 +02:00
81cf4a22ef
LDAP: coding style
2013-09-27 13:34:15 +02:00
84f522f406
LDAP: simple tests for the user backend
2013-09-27 13:34:15 +02:00
bb162b1f94
LDAP: get rid of some PHP Warnings
2013-09-27 13:34:15 +02:00
d4f92494a2
LDAP: make Access be a dependency to the user and group backend instead of inheriting it.
2013-09-27 13:34:15 +02:00
b9cc2ad660
Whitespaces
2013-09-27 13:34:15 +02:00
f04aa1af5d
LDAP: don't check var type when you can specify the type in the parameter list
2013-09-27 13:34:15 +02:00
b9cd22cf78
LDAP: use wrapper, not direct function call
2013-09-27 13:34:15 +02:00
5090ca3eb4
LDAP: add phpdoc
2013-09-27 13:34:15 +02:00
6e850e0bee
LDAP: establish wrapper interface to allow proper mocking
2013-09-27 13:34:15 +02:00
52454e39b7
LDAP: move is_resource check to ldap wrapper to make it mockable
2013-09-27 13:34:15 +02:00
d34fbf3a86
LDAP: move PHP LDAP functions calls to an LDAP Wrapper for better isolation and mock testing
2013-09-27 13:34:15 +02:00
1a020e0696
Resolve merge conflict
2013-09-27 13:34:15 +02:00
f31d31844e
[tx-robot] updated from transifex
2013-09-27 00:02:30 -04:00
7e54e8831e
set rememberlogin to false for the encryption app
2013-09-26 19:34:50 +02:00
62b8c36a40
check if encryption app is enabled before trying to calculate file size
2013-09-26 16:27:14 +02:00
b9d6539d76
Merge branch 'master' into ocs_share_api
2013-09-26 13:02:39 +02:00
663009f895
fix check if app is enabled
2013-09-26 11:08:02 +02:00
4d2dfa98c0
check if key exists before reading it
2013-09-26 11:06:58 +02:00
0b98427536
fix check if app is enabled
2013-09-25 19:23:07 +02:00
71bbb2ea8b
check if key exists before reading it
2013-09-25 17:44:05 +02:00
09b64535a9
fixing copyright and add class documentation
2013-09-25 17:05:14 +02:00
4077ed6ddb
add some additional assertions to the tests
2013-09-25 15:05:23 +02:00
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
333d3eda99
add error message to the assert
2013-09-25 09:43:16 +02:00
2d12e52769
[tx-robot] updated from transifex
2013-09-24 12:59:48 -04:00
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
d7409547aa
Fix not displaying "Upload something!" message
...
Fix #4940
2013-09-23 16:39:42 +02:00
259f03bee2
remove debug output
2013-09-23 14:10:09 +02:00
8a1618bce5
implement previews for public upload
2013-09-23 12:27:05 +02:00
fc76a13c52
Merge branch 'master' into sharing_mail_notification_master
...
Conflicts:
lib/public/share.php
2013-09-23 11:18:00 +02:00
f6e8a388a9
Merge branch 'master' into encryption_improved_error_messages_4617
...
Conflicts:
settings/ajax/changepassword.php
2013-09-23 10:39:12 +02:00
edd38e5948
fix previews in shared folders
2013-09-23 10:26:46 +02:00
28918d61d2
[tx-robot] updated from transifex
2013-09-22 12:58:42 -04:00
2a0c51a8bf
Merge pull request #4927 from owncloud/fix_namespaces_and_autoloading
...
namespaces use upcasefirst parts
2013-09-21 11:54:06 -07:00
1962bed261
Replace plus sign with space in files app URL #4932
...
Some apps create URLs to the files app and encode the spaces of a
directory using plus signs.
This fix ensures that plus signs are properly converted back to spaces
when parsing the URL on the JS side.
2013-09-20 22:08:57 +02:00
5b95e7aa0f
[tx-robot] updated from transifex
2013-09-20 10:50:14 -04:00
4b3e56bcf9
remove unneccessary lib in namespace
2013-09-20 16:46:33 +02:00
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
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
bd09910f67
disable encrpytion app before performing tests
2013-09-20 11:24:18 +02:00
96c27ead92
check if encryption app is enabled
2013-09-20 11:21:34 +02:00
8e26f291a7
Merge pull request #4684 from owncloud/improved-console
...
Use more object oriented way for console commands
2013-09-19 14:22:32 -07:00
57092e817f
disable encryption app for share API tests
2013-09-19 20:14:34 +02:00
6aeb0a99da
same for search by mime
2013-09-19 21:08:32 +03:00
3b4020e811
add all results, sharing cache also returns entries for shared files in external storages
2013-09-19 21:08:32 +03:00
466fd8acda
fix getAll(), refactor search by mime & search
2013-09-19 21:08:32 +03:00
392c6b6832
return fixed path, skip shared files outside of 'files'
2013-09-19 21:08:32 +03:00
27511d9187
divide ids into chunks of 1k
2013-09-19 21:08:32 +03:00
e8bf576184
add initial search in shared files
2013-09-19 21:08:32 +03:00
a9ea99e93d
Add copyright, remove starting blank line
2013-09-19 19:12:16 +02:00
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
39920955f2
set share id to 'unknown' if we can't retrive one
2013-09-19 16:52:44 +02:00
bd5cb1d801
Merge pull request #4900 from owncloud/fixing-4488-master
...
File permissions are part of the ajax response of file upload
2013-09-19 07:46:37 -07:00
c9f1538c1f
extend API to get the shares from all files in a given folder
2013-09-19 16:41:29 +02:00
9f9eb1b08f
Merge pull request #4263 from owncloud/search_scrollto
...
initial scrollto implementation
2013-09-19 05:49:45 -07:00
98ff847830
fix race condition in lazy preview loading
2013-09-19 14:46:33 +02:00
8cf8c0b161
remove some unused variables
2013-09-19 14:42:34 +02:00
b947aab802
some unit test for the new ocs share api
2013-09-19 14:39:51 +02:00
4344c62f7e
Merge branch 'master' into fixing-4488-master
2013-09-19 11:43:38 +02:00
1bba800e47
Merge branch 'fix_3728_with_file_exists_dialog' of github.com:owncloud/core into fix_3728_with_file_exists_dialog
2013-09-19 11:33:34 +02:00
ae97fad632
fix double translation of error message
2013-09-19 11:32:56 +02:00
eea02cee2f
Merge branch 'fix_3728_with_file_exists_dialog' of github.com:owncloud/core into fix_3728_with_file_exists_dialog
...
Conflicts:
apps/files/js/file-upload.js
2013-09-19 11:15:20 +02:00
c30c153ea5
fixing typos and l10n
2013-09-19 11:13:11 +02:00
89ed0007c0
jsdoc types should go into {}
2013-09-19 11:11:22 +02:00
199121134f
return error if wrong shareType is given
2013-09-19 10:33:04 +02:00
bc3b147396
remove spaces
2013-09-19 10:13:21 +02:00
0d81a53e12
use 96x96 as 64x64 thumbnails in conflicts dialog, 64x64 looks very blocky ... maybe something is wrong there
2013-09-19 10:00:42 +02:00
43a96621ea
adding comma to get cleaner diffs in the future
2013-09-18 23:42:36 +02:00
3c0e93e220
no file actions during upload
2013-09-18 23:06:48 +02:00
6b1843d91b
[tx-robot] updated from transifex
2013-09-18 11:50:02 -04:00
7bd5e89f8c
simplify conflict template handling, fix reopen after ESC
2013-09-18 17:22:29 +02:00
12ff268e60
move upload dialog css to separate file
2013-09-18 17:20:14 +02:00
4edd8b8303
remove debug output
2013-09-18 16:08:29 +02:00
5fb0e257a4
let user repeat the recovery key password to prevent typos
2013-09-18 16:03:53 +02:00
715846626e
hide excessive logging with a trace flag
2013-09-18 14:39:39 +02:00
17337b22af
Merge branch 'master' into fix_3728_with_file_exists_dialog
...
Conflicts:
apps/files/js/file-upload.js
2013-09-18 14:19:58 +02:00
ec1949f5ed
Merge branch 'master' into fix_3728_with_file_exists_dialog
2013-09-18 14:15:28 +02:00
c531b4ef5b
Merge pull request #4872 from owncloud/refactor_upload_progress
...
refactor upload progress
2013-09-18 04:55:10 -07:00
20a43d1982
remove file action elements before recreating them
2013-09-18 13:09:47 +02:00
6ed2df11fc
store the permissions retrieved via ajax within the dom element
2013-09-18 13:09:04 +02:00
370ed814f7
add permissions of the file to the json response
2013-09-18 11:22:29 +02:00
e0f18ec72b
Merge pull request #4708 from owncloud/encryption_fixes
...
make sure that initial encryption also starts for a fresh installation
2013-09-18 01:33:52 -07:00
171b7ebffe
remove debug output
2013-09-18 10:11:20 +02:00
86c4c83b86
use exists
2013-09-17 19:11:18 +02:00
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
b40925ae17
initial scrollto implementation:
...
use places/folder icon,
move link construction to JS,
only show icon on hover,
use 'searchresult' as css class name,
add filter/unfilter methods,
highlight searched files in current filelist
only filter when correct FileList is present
2013-09-17 18:40:51 +02:00
72eaf2894a
performance improvement, check configuration only if no private key exists
2013-09-17 16:53:52 +02:00
e52639e4e6
use share ID as REST resource
2013-09-17 15:27:46 +02:00
9b420e8660
use \OC::$server->getPreviewManager() instead of \OCP\Preview
2013-09-17 13:33:47 +02:00
86dbb13823
more rest-style API
2013-09-17 11:53:38 +02:00
ef3307f099
return error if public upload is disabled
2013-09-16 17:42:56 +02:00
5cf12888ad
[tx-robot] updated from transifex
2013-09-16 11:38:45 -04:00
7aed24fa6c
allow to set a different permission during initial share operation
2013-09-16 17:28:17 +02:00
14437ffd15
ocs api for file sharing
2013-09-16 17:04:49 +02:00
d41e722629
refactor upload progress
2013-09-16 14:14:46 +02:00
82cbbb8ab8
Merge branch 'master' into encryption_improved_error_messages_4617
...
Conflicts:
apps/files/index.php
2013-09-16 10:42:37 +02:00
534d93d2d3
Merge branch 'master' into sharing_mail_notification_master
...
Conflicts:
apps/files/index.php
2013-09-16 10:40:06 +02:00
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
db7e1dd877
Merge pull request #4853 from owncloud/external-shared_mimetype-icons
...
Use external and shared icons in OC.Dialogs.filepicker()
2013-09-15 02:42:14 -07:00
a0c2c2473a
Merge pull request #4501 from owncloud/ajaxfilelist
...
Ajax calls for "files" and "files_trashbin" apps
2013-09-14 12:51:16 -07:00
c117e719da
Use external and shared icons in OC.Dialogs.filepicker()
2013-09-14 14:35:23 +02:00
556bd1ef23
[tx-robot] updated from transifex
2013-09-13 21:49:24 -04:00
ec2f20f720
Fixed files_trashbin to also use hash URL part for IE8
2013-09-13 21:00:15 +02:00
30a2f2f352
Use hash part of URL for IE8 in files app
...
Before this fix, the URL wasn't updated in IE8 when navigating into
folders.
This fix makes use of the hash part of URLs to make this work in IE8,
since IE8 doesn't support the history API nor changing the URL without
redirecting.
From now, both the regular query URL "?dir=somedir" and "#?dir=somedir"
will work in both IE8 and non-IE8 browsers.
In IE8, query based URLs are automatically converted to hash URLs upon
page load. The conversion is done on the server side by redirecting the
user to the updated URL.
When loading a page directly using a hash URL in the form
"#?dir=somedir" in IE8, the server doesn't get the hash, so it will not
return any results in that case and rely on ajax to load the first page.
2013-09-13 20:48:35 +02:00
4d38441e72
Fixed loading mask/spinner to stay fixed on scroll
2013-09-13 19:59:15 +02:00
611075bf20
Fixed JS error in trashbin app
2013-09-13 19:59:15 +02:00
3cf0820d35
Changed breadcrumb event handling to not use delegate
...
Using delegate might break apps that embed themselves in the files
container. When an app embeds itself and the user clicks a breadcrumb,
it will simply reload the whole browser page.
2013-09-13 19:59:15 +02:00
364e7991a4
Fixed ajax support to also update the current dir permissions
2013-09-13 19:59:15 +02:00
4549cf519e
Added missing "files" JS to files_trashbin module
...
The recent refactoring for the breadcrumb resizing relies on the "Files"
object which is in the "files" Javascript file.
This fix includes it here as well.
2013-09-13 19:59:15 +02:00
4ab5e58e02
update file summary on ajax file list load
2013-09-13 19:59:15 +02:00
4e751cbb47
fixing breadcrumbs on ajax loading of files
2013-09-13 19:59:15 +02:00
ef955bae56
calling replaceSVG() to display breadcrumb images correctly on IE8
2013-09-13 19:59:15 +02:00
e6f21927d6
fixing no-repeat for IE8
2013-09-13 19:59:15 +02:00
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
666bbbe060
Use appinfo/register_command.php to add commands to the console command
2013-09-13 18:10:04 +02:00
7854cf04ee
refactor upload js & html to always use only js to fill form data
2013-09-13 17:07:52 +02:00
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
c7ca86799b
Merge pull request #4816 from owncloud/fixing-723-master
...
Fixing 723 master
2013-09-12 07:48:00 -07:00
b7205d97d7
Merge pull request #4735 from owncloud/multiple_mimetypes_rawlist
...
Make it possible to pass rawlist.php an JSON array, to filter by more than one mimetype
2013-09-11 17:18:04 -07:00
9d661eab23
adding calls to \OCA\files\lib\Helper::determineIcon($i) in files, trashbin and sharing
2013-09-12 00:40:35 +02:00
5af111b0de
added determineIcon to \OCA\files\lib\Helper
2013-09-12 00:39:52 +02:00
3066b44928
remove unused $relativePath
2013-09-12 00:39:03 +02:00
4d62f747fa
Clean up rawlist.php and fix non-array request
2013-09-12 00:21:01 +02:00
b49f43c3ae
move icon generation logic out of the template
2013-09-12 00:13:19 +02:00
68015b2761
[tx-robot] updated from transifex
2013-09-11 06:50:06 -04:00
83d3df4111
Split some lines, use ===, avoid unnecessary operation
2013-09-11 12:12:40 +02:00
4ab8dc9c08
Merge pull request #4788 from owncloud/fixin-irods-session-master
...
Fixing session handling in iRODS
2013-09-11 00:01:55 -07:00
3b835ea1b6
never hack late night
2013-09-11 01:11:57 +02:00
ec255b52be
fixing boolean handling
2013-09-11 00:49:45 +02:00
2c9b3d32ef
unify .original div to fix css in firefox, clear:left to fix filename wrapping in chrome, shrink width of columns and get rid of ie8 hack
2013-09-10 17:34:28 +02:00
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
72689f643b
[tx-robot] updated from transifex
2013-09-10 10:42:16 -04:00
d63ca25a94
proper test for use_logon_credentials
2013-09-10 12:35:14 +02:00
36e7a7c29b
use \OC::$session instead of $_SESSION
2013-09-10 12:34:41 +02:00
21e5daa218
removing all ?> jutt in case
2013-09-10 11:25:40 +02:00
c32c116957
removing ?> followed by whitespaces
2013-09-10 11:16:43 +02:00
956a2335ad
Merge pull request #4647 from owncloud/fix_4619
...
Workaround for IE 9 & 10 for clicking filelist after adding new item
2013-09-10 01:22:25 -07:00
2cdde7a56a
Merge pull request #4726 from owncloud/files-ie8-missingfilecheckboxes
...
Fixed missing checkboxes in IE8
2013-09-09 18:25:37 -07:00
92f6c3bb10
[tx-robot] updated from transifex
2013-09-08 21:37:53 -04:00
5f67ccba00
Fixed missing checkboxes in IE8
...
IE8 is not happy with the :checked CSS3 selector which causes it to
ignore the whole rule.
Replace it with a more compatible selector.
2013-09-08 22:21:07 +02:00
03c90e968f
whitespace and indentation fixes
2013-09-08 17:29:43 +02:00
577e3f22b2
remove unused hooks
2013-09-08 10:43:52 +02:00
8828fafd36
cleanup comments
2013-09-08 10:41:20 +02:00
e895cf9188
[tx-robot] updated from transifex
2013-09-07 04:46:57 -04:00
ce03501646
fine ie8 compatability
2013-09-06 23:44:40 +02:00
673e0c01a7
fix page leaving checks
2013-09-06 22:40:10 +02:00
796e137e82
fix upload to folder
2013-09-06 18:51:27 +02:00
e2c0fe8296
fix upload of multiple files
2013-09-06 18:16:40 +02:00
238d92b11c
refactor replace and autorename resolution in upload.php
2013-09-06 17:53:58 +02:00
b2dde14dbc
coding style fixes
2013-09-06 16:07:18 +02:00
93f4dec798
fix part file handling and real size calculation, this should also solve #4581
...
Conflicts:
apps/files_encryption/lib/stream.php
2013-09-06 16:06:34 +02:00
f6830e7462
check shares for the real file and not for the .part file
2013-09-06 16:05:11 +02:00
404e36323a
first check if a extension exists before comparing it
2013-09-06 16:05:03 +02:00
597a3cf1ad
handle part files correctly
2013-09-06 16:04:56 +02:00
3861c9bce1
some more OCS calls for sharing
2013-09-06 16:00:01 +02:00
4d04dd9c4c
Merge branch 'master' into fix_3728_with_file_exists_dialog
2013-09-06 13:42:05 +02:00
1558cb860c
remove test code
2013-09-06 13:16:48 +02:00
fb462e83cc
no longer enforce log out, but provide useful errors/warnings instead
2013-09-06 12:27:40 +02:00
69b1625f0e
re-added error.php
2013-09-06 12:27:25 +02:00
83afba5070
prefix #filestable to tbody tr
2013-09-06 10:01:11 +01:00
b6ee727399
intermediate result ocs api
2013-09-06 10:49:21 +02:00
226c205631
Use usort() instead of uasort() to not maintain keys
2013-09-06 06:45:16 +02:00
85e41d9500
Sort files by name, not by mimetype
2013-09-05 23:17:53 +02:00
f84fe479a5
Only use mimetype_list and clean up a bit
2013-09-05 18:40:55 +02:00
8a7e26b268
cleanup dead code
2013-09-05 17:46:19 +02:00
992b59f70b
Make it possible to pass rawlist.php an JSON array, to filter by more than one mimetype
2013-09-05 16:54:12 +02:00
f8563ec583
Merge branch 'master' into sharing_mail_notification_master
...
increased version number to trigger db update
Conflicts:
lib/util.php
2013-09-05 13:39:45 +02:00
0527fb05ad
[tx-robot] updated from transifex
2013-09-05 07:37:32 -04:00
c01675de5d
more is_resource checks before readdir
2013-09-05 11:58:57 +02:00
03ddf8da80
Merge branch 'master' into fix_3728_with_file_exists_dialog
...
Conflicts:
apps/files/js/file-upload.js
2013-09-05 10:31:43 +02:00
bbf8acb383
separate uploading code from progress code, add progress capability detection
2013-09-05 10:19:54 +02:00
3b25babe35
Merge pull request #4683 from owncloud/publicuploadjserror
...
Fixed public upload error that prevents upload
2013-09-04 11:50:38 -07:00
21a0a96e43
intermediate results, share api
2013-09-04 17:25:15 +02:00
49fd7e9f1e
refactor dialog creation
2013-09-04 16:42:18 +02:00
985758305f
initial commit, start implementing the ocs share api
2013-09-04 14:32:05 +02:00
4af5a8c483
Merge branch 'master' into fix_3728_with_file_exists_dialog
...
Conflicts:
apps/files/ajax/upload.php
apps/files/js/file-upload.js
apps/files/js/filelist.js
apps/files/js/files.js
apps/files/templates/part.list.php
2013-09-04 14:11:40 +02:00
ec3639dc7a
Always check variable type before using readdir to avoid surprises
2013-09-04 13:06:04 +02:00
4dbc787055
check if stream wrapper is already registered to avoid warning
2013-09-03 15:56:25 +02:00
85758f3d7d
Merge pull request #4473 from owncloud/texteditor_polishing
...
Texteditor polishing
2013-09-03 05:38:59 -07:00
fe0b8ac2c0
[tx-robot] updated from transifex
2013-09-03 07:46:55 -04:00
3d49631b8d
make sure that initial encryption also starts for a fresh installation
2013-09-03 13:24:30 +02:00
449fe8c75e
Revert "remove editor div in filelist", add "is deprecated" comment
...
This reverts commit 64d09452f5
2013-09-03 13:20:20 +02:00
cafc8cb223
Change Files Scan command to use OC\User\Manager
2013-09-02 18:18:12 +02:00
39f4538e0f
This function doesn't cache anymore. Adjusted PHPDoc to suit.
2013-09-02 09:59:01 -04:00
df7bfa4bf0
Don't cache the pkey, skip generation if the keyfile exists
2013-09-02 09:59:00 -04:00
9a263a500a
Employ config option for OpenSSL config file, if provided.
...
This should help make OpenSSL configuration on Windows servers easier by allowing the openssl.cnf file to be set directly in the ownCloud config, rather than in SetEnv commands that don't exist and are hard to replicate in IIS.
2013-09-02 09:59:00 -04:00
fb34f49913
Start a branch for easier OpenSSL configuration.
2013-09-02 09:58:19 -04:00
b918c06be6
Merge branch 'master' into sharing_mail_notification_master
...
Conflicts:
lib/util.php
2013-09-02 14:41:46 +02:00
88c4ac9b98
Merge branch 'master' into encryption_improved_error_messages_4617
2013-09-02 14:39:45 +02:00
6572ca811f
error.php no longer needed
2013-09-02 11:36:20 +02:00
5e508f1ccb
improved documentation of the methods
2013-09-02 11:34:28 +02:00
bab63c22ee
encryption error messages, distinguish between a re-enabled encryption app and a password change from outside
2013-09-02 11:26:11 +02:00
f038cb9aea
Merge pull request #4671 from owncloud/emptycontent
...
centers text message in empty-content page (files and files_trashbin apps)
2013-09-01 17:47:55 -07:00
e68b5f8b0d
[tx-robot] updated from transifex
2013-09-01 13:30:40 -04:00
0aba549e7f
Use more object oriented way for console commands
2013-09-01 16:40:50 +02:00
307b673b79
Fixed public upload error that prevents upload
...
Public upload is broken because the file_upload_param variable expected
to exist by public.js didn't.
This fix sets the variable scope to the window to make it accessible
outside.
2013-09-01 16:14:46 +02:00
b10a646bc8
rename emptyfolder to emptycontent
2013-08-31 11:25:11 -04:00
4b32d84314
text centered horizontally and vertically in emptycontent div
2013-08-31 11:12:07 -04:00
668c4c2652
fix issue with filetable background
2013-08-30 22:05:44 +02:00
8ef40277b2
Merge master into oc_preview
2013-08-30 18:11:18 +02:00
40cee5639e
use gerMimeTypeDetector detectPath instead of getMimeType
2013-08-30 18:07:49 +02:00
dbc78b1a58
[tx-robot] updated from transifex
2013-08-30 09:38:20 -04:00
77adaee645
enable user to inform recipients about a shared file by mail
2013-08-30 13:53:49 +02:00
ab1f78eac3
prefix 'tbody tr' to separate app/core css errors
...
For specific details see:
https://github.com/owncloud/core/pull/4536/files#r6082305
2013-08-30 10:48:04 +01:00
d7dca966a2
improved error messaging, initial commit
2013-08-30 10:17:50 +02:00
f4ec5182bd
Workaround for IE 9 & 10 for clicking filelist after adding new item
2013-08-29 12:06:07 -04:00
b7758d0f8d
Merge master into oc_preview
2013-08-29 10:50:55 +02:00
81cab5ada8
Merge pull request #3926 from owncloud/improve_filesummary
...
Improve filelist summary
2013-08-28 15:11:09 -07:00
aed71bb420
also move empty folders to the trash bin as discussed here #4590
2013-08-28 15:46:44 +02:00
ada15a2b8e
Merge pull request #4489 from owncloud/clean-3rdparty-mess-master
...
Clean 3rdparty mess master
2013-08-28 06:12:58 -07:00
6bd0f3cba7
Reimplement filesummary in JS
...
Fix #993
2013-08-28 15:10:17 +02:00
5a03707184
Merge pull request #4601 from owncloud/fixing-4341-master
...
backport of #4357 to master
2013-08-28 04:42:50 -07:00
3e7ddbc9d9
[tx-robot] updated from transifex
2013-08-28 06:24:14 -04:00
3eed060ec9
backport of #4357 to master
2013-08-27 23:53:04 +02:00
34a32d862c
Merge pull request #4572 from NCTU-NBA/pr-checkbox-displacement
...
Fix "select all" checkbox displacement when checked, fix #4571
2013-08-27 14:21:34 -07:00
321c514782
LDAP: case insensitive replace for more robustness
2013-08-27 22:23:48 +02:00
d5062b9e0e
[tx-robot] updated from transifex
2013-08-27 11:23:18 -04:00
316d9bfed6
the trash bin can also contain empty files. Don't use the trash bin size as indicator to decide if the trash bin is empty or not
2013-08-27 14:39:43 +02:00
Vincent Petry
Björn Schießle
Bjoern Schiessle
Frank Karlitschek
Jenkins for ownCloud
Lennart Rosam
Morris Jobke
Jan-Christoph Borchardt
Arthur Schiwon
Robin Appelman
raghunayyar
kondou
Georg Ehrke
Jörn Friedrich Dreyer
Bart Visscher
Vincent Petry
Thomas Tanghus
Pete McFarlane
ringmaster
Bernhard Posselt
Alessandro Cosentino