Commit Graph

33965 Commits

Author SHA1 Message Date
Vincent Petry 11e9ce669a
Improve regexp to detect duplicate folders when repairing unmerged shares 2016-08-17 19:39:08 +02:00
Vincent Petry c1ad88a777
Fix unmerged shares repair with mixed group and direct shares
Whenever a group share is created after a direct share, the stime order
needs to be properly considered in the repair routine, considering that
the direct user share is appended to the $subShares array and breaking
its order.
2016-08-17 19:38:33 +02:00
Vincent Petry 837dc0b336
Improve file_target finding logic when repairing unmerged shares
Pick the most recent subshare that has no parenthesis from duplication
which should match whichever name the user picked last. If all
subshares have duplicate parenthesis names, use the least recent group
share's target instead.
2016-08-17 19:38:19 +02:00
Morris Jobke 6d43860457
add viewBox to app icon for proper scaling in Firefox 2016-08-17 18:39:50 +02:00
Marius Blüm 76f19c0775 Merge pull request #913 from nextcloud/increase-version-to-rc1
[stable10] Increase version to 10.0 RC1
2016-08-17 18:07:14 +02:00
Lukas Reschke 398596b3eb Merge pull request #912 from nextcloud/stable10-backport-905
Stable10 backport 905
2016-08-17 17:54:07 +02:00
Lukas Reschke 18bfa83d20
Increase version to 10.0 RC1
Let's get ready for that ;-)
2016-08-17 17:02:41 +02:00
Morris Jobke b3cc9c6998
Fix null reference in IE 2016-08-17 16:27:18 +02:00
Morris Jobke 6f48494b08
Empty tags are not allowed for image and feColorMatrix in IE11 and below 2016-08-17 16:27:12 +02:00
Roeland Jago Douma a3c5aefc96
Add viewBox to app icons
If we don't add a viewbox a lot of browsers will just say NOPE!!! when
we ask them to scale.
2016-08-17 16:27:04 +02:00
Roeland Jago Douma ed950eb861
Remove hack 2016-08-17 16:24:31 +02:00
Morris Jobke b8d4baacdc
Introduce weird hack for Firefox
* everything is 4 times as big (doubled width and doubled height)
2016-08-17 16:24:27 +02:00
Roeland Jago Douma 57c09bbba4
Filter can't be named invert in FF 2016-08-17 16:24:20 +02:00
Lukas Reschke f3336e93b8 Merge pull request #907 from nextcloud/nfd-default-10
[uc][10] Disable NFD encoding wrapper by default
2016-08-17 16:24:12 +02:00
Jörn Friedrich Dreyer 29565ec423
use $userId instead of $user 2016-08-17 15:51:36 +02:00
Thomas Müller 63fc5b601d
Ensure the user exists before calling a method on it - fixes #24751 2016-08-17 15:51:19 +02:00
Morris Jobke 582250e55c Merge pull request #909 from nextcloud/stable10-backport-l10n
[stable10][tx-robot] updated from transifex
2016-08-17 15:44:22 +02:00
Nextcloud bot 4470ab36bb
[tx-robot] updated from transifex 2016-08-17 13:32:21 +00:00
Vincent Petry 3c2de97ab1 Disable NFD encoding wrapper by default
Seems I forgot to set it back to false after testing.
Will give a performance boost for all storages.
2016-08-17 14:45:18 +02:00
Joas Schilling f900861485
Revert "Always add activities for comments to the stream"
This reverts commit 48c41b888c
2016-08-17 13:33:53 +02:00
Morris Jobke 263c73c685 Fix casing of external storage app 2016-08-17 13:22:28 +02:00
Morris Jobke 8ffbe757d2 layout refinements 2016-08-17 13:22:17 +02:00
Robin Appelman cc422e556b hide files external in personal settings if it's empty 2016-08-17 13:22:09 +02:00
Robin Appelman d2edd38155 don't show dependency info if we cant create new mounts 2016-08-17 13:21:59 +02:00
Robin Appelman d429f472c3 hide global credentials in personal when a user cant add mounts 2016-08-17 13:21:47 +02:00
Julius Härtl 29e45dd5ba Merge pull request #897 from nextcloud/stable10-backport-834
[stable10] Use darker colors for app icons in app management
2016-08-17 11:12:01 +02:00
Lukas Reschke f9b4a6ae61 Merge pull request #896 from nextcloud/backport-890-quota-unlimited-via-api
[stable10] Allow to retrieve the quota itself via the provisioning api
2016-08-17 10:45:06 +02:00
Raghu Nayyar ff65e0cf9b
Fixes image preview when fetched from the store. 2016-08-17 09:58:17 +02:00
Raghu Nayyar c76f60e733
Adds opacity to image container. 2016-08-17 09:58:13 +02:00
Raghu Nayyar bbd764399f
Removes uneeded styles. 2016-08-17 09:58:09 +02:00
Raghu Nayyar e96e652f72
Uses javascript to invert the SVGs. 2016-08-17 09:58:04 +02:00
Joas Schilling 7d700fa806
Fix constant name, copy-pasterino 2016-08-17 09:42:13 +02:00
Joas Schilling 670bbc65c8
Allow to retrieve the quota itself via the provisioning api 2016-08-17 09:42:09 +02:00
Lukas Reschke a2942c3e94 Merge pull request #894 from nextcloud/stable10-implement_712
[Stable10] Backport 796
2016-08-17 09:39:35 +02:00
Lukas Reschke 1f177aa105
Use getMockBuilder instead of createMock 2016-08-16 21:36:59 +02:00
Lukas Reschke 6ed721dde3
Rename class reference
File has been renamed only on master
2016-08-16 21:28:26 +02:00
Arthur Schiwon f4aa676cb0
adjust tests to latest changes 2016-08-16 21:11:29 +02:00
Arthur Schiwon c5fdee2678
for new we cannot have nested settings, default module is only appended if available 2016-08-16 21:11:25 +02:00
Arthur Schiwon 8ef08e46e8
add missing encryption modules to settings 2016-08-16 21:11:17 +02:00
Arthur Schiwon 4d505b72de
fix missing parameters in sharing settings page 2016-08-16 21:11:10 +02:00
Arthur Schiwon e6116627b6
final db indexes 2016-08-16 21:11:06 +02:00
Arthur Schiwon eed879ab3e
adopt to Controller constructor changes 2016-08-16 21:11:01 +02:00
Arthur Schiwon 6e37a007b9
check registered sections and settings after an app got updated to garbage collect orphaned classes 2016-08-16 21:10:57 +02:00
Arthur Schiwon 1e62bd3d92
attempt to remove section and settings entries when an app got disabled 2016-08-16 21:10:54 +02:00
Lukas Reschke 436e6c1078
Use MockBuilder instead of createMock
CI uses an older PHPUnit
2016-08-16 21:10:47 +02:00
Lukas Reschke 687f5bee94
Add unit tests 2016-08-16 21:10:41 +02:00
Arthur Schiwon 1ebbcdcc96
satisfy dependencies for files_external 2016-08-16 21:10:37 +02:00
Arthur Schiwon 57295ee35f
simplify encryption manager fetching in DIContainer 2016-08-16 21:10:27 +02:00
Arthur Schiwon 9111b52fef
move mail settings and file handling to additional ones, thus files_external gets its own section 2016-08-16 21:10:21 +02:00
Arthur Schiwon 2d66b16e34
change federatedfilesharing css class to followupsection to reduce whitespace 2016-08-16 21:10:17 +02:00