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

35696 Commits

Author SHA1 Message Date
Roeland Jago Douma b39a17e499
Actually update the state 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2016-11-07 14:58:45 +01:00
Jan-Christoph Borchardt 8de4d4f76e
detail fixes for share current folder 
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
 2016-11-07 14:58:45 +01:00
Roeland Jago Douma 1190ce1dd5
Listen to sharetab changes 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2016-11-07 14:58:45 +01:00
Christoph Wurst c55718ae5e
update breadcrumb view whenever the share information on the directory info model changes 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2016-11-07 14:58:45 +01:00
Christoph Wurst 36cf779140
the root folder must not be shared 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2016-11-07 14:58:45 +01:00
Christoph Wurst 5bf7e5533d
visually reflect sharing state of current folder 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2016-11-07 14:58:45 +01:00
Christoph Wurst 9e5e120ef9
refactor share permission logic into own method to reuse it for the share tab 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2016-11-07 14:58:45 +01:00
Christoph Wurst bc1cb8a6d0
let users share the curren folder 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2016-11-07 14:58:45 +01:00
Christoph Wurst c5597baf88
show whether the current folder was shared or not 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2016-11-07 14:58:45 +01:00
Roeland Jago Douma 1857e50259 Merge pull request #2036 from nextcloud/try-fixing-firefox-push-state 
Fix the push state
 2016-11-07 13:48:18 +01:00
Roeland Jago Douma 689567ec6d Merge pull request #2034 from nextcloud/product-typo 
Fix translation string
 2016-11-07 13:47:35 +01:00
Joas Schilling 6c27b74e75
Fix the push state 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2016-11-07 12:51:32 +01:00
Joas Schilling 6573debb0a
Fix translation string 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2016-11-07 11:25:53 +01:00
Morris Jobke 1c8f9d6655 Merge pull request #2026 from nextcloud/setting_lang 
Move setlanguage to controller
 2016-11-07 09:26:50 +01:00
Roeland Jago Douma 25a8d9f543 Merge pull request #2032 from nextcloud/noodlesegg-refactor 
refactoring code to reduce cyclomatic complexit
 2016-11-07 09:06:09 +01:00
Donquixote 537d588726
refactoring code to reduce cyclomatic complexit 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2016-11-07 08:18:16 +01:00
Nextcloud bot 8d954c0ece
[tx-robot] updated from transifex 2016-11-07 01:07:03 +00:00
Roeland Jago Douma 78efb1972e
Fix route and js 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2016-11-06 14:05:53 +01:00
Roeland Jago Douma 95a8964cc8
Add settings PersonalController 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2016-11-06 14:05:49 +01:00
Nextcloud bot e217040402
[tx-robot] updated from transifex 2016-11-06 01:07:48 +00:00
Morris Jobke a756396739 Merge pull request #2018 from nextcloud/firefox-svg-workaround 
Workaround for disappearing app icons for Firefox before version 51
 2016-11-05 17:05:46 +01:00
Morris Jobke bfd2596381 Merge pull request #2021 from henrymohn/bug-1875_Password-Hint 
Removed else statement preventing Success message from displaying cau…
 2016-11-05 16:54:37 +01:00
Nextcloud bot ca3616cb58
[tx-robot] updated from transifex 2016-11-05 01:07:14 +00:00
Roeland Jago Douma fb562e93cc Merge pull request #2014 from nextcloud/cleanup_oc_group_a_tad 
Cleanup OC_Group usage a bit
 2016-11-04 22:40:34 +01:00
Lukas Reschke a9547a2fd7 Merge pull request #2015 from nextcloud/swift-bucket 
allow using 'bucket' to set the swift container
 2016-11-04 21:46:59 +01:00
Henry Mohn fe544d807a Removed else statement preventing Success message from displaying causing bug #1875 
Signed-off-by: Henry Mohn <hmohniii@gmail.com>
 2016-11-04 20:40:42 +00:00
