Commit Graph

18569 Commits

Author SHA1 Message Date
Jörn Friedrich Dreyer 5034bd1b12 minor phpdoc cleanup and imports 2014-06-05 19:49:21 +02:00
Andrew Brown 5dc2e73fe0 Simplify client-side result customization
The issue was that search results from other providers (contacts,
calendar, etc.) were unformatted, like 'event' or 'contact', while the
built-in event types (folder, file, etc.) were being modified by custom
result functions to something like 'Files' or 'Folders'. The fix is to
capitalize and translate all result types by default. Custom formatting
is still allowed (and example documentation has been added) but the
built-in result formatters where now unnecessary and were removed.
2014-06-05 19:23:44 +02:00
Andrew Brown 7a224f5762 Move new search results to 'lib/private/search' 2014-06-05 19:23:44 +02:00
Andrew Brown 8a223eb62d Move legacy search to 'lib/private/legacy'
This fixes errors where apps would try to start providers using
OC_Search and would fail. Also, made OC_Search simply inherit from
\OC\Search.
2014-06-05 19:23:44 +02:00
Andrew Brown 794a133f9a Re-add type to legacy OC_Search_Result class 2014-06-05 19:23:44 +02:00
Jörn Friedrich Dreyer 3510674d24 use path param to create scrollto url 2014-06-05 19:23:44 +02:00
Jörn Friedrich Dreyer 9b63f945e3 decode filename for scrollto 2014-06-05 19:23:44 +02:00
Jörn Friedrich Dreyer b03755c0ec fix minor typos 2014-06-05 19:22:22 +02:00
Andrew Brown 70be98f6d0 Add audio and image result types 2014-06-05 19:22:22 +02:00
Andrew Brown c46d514733 Add audio and image result types 2014-06-05 19:22:22 +02:00
Jörn Friedrich Dreyer afd24385a8 fix formatting 2014-06-05 19:22:22 +02:00
Andrew Brown a6583d3976 Add legacy adapters for file search 2014-06-05 19:21:47 +02:00
Andrew Brown ac72828eae Move to new namespace convention and add new result sub-classing 2014-06-05 19:21:47 +02:00
Thomas Müller 70e0ae0637 Merge pull request #8483 from owncloud/encryption_use_oc_preferences
[encryption] use oc preferences
2014-06-05 18:54:25 +02:00
Vincent Petry 1c59808517 Merge pull request #8865 from owncloud/improve_share_settings
Improve share settings
2014-06-05 17:23:42 +02:00
Thomas Müller e9011a8c55 adding unit tests for encryption data migration 2014-06-05 16:54:04 +02:00
Bjoern Schiessle eb29b2984c use oc_preferences instead of oc_encryption to store encyption settings 2014-06-05 16:54:04 +02:00
Bjoern Schiessle 2d83424a29 allow to set pre-condition for setValue 2014-06-05 16:54:03 +02:00
Thomas Müller 4b650a20a4 Merge pull request #8893 from owncloud/feature/get-users-by-preference
Add method to get users by their preference
2014-06-05 16:52:00 +02:00
Thomas Müller 9e84a0a1af Merge pull request #8902 from owncloud/fix_ldap_typo_2
fix typo in var name
2014-06-05 16:49:22 +02:00
Arthur Schiwon 928945ec7e fix typo in var name 2014-06-05 16:16:08 +02:00
jbtbnl bb60e850dd Merge pull request #8891 from owncloud/design-emptycontent
fix size and unbold empty content message
2014-06-05 16:04:04 +02:00
Bjoern Schiessle 6578f00b4b unify share settings 2014-06-05 15:49:34 +02:00
Bjoern Schiessle cf9099c788 This settings doesn't belong together
Revert "make reshare settings foldable"

This reverts commit c01f196f72.

Conflicts:
	settings/templates/admin.php
