mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
32,345 Commits 349 Branches 696 Tags 1.6 GiB
Commit Graph

13424 Commits

Author SHA1 Message Date
Björn Schießle 8f87e1104d
use query builder for getShare and add tests 2016-05-20 21:15:11 +02:00
Björn Schießle 5a1641bed2
move request handler for federated shares to the federated sharing app 2016-05-20 21:15:08 +02:00
Piotr Filiciak 9999e05660
Http Range requests support in downloads 
Http range requests support is required for video preview
 2016-05-20 18:16:44 +02:00
Vincent Petry 66e93561da
Rename "not-assignble" to "restricted" 2016-05-20 17:56:02 +02:00
Vincent Petry 5963128342
Adjust DAV SystemTagPlugin unit tests for groups 2016-05-20 17:56:02 +02:00
Vincent Petry 91d4249ed8
Fix system tags DAV plugin tests 2016-05-20 17:56:02 +02:00
Vincent Petry 10fae3994a
Fix system tag update code 2016-05-20 17:56:02 +02:00
Vincent Petry d7727cdc74
Add admin-only system tag groups property 
For setting/getting system tag groups
 2016-05-20 17:56:02 +02:00
Vincent Petry 88740f035d
Act on effective system tag canAssign permission 
Whenever the server returns true for the can-assign Webdav property of
a system tag, it means the current user is allowed to assign,
regardless of the value of user-assignable.

This commit brings the proper logic to the web UI to make it possible
for users to assign when they have the permission.
 2016-05-20 17:56:02 +02:00
Vincent Petry 03d32bc39b
Fix system tags DAV unit tests 2016-05-20 17:56:02 +02:00
Vincent Petry bede872dbc
Bring back admin permissions to change system tag permissions 2016-05-20 17:56:02 +02:00
Vincent Petry 09b3883d9c
Updated canUser* functions in SystemTagManager to accept objects 2016-05-20 17:56:02 +02:00
Vincent Petry 8343cfb64b
Add interface methods for permission check 
Instead of checking for admin perm, use interface method
canUserAssignTag and canUserSeeTag to check for permissions.
Allows for more flexible implementation.
 2016-05-20 17:56:02 +02:00
Arthur Schiwon 2b30136ae9
ensure comments-href returns a value also when propfind is done against remote.php/files 2016-05-20 16:22:13 +02:00
Vincent Petry 59a85a4c76 Merge pull request #22576 from owncloud/folder_scroll_fix 
Add scrolling when dragging files. Fixes #12329
 2016-05-20 16:19:01 +02:00
Vincent Petry e8d082208d
Fixes for encoding wrapper 
Improved label
Fixed rename/copy/moveFromStorage/copyFromStorage and added tests
Improved findPathToUse algo
 2016-05-20 09:33:59 +02:00
Vincent Petry db4c7fe743
Add encoding wrapper as opt-in mount option 
The encoding wrapper is now only applied when the mount option is set,
disabled by default.
 2016-05-20 09:33:59 +02:00
Vincent Petry 63bbbf29f4
Add wrapper for NFD encoding workaround 2016-05-20 09:33:59 +02:00
Vincent Petry 2ef751b1ec Merge pull request #24702 from owncloud/background-scan-occ 
add --unscanned option to files:scan to triger a background scan
 2016-05-20 09:29:37 +02:00
Jenkins for ownCloud 67162e636e [tx-robot] updated from transifex 2016-05-20 01:54:52 -04:00
Vincent Petry 4728308a9e Merge pull request #24585 from owncloud/files_external_lazy 
Load external storage backends/auth mechanisms lazily
 2016-05-19 18:08:17 +02:00
