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
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
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
Jan-Christoph Borchardt
Bjoern Schiessle
kondou
Thomas Müller
Morris Jobke
Arthur Schiwon
Georg Ehrke
Vincent Petry
Jörn Friedrich Dreyer
Bart Visscher