Commit graph

26208 commits

Author SHA1 Message Date
Jan-Christoph Borchardt
e16cf0c45f more understandable 'Wrong password' feedback 2015-08-12 18:43:09 +02:00
Thomas Müller
326de6f9b4 Merge pull request #18065 from owncloud/new-trashbin-retention
New trashbin retention
2015-08-12 13:13:45 +02:00
Thomas Müller
abd3d5c6a5 Merge pull request #17982 from owncloud/appframework-sanitize-name
Sanitize class names before registerService/query
2015-08-12 12:19:24 +02:00
Thomas Müller
33727131ac Merge pull request #17865 from rullzer/less_static_prov_api
Move Provisioning API to OCP
2015-08-12 12:16:55 +02:00
Thomas Müller
eb13cb8d75 Merge pull request #18127 from owncloud/dav-request-tests
add test framework for doing full request webdav tests
2015-08-12 10:07:20 +02:00
Robin McCorkell
24e45d5954 Merge pull request #18207 from owncloud/bump-version
Bump version patch number, fixes #18129
2015-08-11 17:43:41 +01:00
Robin McCorkell
cd5342d0ff Merge pull request #18202 from owncloud/revert-route-breaking-changes
Revert route breaking changes
2015-08-11 15:28:06 +01:00
Robin McCorkell
fa8b1074e8 Bump version patch number, fixes #18129 2015-08-11 14:43:32 +01:00
Roeland Jago Douma
b41bccd385 Check for userSession->getUser() === null 2015-08-11 15:37:06 +02:00
Roeland Jago Douma
b25c3beb2f [provisioning api] Fix grouptest 2015-08-11 15:22:59 +02:00
Jan-Christoph Borchardt
d04a6bce6f Merge pull request #17709 from owncloud/fileactions-dropdown
Move file actions to dropdown
2015-08-11 15:13:59 +02:00
Robin Appelman
b7cbff23d9 handle single file dav endpoints 2015-08-11 14:46:46 +02:00
Robin Appelman
fd35365041 only add tags plugin when loggedin 2015-08-11 14:43:46 +02:00
Robin Appelman
d15870b998 fix setup/teardown 2015-08-11 14:43:46 +02:00
Robin Appelman
b0c8654f9e split out creating the sabre dav server to it's own factory 2015-08-11 14:43:46 +02:00
Robin Appelman
8c5302847b add test framework for doing full request webdav tests 2015-08-11 14:43:46 +02:00
Robin McCorkell
cd0a2874de Merge pull request #17852 from owncloud/register-alias-factory
Add test for factories
2015-08-11 13:30:56 +01:00
Joas Schilling
32ccd66214 Revert "make knowledge base url configurable"
This reverts commit 8fb89056bd.
2015-08-11 14:20:25 +02:00
Joas Schilling
c16fd29f29 Revert "Only load app routes if the app has already been loaded"
This reverts commit 50ebea41f6.
2015-08-11 14:19:59 +02:00
Thomas Müller
aed068b237 Merge pull request #17868 from owncloud/x-forwarded-for
Set default 'forwarded for' headers for reverse proxy
2015-08-11 14:02:46 +02:00
Thomas Müller
d5bba42030 Merge pull request #17932 from owncloud/fix_move_files
make sure that hooks are emitted properly on file move operation
2015-08-11 13:54:09 +02:00
Roeland Jago Douma
2148120883 [provisioning api] Test for correct displayname 2015-08-11 13:01:37 +02:00
Roeland Jago Douma
4bffe393e9 Declare fields 2015-08-11 12:51:00 +02:00
Roeland Jago Douma
934f98b592 [provisioning api] Improve apps test coverage 2015-08-11 12:47:57 +02:00
Roeland Jago Douma
ed1f034e6b Fix groups 2015-08-11 12:47:42 +02:00
Morris Jobke
0abc637782 Merge pull request #18171 from owncloud/fix-language-of-files-activities-in-emails
Correctly make use of the languageCode argument in the files activity extension
2015-08-11 12:34:58 +02:00
Roeland Jago Douma
96949649f0 [provisioning api] improve coverage for groups 2015-08-11 11:47:01 +02:00
Vincent Petry
984ae8140d Fixed file actions menu to close when reclicking trigger
FileActionsMenu is now a backbone view.
The trigger and highlight handling is now done in the
FileActions.showMenu() method using events.
2015-08-11 11:35:46 +02:00
Vincent Petry
a5aa03a1a6 Load backbone when running unit tests 2015-08-11 11:35:21 +02:00
Joas Schilling
acd54fbeda Merge pull request #16528 from owncloud/activity-302-improve-settings
Activity 302 improve settings
2015-08-11 11:24:27 +02:00
Roeland Jago Douma
867f5136c2 [provisioning api] Improve test coverage user 2015-08-11 11:08:57 +02:00
Joas Schilling
669d705792 Merge pull request #17830 from owncloud/issue-17825-dont-silently-ignore-invalid-consumers-extensions
Throw a InvalidArgumentException when a consumer/extension is invalid
2015-08-11 10:16:20 +02:00
Robin McCorkell
2579999373 Add setup check for reverse proxy header configuration 2015-08-10 23:28:16 +01:00
Morris Jobke
d56e03bb94 Merge pull request #18096 from sualko/patch-1
add data: to allowed image domains
2015-08-10 23:05:07 +02:00
Robin McCorkell
8944af57cb Set default forwarded_for_headers to 'HTTP_X_FORWARDED_FOR' 2015-08-10 23:04:52 +02:00
Thomas Müller
9650f3ecbe Merge pull request #17919 from rullzer/php_supported_check
Display warning in security & setup warnings if php version is EOL
2015-08-10 23:03:35 +02:00
Victor Dubiniuk
b9f655d8ad Fix tests 2015-08-10 23:55:10 +03:00
Victor Dubiniuk
33c29d3da7 Migrate settings 2015-08-10 23:54:44 +03:00
Thomas Müller
54aa57b47a Merge pull request #18109 from owncloud/fix-router-app-loaded
Only load app routes if the app has already been loaded
2015-08-10 21:42:13 +02:00
Thomas Müller
bfb9a8e58e Merge pull request #18175 from owncloud/automatic-db-prefix-query-builder
Automatic db prefix query builder
2015-08-10 21:41:32 +02:00
Victor Dubiniuk
4ef2615788 Enhance trashbin expiration settings 2015-08-10 20:40:43 +02:00
Roeland Douma
c2856c05aa Merge pull request #15093 from rullzer/capabilities_manager
Capabilities manager
2015-08-10 20:33:50 +02:00
Joas Schilling
e6eb74958f Remove unnecessary DB prefixes from existing query builder usages 2015-08-10 16:21:41 +02:00
Joas Schilling
5fea6f753e Automatically prefix table names with *PREFIX* unless specified 2015-08-10 16:20:42 +02:00
Thomas Müller
6e4a79f852 Merge pull request #18159 from owncloud/check-appid-folder-in-archive
Check if archive contains a directory named like appid
2015-08-10 16:16:05 +02:00
Vincent Petry
86e1eaf370 Inline actions using default renderer are now always permanent
Default renderer like the favorite icon can decide whether to use the
permanent class or not.

Fixed sharing code to properly update the icon according to sharing
state modifications.
2015-08-10 15:57:21 +02:00
Joas Schilling
81c3bbad57 Correctly make use of the languageCode argument in the files activity extension 2015-08-10 14:40:33 +02:00
Jan-Christoph Borchardt
08912308a0 fix width of action dropdown and last layout details 2015-08-10 14:16:49 +02:00
Jan-Christoph Borchardt
1283ecac23 remove whitespace on right cause of moved delete icon 2015-08-10 14:16:42 +02:00
Jan-Christoph Borchardt
5e7e0c7e2d fix ellipsizing for file names 2015-08-10 14:16:36 +02:00