Robin Appelman f313105dbd add "unscanned" option to files:scan to triger a background scan 2016-05-19 14:19:09 +02:00
Joas Schilling 320b1c3abf
Fix more failures 2016-05-19 10:11:42 +02:00
Joas Schilling a6b4ba9ba1
Fix errors in the tests 2016-05-19 09:48:00 +02:00
Joas Schilling da332c134e
Move federation tests to PSR-4 2016-05-19 09:48:00 +02:00
Joas Schilling 0c727f1755
Move federation code to PSR-4 2016-05-19 09:48:00 +02:00
Jenkins for ownCloud 7ca5b35379 [tx-robot] updated from transifex 2016-05-19 01:54:58 -04:00
Joas Schilling 8dc25321d3
Move FederatedFileSharing to PSR-4 2016-05-18 15:28:50 +02:00
Jenkins for ownCloud 765782445a [tx-robot] updated from transifex 2016-05-18 01:54:53 -04:00
blizzz 8ce8a05dab Fixed dynamic group ldap access (#23450) 
* Fixed dynamic group ldap access

getUserGroups:
Using $userDN instead of $uid to query LDAP
Converting groupDN to group name using API instead of substring
Removing cache processing at the end of the method

* Fixing group handling

added back the cache processing and fixed

* fixed possible indention problem

spaces -> tab conversion

* formatting, white-space changes only
 2016-05-17 23:09:36 +02:00
Fabian 2a7d3dd831 dont update search onResize 
this.updateSearch() sets the current file list instance and clears the box. This is unnecessary and makes the search box unsuable on some mobile devices where a keyboard fade-in causes a onResize trigger, which would then clear and blur the box.
 2016-05-17 22:57:07 +02:00
Roeland Douma 5c9103287f Group fixup (#24621) 
* Move used OC_Group_xx to \OC\Group

* Add (deprecated) legacy wrapper in legacy, OC_Group_xx

* Replace deprecated use of OC_Group_xx with \OC\Group\xx
 2016-05-17 16:06:44 +02:00
Vincent Petry 5585fa0a68 Merge pull request #24630 from owncloud/one-shall-adjust-the-path 
Use proper path
 2016-05-17 10:11:21 +02:00
Jenkins for ownCloud c24a685ab5 [tx-robot] updated from transifex 2016-05-17 01:54:56 -04:00
Jenkins for ownCloud bafa02d312 [tx-robot] updated from transifex 2016-05-16 01:54:58 -04:00
Piotr Filiciak 53437ecced Fix: Bugs in shared link with video #24331 2016-05-15 15:41:02 +02:00
Jenkins for ownCloud 7c28f62e20 [tx-robot] updated from transifex 2016-05-15 01:55:34 -04:00
Jenkins for ownCloud 83cd655675 [tx-robot] updated from transifex 2016-05-14 01:56:45 -04:00
Erik Pellikka 5dbb549bbe
added back the jquery animations 2016-05-13 21:01:13 +02:00
Erik Pellikka 4e5f37a05d
code style fix 2016-05-13 21:01:13 +02:00
Erik Pellikka b94252e479
code style fix 2016-05-13 21:01:13 +02:00
Erik Pellikka 74dfc63b9a
code style fix 2016-05-13 21:01:13 +02:00
Erik Pellikka d3467edb70
added elseif 2016-05-13 21:01:13 +02:00
Erik Pellikka 45ff21e8d5
fixed to work with share links as well 2016-05-13 21:01:13 +02:00
Erik Pellikka e7366213f5
typo fix 2016-05-13 21:01:13 +02:00
Erik Pellikka 18b7b61f06
Tweaking 2016-05-13 21:01:13 +02:00
Morris Jobke 5711e88093
Avoids jumping if window is smaller than 300 pixels in height 
* divides the area where the scroll should be triggered by 2
* uses the minimum value of the above and 300
 2016-05-13 21:01:13 +02:00
Erik Pellikka e03a09d189
Add scrolling when dragging files 2016-05-13 21:01:13 +02:00
Vincent Petry 88da2966b4 Merge pull request #22341 from owncloud/pellaeon-pr-breadcrumb-filelist-overlap-drop 
Handle case when breadcrumb and filelist item overlap and both receive a drop
 2016-05-13 17:12:36 +02:00
Vincent Petry ddea34f959 Merge pull request #22214 from owncloud/ext-better-dropbox-gdrive 
Direct links to Google Drive/Dropbox configuration pages from external storage config
 2016-05-13 17:09:27 +02:00
Vincent Petry 9cba75ea8a Merge pull request #24605 from owncloud/luckydonald-Superduper-Progressbar-branch-thingie 
Luckydonald superduper progressbar branch thingie
 2016-05-13 10:00:35 +02:00
Jenkins for ownCloud cba4875e4d [tx-robot] updated from transifex 2016-05-13 02:08:45 -04:00
Vincent Petry 5f6fb45704
Merge branch 'Superduper-Progressbar-branch-thingie' of https://github.com/luckydonald/core into luckydonald-Superduper-Progressbar-branch-thingie 2016-05-12 18:15:54 +02:00
Joas Schilling b34bacd071 Move Files app to PSR-4 (#24569) 
* Move lib/ of Files app to PSR-4

* Move tests to PSR-4
 2016-05-12 12:07:06 +02:00
Joas Schilling eea98f1d74 Background jobs from info.xml (#24582) 
* Move background job registration of Federation to info.xml

* Move background registration of Files app to info.xml

* Move background job registration of files_sharing to info.xml

* Move background job registration of files_trashbin to info.xml

* Move background job registration of files_versions to info.xml

* Move background job registration from user_ldap to info.xml
 2016-05-12 10:43:43 +02:00
Joas Schilling 1def89b2c5 Move the testing app to PSR-4 (#24580) 2016-05-12 09:49:37 +02:00
Joas Schilling b57f3126eb Move files_versions to PSR-4 (#24571) 2016-05-12 09:49:15 +02:00
Joas Schilling d5dee80580 Move files_trashbin to PSR-4 (#24570) 2016-05-12 09:48:53 +02:00
Joas Schilling dd9ee10bc0 Move dav app to PSR-4 (#24527) 
* Move Application to correct namespace and PSR-4 it

* Move dav app to PSR-4
 2016-05-12 09:42:40 +02:00
Joas Schilling 4a3311f430 Move Encryption app to PSR-4 (#24524) 
* Move Encryption to PSR-4

* Move encryption tests to PSR-4

* Fix the tests
 2016-05-12 09:42:19 +02:00
Jenkins for ownCloud c5ae14453a [tx-robot] updated from transifex 2016-05-12 02:08:58 -04:00
Robin McCorkell 8f58b89c3f Add tests for backend/auth mechanism providers 2016-05-11 21:24:53 +01:00
Robin McCorkell 711bc7469a Use backend/auth mechanism providers in files_external 2016-05-11 21:16:31 +01:00
Robin McCorkell af0930fe59 Introduce backend/auth mechanism providers 
Direct registration of backends/auth mechanisms is now deprecated
 2016-05-11 21:16:26 +01:00
Vincent Petry ceaac03bb5 Make permalinks work for trashed files (#24537) 
Opening a permalink that points to a trashed file will now display the
file within the "Deleted Files" section in the files web UI.
 2016-05-11 19:41:36 +02:00
Joas Schilling 2a05035339 Move Provisioning api to PSR-4 (#24510) 
* Move app to PSR-4

* Fix setUp method

* Fix the tests
 2016-05-11 19:38:49 +02:00
Thomas Müller 3333c4c0b9 Merge pull request #24568 from owncloud/fix_24566 
Fix etag propegation test race condition
 2016-05-11 16:29:00 +02:00
Roeland Jago Douma 8bfa532075
Fix test race condition 
E-tag propagation replies on the mtime of the file. Order of events:

1. add file 'foo.txt' with content 'bar'
2. Set mtime to now() - 1
3. Check if etag changed.

Now this goes right often when 1 and 2 happen in the same second.
However imagine

1. add file 'foo.txt' with content 'bar' (at t=0.999)
2. Set mtime to now() - 1 (at t=1.001)

Now the mtime will be set to the same time. Thus not chaning the etag.
 2016-05-11 14:07:37 +02:00
Christoph Wurst 0486d750aa
use the UID for creating the session token, not the login name 2016-05-11 13:36:46 +02:00
Christoph Wurst 5e55dfb2d6
create session token for DAV clients (sync clients) 2016-05-11 13:36:46 +02:00
Thomas Müller 9eea062004 Merge pull request #24433 from owncloud/user_psr4 
lib/private/user to PSR-4
 2016-05-11 11:16:56 +02:00
Thomas Müller 199b447527
Yo-ho-oh - Murder all band 'o pirates 2016-05-11 09:16:17 +02:00
Jenkins for ownCloud 7da5331782 [tx-robot] updated from transifex 2016-05-11 01:55:55 -04:00
Morris Jobke e2748e4cbf
fix usage of legacy class in LDAP 2016-05-10 19:53:36 +02:00
Vincent Petry 510724716d Merge pull request #24401 from owncloud/trash-list-cache 
use the cache for trash listing
 2016-05-10 17:12:49 +02:00
Lukas Reschke e8e72aa910 Merge pull request #24434 from owncloud/permalinks 
Permalinks
 2016-05-10 09:44:50 +02:00
Jenkins for ownCloud 1fb7be42e5 [tx-robot] updated from transifex 2016-05-10 03:30:51 -04:00
Morris Jobke fdda980c2f Merge pull request #24466 from owncloud/issue_13936_wording_ldap 
wording in LDAP wizard
 2016-05-09 08:27:00 +02:00
Jenkins for ownCloud 10e0fc0629 [tx-robot] updated from transifex 2016-05-09 02:08:23 -04:00
Jenkins for ownCloud 5d35844aff [tx-robot] updated from transifex 2016-05-08 01:54:53 -04:00
Jenkins for ownCloud 956c3f2719 [tx-robot] updated from transifex 2016-05-07 01:54:56 -04:00
Vincent Petry 254576e1f7
Do not encode slashes in "dir" URL param in files JS 2016-05-06 17:00:22 +02:00
Vincent Petry 112b703df0
Add anchor icon in sidebar to copy permalink 2016-05-06 16:46:59 +02:00
Vincent Petry fdeafef6a0
Auto-add fileid in URL for currently displayed folder 2016-05-06 16:46:59 +02:00
Vincent Petry 093e9dd422
Add route to resolve fileid to files app URL 
The following routes will redirect to the files app and display the
matching folder. If the fileid is a file, it will scroll to it.
- http://localhost/owncloud/index.php/f/$fileid
- http://localhost/owncloud/index.php/files/?dir=somedir&fileid=$fileid
 2016-05-06 16:46:59 +02:00
Vincent Petry 47157bcd76 Merge pull request #24400 from owncloud/cache_shareManager 
Cache shareManager
 2016-05-06 14:25:30 +02:00
Jenkins for ownCloud 6a95af0a4b [tx-robot] updated from transifex 2016-05-06 01:54:56 -04:00
Jenkins for ownCloud 48be0b781a [tx-robot] updated from transifex 2016-05-05 01:55:08 -04:00
davicente 452eeeb344 wording in LDAP wizard 2016-05-04 17:25:44 +01:00
Jenkins for ownCloud cd7f4ed96f [tx-robot] updated from transifex 2016-05-04 02:11:59 -04:00
Roeland Douma 2e4b41550e Merge pull request #24406 from owncloud/psr4-comments-systemtags-updatenotifications 
Move comments, systemtags and updatenotifications to PSR-4
 2016-05-04 08:03:11 +02:00
blizzz 2fd4f1a775 Merge pull request #24396 from owncloud/ctrlEnter-submit-comment 
Adds functionality to submit comment on ctrl+Enter
 2016-05-03 22:24:17 +02:00
Thomas Müller 4b2544925f Merge pull request #23844 from owncloud/disable-user 
Add occ commands to enable and disable a user + a disabled user can n…
 2016-05-03 15:22:41 +02:00
Lukas Reschke 0d8393178b
Use proper path 
Fixes https://github.com/owncloud/core/issues/24407
 2016-05-03 14:37:50 +02:00
Robin Appelman 435cd31fa6 use the cache for trash listing 2016-05-03 14:36:46 +02:00
Lukas Reschke df2eb96cc4 Merge pull request #24389 from owncloud/login-by-email 
Allow login by email address
 2016-05-03 13:44:38 +02:00
Robin McCorkell ac27163f68 Move Dropbox/GDrive link to icon 2016-05-03 11:30:02 +01:00
Robin McCorkell a09ef66eea Change colour of input fields instead of printing 'Access granted' 2016-05-03 11:30:02 +01:00
Robin McCorkell 43abe2b648 Add links to load GDrive/Dropbox configuration pages 2016-05-03 11:30:02 +01:00
Robin McCorkell de98a6e54c Allow multiple custom JS files 2016-05-03 11:30:02 +01:00