Commit Graph

29978 Commits

Author SHA1 Message Date
Thomas Müller f165ad8864 Changing the avatar of the user emits the changeUser event which triggers update of the system addressbook 2016-01-25 20:05:11 +01:00
Lukas Reschke 12b22c2759 Regenerate CSRF token upon login
Otherwise somebody else might be able to note down the CSRF token before login on a shared computer.
2016-01-25 20:03:40 +01:00
Lukas Reschke a977465af5 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.
2016-01-25 20:03:40 +01:00
Thomas Müller fe08700b59 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
2016-01-25 19:54:15 +01:00
Thomas Müller a4ea3563e7 Merge pull request #21830 from owncloud/systemtags-sidebar-permissions
Systemtags sidebar permissions
2016-01-25 17:33:40 +01:00
Joas Schilling 09ae160463 Replace other usages 2016-01-25 17:17:36 +01:00
Joas Schilling c5046fb2a9 Add parameters to public interface 2016-01-25 17:17:20 +01:00
Thomas Müller 728caf13f8 Adding support of -1 as size to be passed into get and getFile 2016-01-25 16:54:40 +01:00
Thomas Müller 2d7528bc64 Adding unit tests 2016-01-25 11:39:57 +01:00
Vincent Petry 0a1350d5ac 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
2016-01-25 10:45:02 +01:00
Vincent Petry d4198607ec Expose whether user is an admin through a method
Which is nicer than an obscure global variable
2016-01-25 10:07:47 +01:00
Thomas Müller ce753231eb Merge pull request #18444 from owncloud/occ-config-types
occ config:system:set can now set other value types
2016-01-25 10:02:51 +01:00
Thomas Müller 9d36972e0f Merge pull request #21401 from owncloud/dav-cache-getchildren
Put nodes from Directory->getChildren in the ObjectTree cache
2016-01-25 10:02:32 +01:00
Thomas Müller d69167caff Merge pull request #21424 from owncloud/appversions
Use appConfig to get app versions
2016-01-25 10:02:02 +01:00
Thomas Müller adf532fe4e Merge pull request #21806 from owncloud/mdusher-master
[jenkins] Added ' to characters allowed in the username
2016-01-25 10:01:43 +01:00
Thomas Müller 44043cb1d7 Merge pull request #21811 from owncloud/fix-unauthenticated-avatar
Show default placeholder if avatar image can't be fetched
2016-01-25 10:01:23 +01:00
Thomas Müller ef4fca22d1 Merge pull request #21844 from owncloud/drop-image-path
Remove OC_Helper::imagePath and use the proper public interface
2016-01-25 10:00:21 +01:00
Thomas Müller f90dccf172 Merge pull request #21862 from owncloud/sync-certificates-with-upstream
[master] Sync certificates with upstream
2016-01-25 10:00:05 +01:00
Thomas Müller d62ea66645 Merge pull request #21878 from owncloud/fix-apps-management-templating
Include author and license in l10n string to be able to change order
2016-01-25 09:59:45 +01:00
Thomas Müller e84a663b05 Merge pull request #21879 from owncloud/remove-unused-code
remove unused variable
2016-01-25 09:58:33 +01:00
Morris Jobke 287e6d36bf remove unused variable 2016-01-25 09:29:44 +01:00
Lukas Reschke 37f5f5077a Merge pull request #21877 from owncloud/fix_dav_app
Add missing use statements for IGroupManager and IUserSession
2016-01-25 08:50:41 +01:00
Morris Jobke 605df6c36b Includ author and license in l10n string to be able to change order
* fixes #21874
2016-01-25 08:44:43 +01:00
Roeland Jago Douma d0799af484 Add missing use statements for IGroupManager and IUserSession 2016-01-25 08:05:53 +01:00
Jenkins for ownCloud a331979a67 [tx-robot] updated from transifex 2016-01-25 01:54:39 -05:00
Morris Jobke 75e6734ef4 Remove OC_Helper::imagePath and use the proper public interface 2016-01-24 18:04:20 +01:00
Jenkins for ownCloud 82d3852815 [tx-robot] updated from transifex 2016-01-24 01:54:40 -05:00
Jenkins for ownCloud f92119e02f [tx-robot] updated from transifex 2016-01-23 01:55:35 -05:00
Lukas Reschke c0640f7998 Sync certificates with upstream 2016-01-22 22:10:17 +01:00
Thomas Müller 0a4142d5df Merge pull request #19002 from UoM-ResPlat-DevOps/swift-streaming-download
Streaming download from Swift in files_external
2016-01-22 17:27:41 +01:00
Thomas Müller 99e9c81c8b Merge pull request #21841 from owncloud/share2_deletefromself
[Share 2.0] Add deleteFromSelf method
2016-01-22 17:27:17 +01:00
Thomas Müller a203089cfd Merge pull request #21836 from RomanKreisel/master
Solves #21835 (https://github.com/owncloud/core/issues/21835)
2016-01-22 17:26:28 +01:00
Thomas Müller 7731b29136 Merge pull request #21719 from owncloud/move-notification-api-to-ocp
Move the notification API to public namespace
2016-01-22 16:20:26 +01:00
Thomas Müller 21131d133a Merge pull request #21814 from owncloud/systemtags-backend-permissions
Fix DAV backend to respect system tags permissions
2016-01-22 16:08:22 +01:00
Vincent Petry 2ef62b0115 Fix TagList serializer 2016-01-22 15:55:54 +01:00
Roeland Jago Douma a6600e95dc [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.
2016-01-22 15:06:50 +01:00
Thomas Müller 2d569d92eb Merge pull request #21850 from owncloud/more-output-for-integrity-check
Print output for integrity check during ./occ upgrade
2016-01-22 14:59:29 +01:00
Thomas Müller 7909c47b7c Sync federated clouds using a cron job 2016-01-22 14:58:49 +01:00
Vincent Petry 2f3e62a27f Fix oc:tags tag list serializer
Fixes propfind/proppatch of oc:tags
2016-01-22 14:07:26 +01:00
Morris Jobke e7aab8f31f Print output for integrity check during ./occ upgrade 2016-01-22 13:18:00 +01:00
Thomas Müller 9b4c9a0357 Merge pull request #18531 from owncloud/ext-user-credentials
External storage 'Login credentials' auth mechanism
2016-01-22 13:14:14 +01:00
Thomas Müller 0bccdbc959 Merge pull request #21849 from owncloud/add-custom-marker-into-htaccess
Add custom marker into htaccess and execute integrity check after installation
2016-01-22 13:13:59 +01:00
Thomas Müller e3013a99ef Merge pull request #21816 from owncloud/require-a-specific-path-instead-of-autoguessing
Use path instead of app id for occ app signing
2016-01-22 13:13:41 +01:00
Thomas Müller 969581cc68 Merge pull request #21847 from owncloud/issue-21807-default-app-icon
Add a default app icon for apps that don't have one
2016-01-22 12:53:40 +01:00
Lukas Reschke a0b383c5e8 Run on installer 2016-01-22 11:52:53 +01:00
Lukas Reschke bc62aa1ef5 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.
2016-01-22 11:51:54 +01:00
Joas Schilling 3038006e8e Add a default app icon for apps that don't have one 2016-01-22 11:38:11 +01:00
Thomas Müller 6a3efc6f1b Merge pull request #21843 from owncloud/increase-version
Increase version due to new tables
2016-01-22 11:17:12 +01:00
Thomas Müller 57b17cdd98 Merge pull request #21826 from owncloud/dav-fix-user-deletion
No card ID when deleting is acceptable
2016-01-22 11:16:30 +01:00
Vincent Petry 7d1416fe12 Increase version due to new tables 2016-01-22 11:04:04 +01:00