Commit Graph

33638 Commits

Author SHA1 Message Date
Vincent Petry 0c6352e095
Fix RepairUnmergedShares to not skip valid repair cases
The repair step was a bit overeager to skip repairing so it missed the
case where a group share exists without subshares but with an
additional direct user share.
2016-08-03 10:16:28 +02:00
Vincent Petry 0c7c9a3b95
Adjust repair version check for unmerged shares 2016-08-03 10:16:28 +02:00
Vincent Petry 0f3674a446
Group incoming shares for resharing in JS 2016-08-03 10:16:28 +02:00
Vincent Petry 0bddaa23b0
Added more tests for sharing's MountProvider 2016-08-03 10:16:28 +02:00
Vincent Petry 67fa6bf9bc
Add repair step for unmerged shares (WIP) 2016-08-03 10:16:28 +02:00
Vincent Petry 714d7ec936
Improved share grouping readability + fixed test 2016-08-03 10:16:28 +02:00
Vincent Petry 573f6de6a0
Add integration tests for merging received shares 2016-08-03 10:16:28 +02:00
Roeland Jago Douma 04d5465228
Group shares with same source and target
Fixes #24575

Note that this is a very limited solution and eventually we want smarter
merging!
2016-08-03 10:16:28 +02:00
Nextcloud bot 0874460e48
[tx-robot] updated from transifex 2016-08-03 00:11:12 +00:00
Morris Jobke c76dc835c4 Merge pull request #701 from nextcloud/fix-add-apps-icon
Apply black app icon style to newly installed app icons
2016-08-02 14:23:42 +02:00
Morris Jobke 17c3027094 Merge pull request #637 from nextcloud/h1-prevent-delete-update-on-group-shares
Do not allow to delete/update group shares as a group member
2016-08-02 14:17:22 +02:00
Morris Jobke ab3b90eff2 Merge pull request #700 from nextcloud/token-provider-invalidateoldtokens
add invalidateOldTokens to IProvider interface
2016-08-02 14:16:25 +02:00
Christoph Wurst e90f00791d add invalidateOldTokens to IProvider interface 2016-08-02 12:08:13 +02:00
Roeland Jago Douma 1088870eb1
Add intergration test 2016-08-02 11:12:52 +02:00
Joas Schilling 4e5fb74773
Do not allow to delete/update group shares as a group member 2016-08-02 10:50:35 +02:00
Nextcloud bot 5f83f4d9a8
[tx-robot] updated from transifex 2016-08-02 00:09:59 +00:00
Morris Jobke 3a067c5041 Merge pull request #695 from nextcloud/shake-wrong-password
Shake the login fields if password is wrong
2016-08-02 01:16:05 +02:00
Julius Haertl c8e4988f85
Apply inverted app icon style to newly installed icons 2016-08-01 21:48:06 +02:00
Morris Jobke d97fe1775a
Shake the login fields if password is wrong 2016-08-01 21:42:29 +02:00
Morris Jobke dbf3ca5baf Merge pull request #682 from nextcloud/fix-theming-logo
fix missing semicolon to fix themed logo on log in page
2016-08-01 19:50:42 +02:00
Morris Jobke 32e5e48b0b Merge pull request #653 from nextcloud/animate-sidebar
slight animation for the sidebar for better feedback what happens
2016-08-01 18:21:31 +02:00
Lukas Reschke 8a7d450fb5 Merge pull request #684 from nextcloud/fix_csrf_ocs
Fix OCS CSRF
2016-08-01 11:52:56 +02:00
Björn Schießle 368e1c3f2b Merge pull request #685 from nextcloud/validate-theming-input
Validate the input of the theming options
2016-08-01 11:24:22 +02:00
Morris Jobke ffd29e9ec5 Merge pull request #672 from sndrr/occ-rebrand-to-nextcloud
Occ rebrand to nextcloud
2016-08-01 11:15:22 +02:00
Nextcloud bot 8ef5fcec1d
[tx-robot] updated from transifex 2016-08-01 08:53:07 +00:00
Jan-Christoph Borchardt ad5e98c81a fix missing semicolon to fix themed logo on log in page 2016-08-01 09:57:05 +02:00
Lukas Reschke f0b30d7260 Merge pull request #674 from nextcloud/action-menu-position
remove extra file size padding to fix action menu position
2016-08-01 09:40:48 +02:00
Joas Schilling 13c19e5286
Validate the input of the theming options 2016-08-01 09:37:12 +02:00
Roeland Jago Douma 5c718b13b8
We should properly check for 'true' instaed of the bool 2016-08-01 08:52:50 +02:00
Nextcloud bot 50c8367041
[tx-robot] updated from transifex 2016-08-01 00:10:15 +00:00
blizzz 7bb9502d23 Merge pull request #595 from nextcloud/fix_slow_test
Close session fast when doing a test to prevent blocking the next requests
2016-07-31 17:29:22 +02:00
Roeland Jago Douma eecec95f7e Merge pull request #675 from nextcloud/enoch85-patch-1
typo
2016-07-31 06:51:38 +02:00
Nextcloud bot 2a2526e1d1
[tx-robot] updated from transifex 2016-07-31 00:09:54 +00:00
Daniel Hansson 85f67766c8 typo 2016-07-30 20:56:41 +02:00
Jan-Christoph Borchardt 41519810e1 remove extra file size padding to fix action menu position 2016-07-30 18:30:07 +02:00
Julius Haertl 217b52085d
Fix javascript tests for sidebar animation 2016-07-30 16:30:05 +02:00
Sander Ruitenbeek 06fd2e7d5a Revert (c) back to ownCloud, Inc.
To be dealt with later
2016-07-30 16:26:34 +02:00
Julius Haertl fdcba04c98
Add animation to app-content 2016-07-30 16:24:04 +02:00
sanderr a7f998a454 Update Upgrade.php 2016-07-30 15:09:43 +02:00
Sander Ruitenbeek 3101f9e234 Rebranded to Nextcloud for the occ command line tool 2016-07-30 15:39:32 +02:00
Marius Blüm 3b386af295 Merge pull request #664 from nextcloud/white-app-menu-fix
Fix wrong preserveAspectRatio at app menu icons
2016-07-30 09:11:19 +02:00
Nextcloud bot 2565a39361
[tx-robot] updated from transifex 2016-07-30 00:11:16 +00:00
Julius Härtl e0b5edd82c Merge pull request #662 from thelinuxfr/patch-1
Transifex Owncloud > Nextcloud
2016-07-29 23:47:49 +02:00
Julius Haertl 9f50838cff
Fix wrong preserveAspectRatio at app menu icons 2016-07-29 23:06:26 +02:00
Frédéric LIETART 7335539838 Transifex Owncloud > Nextcloud
Change transifex link Owncloud > Nextcloud
2016-07-29 22:33:10 +02:00
Björn Schießle 3728479beb Merge pull request #627 from nextcloud/white-app-menu
Change app menu to white background with dark icons
2016-07-29 20:24:24 +02:00
Roeland Jago Douma b841d39fe1 Merge pull request #656 from nextcloud/ocs_controller_csrf
Dark hackery to not always disable CSRF for OCS controllers
2016-07-29 19:22:17 +02:00
Roeland Jago Douma f7f5216aa3
Dark hackery to not always disable CSRF for OCS controllers 2016-07-29 15:49:27 +02:00
Jan-Christoph Borchardt 5d0f9dabf6 fix shading of apps icon in app menu 2016-07-29 15:48:05 +02:00
Jan-Christoph Borchardt 696ff90cbe Merge pull request #625 from nextcloud/video-container-size
up the minimum size of the public share video a bit, use 16/9 ratio
2016-07-29 15:36:30 +02:00