2014-06-05 15:44:56 +02:00
Bjoern Schiessle c991e148a6 improve share settings working 2014-06-05 15:44:55 +02:00
Jörn Friedrich Dreyer 0ce1f34f8a Merge pull request #8897 from owncloud/fix-multiselect
fix files multiselect bar now that the app list is gone
2014-06-05 15:32:31 +02:00
Thomas Müller 3dbfd1fe46 Merge pull request #8529 from owncloud/remove-legacy-routing
Remove legacy routing code
2014-06-05 15:22:46 +02:00
Joas Schilling d493c0c9ac Sort the result before comparing 2014-06-05 15:21:53 +02:00
Jan-Christoph Borchardt dca5a03f8b fix files multiselect bar now that the app list is gone 2014-06-05 13:23:08 +02:00
Thomas Müller e1beb8c6c3 Merge pull request #8889 from owncloud/mtime-reuse
Don't update the mtime if the storage mtime hasn't changed
2014-06-05 13:18:18 +02:00
Vincent Petry bbdcbb9911 Merge pull request #8866 from owncloud/flock-quotafix
Fixed quota wrapper to return the value from flock()
2014-06-05 13:11:45 +02:00
Thomas Müller e34b51124b Merge pull request #8894 from owncloud/public-share-js-overwrite
Dont overwrite OCA.Sharing
2014-06-05 13:04:30 +02:00
Thomas Müller f955209a5a Merge pull request #8890 from owncloud/cleanup-trashsizes-table-master
table files_trashsizes was still used in some locations -> removed
2014-06-05 13:00:50 +02:00
Robin Appelman 690e0b5070 Dont overwrite OCA.Sharing 2014-06-05 12:52:08 +02:00
Joas Schilling 4b18967129 Hack around oracle for CLOB fields 2014-06-05 12:19:48 +02:00
Joas Schilling 879237f32a Add method to get users by their preference 2014-06-05 11:50:43 +02:00
Lukas Reschke 7c4abce373 Move authentication to it's own call 2014-06-05 11:45:45 +02:00
Lukas Reschke ac7fb1b23e Remove legacy routing code
The getfile routing code was absolutely legacy and not needed anymore. Additionally \OC::$REQUESTEDAPP was never set to the actually accessed application.

This commit removes the legacy routing code and ensures that $REQUESTEDAPP is always set so that other applications (e.g. the firewall or a two-factor authentication) can intercept the currently accessed app.

Testplan:
[x] Installation works
[x] Login with DB works
[x] Logout works
[x] Login with alternate backend works (tested with user_webdavauth)
[x] Other apps are accessible
[x] Redirect on login works (e.g. index.php?redirect_url=%2Fcore%2Findex.php%2Fsettings%2Fapps%3Finstalled)
[x] Personal settings are accessible
[x] Admin settings are accessible
[x] Sharing files works
[x] DAV works
[x] OC::$REQUESTEDAPP contains the requested application and can be intercepted by other applications
2014-06-05 11:45:45 +02:00
Thomas Müller d0eb8f8668 Merge pull request #8880 from owncloud/webdav-read-permissions
Use the permissions exposed by ownCloud for webdav external storages
2014-06-05 11:38:02 +02:00
Jan-Christoph Borchardt fdfba14405 Merge pull request #8883 from owncloud/files-slide-toggle
use slide toggle for files app
2014-06-05 11:33:56 +02:00
Robin Appelman 9dab6ec2ec Fix uit tests 2014-06-05 11:31:55 +02:00
Jan-Christoph Borchardt 0ac1086ef6 fix size and unbold empty content message 2014-06-05 11:29:56 +02:00
Bernhard Posselt 844c6c3328 use slide toggle for files app 2014-06-05 11:26:24 +02:00
icewind1991 bd373d9621 Merge pull request #7878 from owncloud/quota-extstorageswitch
Added switch to count external storage data in quota
2014-06-05 11:23:32 +02:00
Vincent Petry e0c4e960d9 Merge pull request #8861 from owncloud/share-overview-linklist
Added Shared with link sidebar section in files app
2014-06-05 10:59:54 +02:00
Jörn Friedrich Dreyer f1bf06f8cf Merge pull request #8884 from owncloud/move-flock-to-app
remove file locking - code will continue to live in it's own app
2014-06-05 10:54:24 +02:00
Thomas Müller 1c20c72efe Merge pull request #8620 from owncloud/design-navigation-two
Toggle app navigation not only on mobile, but on desktop as well
2014-06-05 10:53:22 +02:00
Jan-Christoph Borchardt 218131d30d fix leading decimal Scrutinizer coding style issue 2014-06-05 10:52:06 +02:00
Thomas Müller 6fcd135d0e table files_trashsizes was still used in some locations -> removed 2014-06-05 10:44:32 +02:00
icewind1991 09cc7c2d44 Merge pull request #8862 from owncloud/share-overview-fixmimetype
Fix mime type returning for shared with others files
2014-06-05 10:29:03 +02:00