]>
source.dussan.org Git - nextcloud-server.git/log
Thomas Müller [Tue, 26 Jan 2016 15:12:14 +0000 (16:12 +0100)]
Merge pull request #21920 from owncloud/fix-firstrunwizard-button
fix first run wizard button not wrapping
Jan-Christoph Borchardt [Tue, 26 Jan 2016 14:28:19 +0000 (15:28 +0100)]
fix first run wizard button not wrapping
Vincent Petry [Tue, 26 Jan 2016 14:20:03 +0000 (15:20 +0100)]
Merge pull request #21913 from owncloud/fix_resolve_user_group_share
[Share 2.0] Resolve to correct usergroup share
Roeland Jago Douma [Tue, 26 Jan 2016 11:58:41 +0000 (12:58 +0100)]
We must resolve to the proper usergroup share
Thomas Müller [Tue, 26 Jan 2016 10:42:55 +0000 (11:42 +0100)]
Merge pull request #21901 from owncloud/fix-setup
Fix setup page
Thomas Müller [Tue, 26 Jan 2016 10:37:37 +0000 (11:37 +0100)]
Merge pull request #21853 from owncloud/tags-fixpropertyma
Fix oc:tags tag list serializer
Thomas Müller [Tue, 26 Jan 2016 10:37:17 +0000 (11:37 +0100)]
Merge pull request #21845 from owncloud/sync-system-addressbook-on-avatar-change
Changing the avatar of the user emits the changeUser event which trig…
Thomas Müller [Tue, 26 Jan 2016 10:36:56 +0000 (11:36 +0100)]
Merge pull request #21894 from owncloud/refactor-csrf
Add new CSRF manager for unit testing purposes
Morris Jobke [Tue, 26 Jan 2016 08:05:10 +0000 (09:05 +0100)]
Fix setup page
* fixes #21897
Jenkins for ownCloud [Tue, 26 Jan 2016 06:56:06 +0000 (01:56 -0500)]
[tx-robot] updated from transifex
Thomas Müller [Mon, 25 Jan 2016 20:13:41 +0000 (21:13 +0100)]
Merge pull request #21892 from owncloud/issue-21890-parameters
Add parameters types to IQueryBuilder
Thomas Müller [Mon, 25 Jan 2016 12:06:00 +0000 (13:06 +0100)]
Trigger change on avatar delete
Thomas Müller [Fri, 22 Jan 2016 11:56:53 +0000 (12:56 +0100)]
Assert that User::triggerChange is called upon avatar change
Thomas Müller [Fri, 22 Jan 2016 10:34:49 +0000 (11:34 +0100)]
Changing the avatar of the user emits the changeUser event which triggers update of the system addressbook
Lukas Reschke [Mon, 25 Jan 2016 16:15:28 +0000 (17:15 +0100)]
Regenerate CSRF token upon login
Otherwise somebody else might be able to note down the CSRF token before login on a shared computer.
Lukas Reschke [Mon, 25 Jan 2016 16:15:54 +0000 (17:15 +0100)]
Add new CSRF manager for unit testing purposes
This adds a new CSRF manager for unit testing purposes, it's interface is based upon https://github.com/symfony/security-csrf. Due to some of our required custom changes it is however not possible to use the Symfony component directly.
Thomas Müller [Mon, 25 Jan 2016 18:54:15 +0000 (19:54 +0100)]
Merge pull request #21885 from owncloud/add-size-minus-zero-to-avatar
Adding support of -1 as size to be passed into get and getFile
Thomas Müller [Mon, 25 Jan 2016 16:33:40 +0000 (17:33 +0100)]
Merge pull request #21830 from owncloud/systemtags-sidebar-permissions
Systemtags sidebar permissions
Joas Schilling [Mon, 25 Jan 2016 16:17:36 +0000 (17:17 +0100)]
Replace other usages
Joas Schilling [Mon, 25 Jan 2016 16:17:20 +0000 (17:17 +0100)]
Add parameters to public interface
Thomas Müller [Mon, 25 Jan 2016 12:24:56 +0000 (13:24 +0100)]
Adding support of -1 as size to be passed into get and getFile
Vincent Petry [Thu, 21 Jan 2016 14:23:49 +0000 (15:23 +0100)]
System tags sidebar selector now respects permissions
For admins: display the namespace behind the tag name.
For users: no namespace, don't display non-assignable tags in the
dropdown, display already assigned non-assignable tags with a different
style
Vincent Petry [Thu, 21 Jan 2016 14:23:03 +0000 (15:23 +0100)]
Expose whether user is an admin through a method
Which is nicer than an obscure global variable
Thomas Müller [Mon, 25 Jan 2016 09:02:51 +0000 (10:02 +0100)]
Merge pull request #18444 from owncloud/occ-config-types
occ config:system:set can now set other value types
Thomas Müller [Mon, 25 Jan 2016 09:02:32 +0000 (10:02 +0100)]
Merge pull request #21401 from owncloud/dav-cache-getchildren
Put nodes from Directory->getChildren in the ObjectTree cache
Thomas Müller [Mon, 25 Jan 2016 09:02:02 +0000 (10:02 +0100)]
Merge pull request #21424 from owncloud/appversions
Use appConfig to get app versions
Thomas Müller [Mon, 25 Jan 2016 09:01:43 +0000 (10:01 +0100)]
Merge pull request #21806 from owncloud/mdusher-master
[jenkins] Added ' to characters allowed in the username
Thomas Müller [Mon, 25 Jan 2016 09:01:23 +0000 (10:01 +0100)]
Merge pull request #21811 from owncloud/fix-unauthenticated-avatar
Show default placeholder if avatar image can't be fetched
Thomas Müller [Mon, 25 Jan 2016 09:00:21 +0000 (10:00 +0100)]
Merge pull request #21844 from owncloud/drop-image-path
Remove OC_Helper::imagePath and use the proper public interface
Thomas Müller [Mon, 25 Jan 2016 09:00:05 +0000 (10:00 +0100)]
Merge pull request #21862 from owncloud/sync-certificates-with-upstream
[master] Sync certificates with upstream
Thomas Müller [Mon, 25 Jan 2016 08:59:45 +0000 (09:59 +0100)]
Merge pull request #21878 from owncloud/fix-apps-management-templating
Include author and license in l10n string to be able to change order
Thomas Müller [Mon, 25 Jan 2016 08:58:33 +0000 (09:58 +0100)]
Merge pull request #21879 from owncloud/remove-unused-code
remove unused variable
Morris Jobke [Mon, 25 Jan 2016 08:29:44 +0000 (09:29 +0100)]
remove unused variable
Lukas Reschke [Mon, 25 Jan 2016 07:50:41 +0000 (08:50 +0100)]
Merge pull request #21877 from owncloud/fix_dav_app
Add missing use statements for IGroupManager and IUserSession
Morris Jobke [Mon, 25 Jan 2016 07:44:43 +0000 (08:44 +0100)]
Includ author and license in l10n string to be able to change order
* fixes #21874
Roeland Jago Douma [Sat, 23 Jan 2016 10:05:09 +0000 (11:05 +0100)]
Add missing use statements for IGroupManager and IUserSession
Jenkins for ownCloud [Mon, 25 Jan 2016 06:54:39 +0000 (01:54 -0500)]
[tx-robot] updated from transifex
Morris Jobke [Fri, 22 Jan 2016 10:18:42 +0000 (11:18 +0100)]
Remove OC_Helper::imagePath and use the proper public interface
Jenkins for ownCloud [Sun, 24 Jan 2016 06:54:40 +0000 (01:54 -0500)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Sat, 23 Jan 2016 06:55:35 +0000 (01:55 -0500)]
[tx-robot] updated from transifex
Lukas Reschke [Fri, 22 Jan 2016 21:10:17 +0000 (22:10 +0100)]
Sync certificates with upstream
Thomas Müller [Fri, 22 Jan 2016 16:27:41 +0000 (17:27 +0100)]
Merge pull request #19002 from UoM-ResPlat-DevOps/swift-streaming-download
Streaming download from Swift in files_external
Thomas Müller [Fri, 22 Jan 2016 16:27:17 +0000 (17:27 +0100)]
Merge pull request #21841 from owncloud/share2_deletefromself
[Share 2.0] Add deleteFromSelf method
Thomas Müller [Fri, 22 Jan 2016 16:26:28 +0000 (17:26 +0100)]
Merge pull request #21836 from RomanKreisel/master
Solves #21835 (https://github.com/owncloud/core/issues/21835)
Thomas Müller [Fri, 22 Jan 2016 15:20:26 +0000 (16:20 +0100)]
Merge pull request #21719 from owncloud/move-notification-api-to-ocp
Move the notification API to public namespace
Thomas Müller [Fri, 22 Jan 2016 15:08:22 +0000 (16:08 +0100)]
Merge pull request #21814 from owncloud/systemtags-backend-permissions
Fix DAV backend to respect system tags permissions
Vincent Petry [Fri, 22 Jan 2016 14:55:54 +0000 (15:55 +0100)]
Fix TagList serializer
Roeland Jago Douma [Thu, 21 Jan 2016 13:31:09 +0000 (14:31 +0100)]
[Share 2.0] Add deleteFromSelf method
This allows recipient to delete a share. For user shares this is the
same as deleting (at least for now).
But for group shares this means creating a new share with type 2. With
permissions set to 0.
Thomas Müller [Fri, 22 Jan 2016 13:59:29 +0000 (14:59 +0100)]
Merge pull request #21850 from owncloud/more-output-for-integrity-check
Print output for integrity check during ./occ upgrade
Vincent Petry [Fri, 22 Jan 2016 13:07:26 +0000 (14:07 +0100)]
Fix oc:tags tag list serializer
Fixes propfind/proppatch of oc:tags
Morris Jobke [Fri, 22 Jan 2016 12:18:00 +0000 (13:18 +0100)]
Print output for integrity check during ./occ upgrade
Thomas Müller [Fri, 22 Jan 2016 12:14:14 +0000 (13:14 +0100)]
Merge pull request #18531 from owncloud/ext-user-credentials
External storage 'Login credentials' auth mechanism
Thomas Müller [Fri, 22 Jan 2016 12:13:59 +0000 (13:13 +0100)]
Merge pull request #21849 from owncloud/add-custom-marker-into-htaccess
Add custom marker into htaccess and execute integrity check after installation
Thomas Müller [Fri, 22 Jan 2016 12:13:41 +0000 (13:13 +0100)]
Merge pull request #21816 from owncloud/require-a-specific-path-instead-of-autoguessing
Use path instead of app id for occ app signing
Thomas Müller [Fri, 22 Jan 2016 11:53:40 +0000 (12:53 +0100)]
Merge pull request #21847 from owncloud/issue-21807-default-app-icon
Add a default app icon for apps that don't have one
Lukas Reschke [Fri, 22 Jan 2016 10:49:28 +0000 (11:49 +0100)]
Run on installer
Lukas Reschke [Wed, 20 Jan 2016 22:05:37 +0000 (23:05 +0100)]
Exclude .htaccess modifications from code checker
After the initial installation ownCloud will write some content into the .htaccess file such as the 404 or 403 directives. This adds a magic marker into the .htaccess file and only the content above this marker will be compared in the integrity checker.
Joas Schilling [Fri, 22 Jan 2016 10:38:11 +0000 (11:38 +0100)]
Add a default app icon for apps that don't have one
Thomas Müller [Fri, 22 Jan 2016 10:17:12 +0000 (11:17 +0100)]
Merge pull request #21843 from owncloud/increase-version
Increase version due to new tables
Thomas Müller [Fri, 22 Jan 2016 10:16:30 +0000 (11:16 +0100)]
Merge pull request #21826 from owncloud/dav-fix-user-deletion
No card ID when deleting is acceptable
Vincent Petry [Fri, 22 Jan 2016 10:04:04 +0000 (11:04 +0100)]
Increase version due to new tables
Joas Schilling [Fri, 22 Jan 2016 10:02:40 +0000 (11:02 +0100)]
Allow automatic injection of the Manager
Thomas Müller [Fri, 22 Jan 2016 10:01:54 +0000 (11:01 +0100)]
Merge pull request #20768 from owncloud/mount-cache
cache mountpoints in the db
Joas Schilling [Fri, 22 Jan 2016 09:51:36 +0000 (10:51 +0100)]
Adjust the since on the interface
Joas Schilling [Thu, 14 Jan 2016 13:35:24 +0000 (14:35 +0100)]
Move the notification API to public namespace
Thomas Müller [Fri, 22 Jan 2016 09:24:46 +0000 (10:24 +0100)]
Merge pull request #21824 from owncloud/list-of-notifiers
Make it possible to get a list of notifiers for a potential settings …
Thomas Müller [Fri, 22 Jan 2016 09:24:26 +0000 (10:24 +0100)]
Merge pull request #21840 from owncloud/fix-phpdoc
Fix PHPDoc - @changed is no official tag -> use @since
Joas Schilling [Thu, 21 Jan 2016 08:49:37 +0000 (09:49 +0100)]
Make it possible to get a list of notifiers for a potential settings page
Morris Jobke [Fri, 22 Jan 2016 07:43:05 +0000 (08:43 +0100)]
Fix PHPDoc - @changed is no official tag -> use @since
Thomas Müller [Fri, 22 Jan 2016 06:58:36 +0000 (07:58 +0100)]
Merge pull request #21532 from owncloud/share2.0_getShares
[Share 2.0] get shares
Jenkins for ownCloud [Fri, 22 Jan 2016 06:55:28 +0000 (01:55 -0500)]
[tx-robot] updated from transifex
Roman Kreisel [Thu, 21 Jan 2016 16:29:14 +0000 (17:29 +0100)]
Solves #
Thomas Müller [Thu, 21 Jan 2016 15:31:52 +0000 (16:31 +0100)]
Merge pull request #21831 from owncloud/move-descriptive-tag-to-core
Move getDescriptiveTag to core
Thomas Müller [Thu, 21 Jan 2016 15:27:03 +0000 (16:27 +0100)]
Merge pull request #21829 from owncloud/remove-duplicated-value
remove duplicated array value
Roeland Jago Douma [Thu, 21 Jan 2016 14:56:23 +0000 (15:56 +0100)]
[Share 2.0] Fix displaying old shares proplery
Roeland Jago Douma [Wed, 20 Jan 2016 13:17:25 +0000 (14:17 +0100)]
Comments from Vincent
Roeland Jago Douma [Wed, 20 Jan 2016 13:07:56 +0000 (14:07 +0100)]
Add Unit tests for the default share provider
Roeland Jago Douma [Tue, 19 Jan 2016 13:35:16 +0000 (14:35 +0100)]
[Share 2.0] Add subfiles=x
Roeland Jago Douma [Tue, 19 Jan 2016 12:57:32 +0000 (13:57 +0100)]
Add intergration test for shared_with me and group shares
Roeland Jago Douma [Tue, 19 Jan 2016 12:55:51 +0000 (13:55 +0100)]
[Share 2.0] Resolve group shares
Roeland Jago Douma [Tue, 15 Dec 2015 09:38:34 +0000 (10:38 +0100)]
Renable intergration test
Roeland Jago Douma [Thu, 3 Dec 2015 09:51:41 +0000 (10:51 +0100)]
[Sharing 2.0] Start with getShares
Joas Schilling [Thu, 21 Jan 2016 14:35:15 +0000 (15:35 +0100)]
Move getDescriptiveTag to core
Thomas Müller [Thu, 21 Jan 2016 14:43:08 +0000 (15:43 +0100)]
Merge pull request #21761 from owncloud/share2_link
Share2 link
Thomas Müller [Thu, 21 Jan 2016 14:20:10 +0000 (15:20 +0100)]
Merge pull request #21797 from owncloud/proper-controller-in-core
Move controller in core/ to a common subfolder
Thomas Müller [Thu, 21 Jan 2016 13:29:11 +0000 (14:29 +0100)]
Merge pull request #21808 from owncloud/testing-app-details
Testing app details
Vincent Petry [Thu, 21 Jan 2016 13:09:15 +0000 (14:09 +0100)]
Inject user session to check for admin in system tags DAV handlers
Vincent Petry [Wed, 20 Jan 2016 10:47:23 +0000 (11:47 +0100)]
Fix DAV to respect system tags permissions
When queried as regular user, visible tags are not displayed in result
sets and queries for existence will return false.
Non-assignable or non-visible tags cannot be
renamed/assigned/unassigned.
User is not allowed to change tag permissions, only to change the name
if the tag is also assignable.
blizzz [Thu, 21 Jan 2016 12:59:36 +0000 (13:59 +0100)]
remove duplicated array value
Thomas Müller [Thu, 21 Jan 2016 11:31:26 +0000 (12:31 +0100)]
Merge pull request #21778 from owncloud/share-calendars
More tests for CalDAV
Joas Schilling [Thu, 21 Jan 2016 11:19:28 +0000 (12:19 +0100)]
No card ID when deleting is acceptable
Thomas Müller [Thu, 21 Jan 2016 11:13:01 +0000 (12:13 +0100)]
Merge pull request #21792 from owncloud/systemtags-managerfactory
Allow custom implementation of system tag managers
Jan-Christoph Borchardt [Wed, 20 Jan 2016 13:28:05 +0000 (14:28 +0100)]
testing app: fix app name capitalization
Jan-Christoph Borchardt [Wed, 20 Jan 2016 13:27:42 +0000 (14:27 +0100)]
testing app: add max version
Jan-Christoph Borchardt [Wed, 20 Jan 2016 13:27:31 +0000 (14:27 +0100)]
testing app: add logo
Thomas Müller [Thu, 21 Jan 2016 11:12:40 +0000 (12:12 +0100)]
Merge pull request #20847 from owncloud/systemtags-ui
System tags sidebar section
Jenkins for ownCloud [Thu, 21 Jan 2016 06:55:20 +0000 (01:55 -0500)]
[tx-robot] updated from transifex
Thomas Müller [Wed, 20 Jan 2016 23:07:46 +0000 (00:07 +0100)]
Merge pull request #21782 from owncloud/update-system-addressbook-on-user-change-2
Introduce IUser::setEMailAddress and add hook mechanism
Roeland Jago Douma [Wed, 20 Jan 2016 20:56:55 +0000 (21:56 +0100)]
Add Unit tests
Roeland Jago Douma [Wed, 20 Jan 2016 09:14:03 +0000 (10:14 +0100)]
Directly get from the server container
* Updated unit tests