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

13328 Commits

Author SHA1 Message Date
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
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
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
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