Граф коммитов

402 Коммитов

Автор SHA1 Сообщение Дата
Joas Schilling 869850858a Merge pull request #328 from owncloud/wip-no-html-sending
Return activities as JSON instead of sending HTML
2015-08-14 12:34:46 +02:00
Joas Schilling 926f5524fc Merge pull request #352 from owncloud/oracle-problem-public-page
Correctly fall back to empty string when there is no user
2015-08-14 09:51:11 +02:00
Joas Schilling 027f554d6d Display multiple previews when grouping activities 2015-08-13 17:38:00 +02:00
Joas Schilling 4f2c5ec36a Remove unused Display class (content was melted into the activites controller) 2015-08-13 16:42:47 +02:00
Joas Schilling e19c4682b9 Return JSON instead of compiled HTML 2015-08-13 16:41:16 +02:00
Joas Schilling da38e9b112 Replace tipsy with tooltip and use a different classname 2015-08-13 16:03:44 +02:00
Joas Schilling 3a977a20f0 Correctly fall back to empty string when there is no user 2015-08-11 13:02:17 +02:00
Joas Schilling d05b0b607b Allow types to be only set for specific methods 2015-08-11 11:14:32 +02:00
Joas Schilling f82f67a643 Use local caching 2015-07-24 14:48:02 +02:00
Joas Schilling cbbb7a752c Find the federated cloud id in contacts for better readability 2015-07-24 14:47:18 +02:00
Joas Schilling 87a2783734 fix doc block typo 2015-07-22 09:12:22 +02:00
Joas Schilling 893a5c4d3a Do not use deprecated Util::linkTo() 2015-07-22 08:47:29 +02:00
Joas Schilling 2405134fee Merge pull request #331 from owncloud/issue-329-fix-blurry-mimetype-icons
Use the SVG icon like in the file list
2015-07-18 10:21:14 +02:00
Joas Schilling 9fcba63c1f Do not group remote users (they might be different users) 2015-07-16 12:52:31 +02:00
Joas Schilling b1078ee1d0 Use the SVG icon like in the file list 2015-07-04 09:00:38 +02:00
Joas Schilling 8d22b745b5 Merge pull request #318 from owncloud/deprecation-cleanup-8.1
Deprecation cleanup after 8.1
2015-07-02 11:13:41 +02:00
Joas Schilling 139bddd48f Line breaks for constructor lines 2015-07-02 10:30:01 +02:00
Joas Schilling e27f374b3b Another property 2015-07-01 15:00:01 +02:00
Joas Schilling 3f577e6d53 Fix undefined property $connection 2015-07-01 14:55:03 +02:00
Joas Schilling 3417984a42 Remove unused "use" 2015-06-30 18:01:16 +02:00
Joas Schilling e567c76b94 Remove unused "use" 2015-06-30 18:01:01 +02:00
Joas Schilling c11d9de2a1 Use DI database connection instead of global 2015-06-30 17:06:46 +02:00
Joas Schilling a66ecdacf6 Remove unused template variables and import classes 2015-06-30 17:06:17 +02:00
Joas Schilling a3a2c1c896 Fix DI for expire activities background job 2015-06-30 17:05:44 +02:00
Joas Schilling 4a9f813bc3 Make method protected and import class name 2015-06-30 17:05:15 +02:00
Joas Schilling eaf4b2e795 Remove unused parameter 2015-06-30 17:04:51 +02:00
Joas Schilling 52b2eb1a21 Fix "and x more" parameter list 2015-06-29 10:10:28 +02:00
Joas Schilling 3b6519dd3f Correctly generate links around the preview with scrollto= parameter 2015-06-24 13:21:18 +02:00
Joas Schilling d86289232e Fix the discouraged equal / unequal operators 2015-06-24 12:25:45 +02:00
Joas Schilling 92205c5545 Fix the detection of self-actions on files activities 2015-05-11 11:00:41 +02:00
Joas Schilling ea9caa9d51 Use public methods to deal with the mime-types 2015-04-18 09:34:47 +02:00
Joas Schilling a08b515fb6 Use urlGenerator to get the absolute URL of the installation 2015-04-18 09:33:21 +02:00
Joas Schilling 1633690f2b Hide the navigation entries when they are just duplicates or empty 2015-03-30 14:56:43 +02:00
Joas Schilling d4bc301079 Allow extensions to filter the 'all' filter *see no evil* 2015-03-30 14:56:43 +02:00
Joas Schilling e67783567a Do not wrap the activity with a link, when the activity contains one 2015-03-30 14:56:43 +02:00
Joas Schilling 880de2239c Use the correct app name for sharing events 2015-03-30 14:56:43 +02:00
Joas Schilling 2b53d9ab60 Merge pull request #255 from owncloud/issue/254-increase-parameter-length
Issue/254 increase parameter length
2015-03-30 14:40:47 +02:00
Joas Schilling d7714804fb Limit the number of selected email entries per user 2015-03-26 15:49:29 +01:00
Joas Schilling e48c471d5b Avoid updating the oc_activity table, since it might take quite long :/ 2015-03-24 21:49:56 +01:00
Joas Schilling 61376f849c Merge pull request #266 from owncloud/swift-mailer-finally
Swift mailer finally
2015-03-24 14:24:44 +01:00
Joas Schilling 174bca47c5 Remove remaining warnings 2015-03-23 11:01:36 +01:00
Joas Schilling e1d8fde672 Use \OCP\IUserManager instead of static getDisplayName() 2015-03-23 10:58:58 +01:00
Joas Schilling 3c4d4ac615 Use OCP\Mail\IMailer for DI 2015-03-23 10:44:16 +01:00
Joas Schilling 906c863737 Correctly resolve all parameter types for arrays 2015-03-20 10:50:15 +01:00
Joas Schilling b951cc7f84 Use UserManager instead of OC_Util for better testability 2015-03-20 10:50:12 +01:00
Joas Schilling 6748808bde Check whether avatars are enabled before adding them 2015-03-14 16:02:40 +01:00
Lukas Reschke 5e17666652 Merge pull request #253 from owncloud/issue/250-self-action-magic
Fix incorrect magic for "self action" check
2015-03-11 17:22:48 +01:00
Joas Schilling 0617608a02 Fix missing docs and break long constructor line 2015-03-09 14:57:32 +01:00
Joas Schilling 69c6f8d43e Fix incorrect magic for "self action" check 2015-03-09 14:40:07 +01:00
Joas Schilling 64a692cc43 Use displayname instead of username in the To: field of activity emails 2015-03-09 13:04:11 +01:00
Joas Schilling c994f62d8e Use the servers timezone instead of UTC 2015-03-03 08:47:18 +01:00
Joas Schilling ceaae0190e Add test coverage for MailQueueHandler 2015-02-25 18:11:21 +01:00
Joas Schilling d4e3c9c02a Do not try to use empty values 2015-02-25 15:50:06 +01:00
Joas Schilling c1bc85c820 DI for the EmailNotification BackgroundJob 2015-02-25 15:49:05 +01:00
Joas Schilling 1c2584ff5e Merge pull request #243 from owncloud/move-rss-feed-to-controller
Move rss feed to controller
2015-02-25 13:16:05 +01:00
Joas Schilling e4daa2b63b Fix comments from Lukas 2015-02-25 11:11:25 +01:00
Joas Schilling b0ee54be13 Inject objects into Display for better testability 2015-02-24 16:10:51 +01:00
Joas Schilling 8ffc7eb6b6 Use a valid timezone name when no timezone is set 2015-02-23 17:49:53 +01:00
Joas Schilling 8950cd0275 Remove rss.php and rename the controller route to the old URL 2015-02-23 14:41:12 +01:00
Joas Schilling 83865de1b1 Inject the DataHelper into the EmailNotification
This is possible because we can now inject the user and the language
2015-02-23 13:24:24 +01:00
Joas Schilling 91e03126c9 Add a method to change the user and language for DataHelper and ParameterHelper 2015-02-23 13:17:11 +01:00
Joas Schilling 05a47f9edc Minor deprecation stuff 2015-02-20 17:21:26 +01:00
Joas Schilling 0f1c5715cc Inject current user into parameter helper 2015-02-20 17:19:57 +01:00
Joas Schilling 144435ae7e Remove soem empty/unused methods 2015-02-20 16:44:55 +01:00
Joas Schilling a081f110ea Unify the names of the stream template files 2015-02-19 11:20:16 +01:00
Joas Schilling f97cab3ad9 Merge pull request #236 from owncloud/issue/225-split-hooks-file
Issue/225 split hooks file
2015-02-18 15:27:28 +01:00
Joas Schilling f77b7aec67 Use json_encode/json_decode instead of (un)serialize() for the parameters 2015-02-17 17:10:58 +01:00
Joas Schilling 46882897f2 Move connection for user delete hook to a new file 2015-02-16 17:28:52 +01:00
Joas Schilling c0ddcb9e5f Rename files and classes 2015-02-16 17:26:56 +01:00
Joas Schilling 52ec5ae960 Correctly use placeholders for notification types 2015-02-13 12:57:24 +01:00
Joas Schilling 7aac4ba913 Remove empty switch() statement 2015-02-09 13:31:55 +01:00
Joas Schilling 7a79564d67 Fix constants 2015-02-09 12:44:43 +01:00
Joas Schilling 5d2ceb17f5 Move content related stuff from Data to the new Files extension 2015-02-05 14:53:43 +01:00
Joas Schilling 0e4e73ec3d Move nagivation to extension 2015-02-05 14:53:43 +01:00
Joas Schilling 07a86dfa9d Move getDefaultTypes to extension 2015-02-05 14:53:43 +01:00
Joas Schilling e388cb4d38 Move filter stuff to extension 2015-02-05 14:53:43 +01:00
Joas Schilling 0372e81028 Move filterNotificationTypes to extension 2015-02-05 14:53:43 +01:00
Joas Schilling 68f6364bba Move getNotificationTypes to extension 2015-02-05 14:53:43 +01:00
Joas Schilling 0e0ce20bb7 Move getGroupParameter() to files extension 2015-02-05 14:53:43 +01:00
Joas Schilling a0c830e9c1 Move parameter code to extension 2015-02-05 14:53:43 +01:00
Joas Schilling 9f8fb2a5e2 Move translations of the files app to the extension 2015-02-05 14:53:43 +01:00
Joas Schilling 082539b978 Move the type icons of the files stuff to an extension 2015-02-05 14:53:43 +01:00
Joas Schilling 6bf34c761f Fix wrong/broken avatar and displayname for remote user actions in feed 2015-01-28 15:08:35 +01:00
Morris Jobke 8fbd1aa477 log if a notification mail could not be set 2015-01-15 18:31:29 +01:00
Joas Schilling 22fc9604ab Merge pull request #202 from owncloud/issue/201-extension-emails
Add email activities for activities from the manager and test the consumer
2014-12-22 11:51:44 +01:00
Joas Schilling 2f2336c162 Remove OC\Preference from UserSettings 2014-12-17 15:42:32 +01:00
Joas Schilling 9c42477532 Add email activities for activities from the manager and test the consumer 2014-12-16 14:52:52 +01:00
Joas Schilling 2f699f155b Move RssToken to navigation constructor 2014-12-12 17:28:23 +01:00
Joas Schilling 9bcc1d5618 Use OCP\DateTimeFormatter from core 2014-12-12 15:57:45 +01:00
Joas Schilling dad3c403de Replace index.php with a controller 2014-12-12 15:23:48 +01:00
Joas Schilling 585bd5eb6b Always prepareParameters and allow extensions to specify the specialParams 2014-12-11 15:42:21 +01:00
Joas Schilling 46fe8d6018 Move ajax/fetch.php to a new controller 2014-12-11 10:23:10 +01:00
Joas Schilling 198ba1ea52 Fix registration of hooks
Broken by 357d7fbb95
2014-12-11 10:21:43 +01:00
Joas Schilling 71087b8050 Move settings to controller 2014-12-10 13:30:43 +01:00
Joas Schilling 357d7fbb95 Mock the ActivityManager so we don't interfer with core apps 2014-12-10 11:38:28 +01:00
Joas Schilling 7c2fc76c17 Fix doc block of Display::show() 2014-12-03 12:40:25 +01:00
Joas Schilling e9a08b93ef Use \OCP\Activity\IExtension constants instead of duplicates 2014-12-03 12:27:07 +01:00
Bjoern Schiessle 4d6a634bb5 path should only point to the file of the affected user 2014-11-28 20:20:48 +01:00
Joas Schilling 497f7b1416 Use users timezone for generating the relative date 2014-11-20 15:53:05 +01:00
Joas Schilling bc9f5d24de Merge pull request #172 from owncloud/issue/161
Issue/161 Make use of the scrollto= parameter in activities
2014-11-05 15:24:54 +01:00