Roeland Jago Douma 04ece69a33
Cleanup OC_Group usage a bit 
This is deprecated internal stuff. Should not be used anymore.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2016-11-04 20:55:47 +01:00
Roeland Jago Douma 1e6175dfcb
Fix CalendarTest 
* Made sure delete from self works again (and is tested)

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2016-11-04 15:40:59 +01:00
Julius Haertl 71275ced28
Workaround for disappearing app icons for Firefox before version 51 
Signed-off-by: Julius Haertl <jus@bitgrid.net>
 2016-11-04 15:39:04 +01:00
Roeland Jago Douma c016d947e2
Fix plugin 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2016-11-04 15:10:38 +01:00
Roeland Jago Douma 6d1c0be47d
Minor fixes 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2016-11-04 15:10:15 +01:00
Morris Jobke f42d5b6e56 Merge pull request #2007 from nextcloud/downstream-26411 
[oc] Fix initMountPoints to set usersSetup earlier
 2016-11-04 15:03:52 +01:00
Robin Appelman b72e5a2e4e
allow using 'bucket' to set the swift container 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2016-11-04 14:15:18 +01:00
Roeland Jago Douma 9fa3a22ddd
Fix tests 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2016-11-04 13:37:00 +01:00
Roeland Jago Douma ca379bdb7d
[3rdparty] Bump sabre/dav to 3.2 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2016-11-04 13:35:52 +01:00
Thomas Müller c778b1bade
Update sabre dav to 3.2 (#26115) 
* Update sabre/dav to 3.2.0

* Adjust code to work with sabre/dav 3.2.0 and it's dependencies

* Adding own CalDAV plugin to fix calendar home property

* Test if there is a user logged in when listing files home

* Update sabre version used by integration tests

* Disable unauthenticated DAV access

This is needed to make Sabre 3.2 behave like we did before.
Eventually we should integrate better with the ACL plugin which itself
should implement an auth failure when appropriate.

=====

* Fixed so cherry-pick was succesfull

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2016-11-04 13:35:10 +01:00
Joas Schilling a77e7075f6 Merge pull request #2010 from nextcloud/downstream-26534 
[oC] Fixed disappearing of share info in file view
 2016-11-04 13:29:19 +01:00
Morris Jobke 6a156b795c Merge pull request #1880 from nextcloud/downstream-26235 
Integration tests refactoring
 2016-11-04 12:09:00 +01:00
Roeland Jago Douma d5665eb93b
Add sleep function 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2016-11-04 11:20:33 +01:00
Michael Jobst bf9376a7f6
Fixed disappearing of share info in file view 2016-11-04 10:37:30 +01:00
Roeland Jago Douma 27304e5694 Merge pull request #2008 from nextcloud/remove_removed_script 
Remove adding sharedialogmailview
 2016-11-04 09:42:33 +01:00
Roeland Jago Douma bcd7a9a034
Fix tests 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2016-11-04 08:44:35 +01:00
Roeland Jago Douma a56717673f
Remove adding sharedialogmailview 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2016-11-04 07:41:35 +01:00
Nextcloud bot 479d76d426
[tx-robot] updated from transifex 2016-11-04 01:07:04 +00:00
Lukas Reschke 2a0f5407ba Merge pull request #2006 from nextcloud/downstream-26380 
[oC] Hide "Add group" for subadmins
 2016-11-03 23:20:58 +01:00
Morris Jobke ac61f64190 Merge pull request #1109 from nextcloud/add-more-secrets-to-password-reset-link 
Use mail for encrypting the password reset token as well
 2016-11-03 22:11:43 +01:00
Lukas Reschke c0bbae28f0 Merge pull request #1741 from nextcloud/new_preview 
Improve previews
 2016-11-03 21:07:16 +01:00
Vincent Petry 237dab675e
Fix initMountPoints to set usersSetup earlier 
This is needed because in some cases like LDAP, the user manager itself
might trigger avatar updates which would internally also call
initMountPoints with the same user. This could cause the same user to
be setup twice, and in some sharing situations could cause recursive
deduplication of shares by adding "(2)" every time.
 2016-11-03 20:45:40 +01:00
Lukas Reschke 8bf57462ea Merge pull request #2002 from nextcloud/propagate-mtime-iont 
explicitly cast mtime to int in propagation
 2016-11-03 20:43:13 +01:00
Vincent Petry e8d614b59e
Hide "Add group" for subadmins 2016-11-03 20:41:10 +01:00