Commit Graph

46 Commits

Author SHA1 Message Date
Robin Appelman 5f58cefbd7
merge file activity settings into a single 'favorite changed' item
Signed-off-by: Robin Appelman <robin@icewind.nl>
2020-08-13 00:01:34 +02:00
Robin Appelman 227e362842
allow grouping of activity settings
Signed-off-by: Robin Appelman <robin@icewind.nl>
2020-08-05 16:13:03 +02:00
Christoph Wurst cb057829f7
Update license headers for 19
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2020-04-29 11:57:22 +02:00
Christoph Wurst 28f8eb5dba
Add visibility to all constants
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2020-04-10 16:54:27 +02:00
Christoph Wurst caff1023ea
Format control structures, classes, methods and function
To continue this formatting madness, here's a tiny patch that adds
unified formatting for control structures like if and loops as well as
classes, their methods and anonymous functions. This basically forces
the constructs to start on the same line. This is not exactly what PSR2
wants, but I think we can have a few exceptions with "our" style. The
starting of braces on the same line is pracrically standard for our
code.

This also removes and empty lines from method/function bodies at the
beginning and end.

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2020-04-10 14:19:56 +02:00
Christoph Wurst 14c996d982
Use elseif instead of else if
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2020-04-10 10:35:09 +02:00
Christoph Wurst 41b5e5923a
Use exactly one empty line after the namespace declaration
For PSR2

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2020-04-09 11:48:10 +02:00
Joas Schilling f4918f208e
Unify the code a bit
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-03-10 19:36:57 +01:00
Joas Schilling bbef026aa0
Use contacts name on federated activities
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-03-10 19:36:56 +01:00
Joas Schilling 38292753ac
Combine move activities as well
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-03-10 09:32:52 +01:00
Christoph Wurst 5bf3d1bb38
Update license headers
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2019-12-05 15:38:45 +01:00
Roeland Jago Douma 68748d4f85
Some php-cs fixes
* Order the imports
* No leading slash on imports
* Empty line before namespace
* One line per import
* Empty after imports
* Emmpty line at bottom of file

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2019-11-22 20:52:10 +01:00
Joas Schilling 0ba9e3b8bd
Make the yellow favorite icon non-monochrome
Signed-off-by: Joas Schilling <coding@schilljs.com>
2019-01-22 16:13:29 +01:00
Joas Schilling 55cd351324
Add icon to restore activity
Signed-off-by: Joas Schilling <coding@schilljs.com>
2019-01-22 15:37:07 +01:00
John Molakvoæ (skjnldsv) 8977c71f88
Mixin scss icon api
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-07-19 08:16:58 +02:00
Joas Schilling 0b883ab9d9
Catch exception when the parent is deleted as well
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-02-28 15:40:01 +01:00
Joas Schilling 825c276e84
Do a recursion instead of an endless loop
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-02-28 15:16:18 +01:00
Joas Schilling 62e982a91f
Fix problem with deleted files
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-02-28 15:06:06 +01:00
Joas Schilling d202bae3b5
Fix path handling for activities
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-02-28 15:06:06 +01:00
Joas Schilling f8c27cb57d
Add special handling for e2e encryption
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-02-28 15:06:06 +01:00
Joas Schilling 03a25410f1
Extract duplicated logic into a method
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-02-28 15:06:05 +01:00
Morris Jobke 0eebff152a
Update license headers
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-11-06 16:56:19 +01:00
Joas Schilling 0b3266531b
Fix copy and paste error on activity descriptions
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-07-20 09:31:14 +02:00
Joas Schilling 90fa27694a
Use PNG version of the icons for shipped activities
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-06-20 13:48:51 +02:00
Joas Schilling edb4956290
Fix username and avatar for external users
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-05-19 15:45:14 +02:00
Björn Schießle a88fc0c283 Merge pull request #3181 from nextcloud/fix-favorite-activity-mail
Make sure the file information is available when sending the email
2017-02-10 11:35:45 +01:00
Joas Schilling 54e39d4b93
Fix files sharing legacy as well
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-02-08 11:55:50 +01:00
Joas Schilling 881c7275a2
Add tests for getFile()
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-02-07 11:49:32 +01:00
Joas Schilling c031c77e3c
Make sure ownCloud 8.2 activities also can get displayed
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-02-07 11:30:23 +01:00
Joas Schilling fef4462904
Make sure the file information is available when sending the email
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-01-20 12:52:56 +01:00
Joas Schilling 6de0eb0b74
Remove leading slash from sharing activity
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-12-15 15:53:48 +01:00
Joas Schilling 7c1b288b57
Add some generic tests
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-12-04 12:41:14 +01:00
Joas Schilling 8baf986d3b
Add an activity when managing favorites
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-12-04 12:16:49 +01:00
Joas Schilling b2f46bfa04
Adjust all implementations in the server repo
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-12-01 11:35:23 +01:00
Joas Schilling da9468522b
Add an event merger and use it for the files activities
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-11-25 15:36:11 +01:00
Joas Schilling 5ba2b1c193
Working towards groups
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-11-25 15:19:55 +01:00
Morris Jobke f6e7269628
document new variable
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2016-11-22 16:55:28 +01:00
Joas Schilling e1feb72583
Use the display name for files activities again
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-11-22 16:39:29 +01:00
Joas Schilling a845f7bc01
Fix wrong copyright headers
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-11-16 12:20:04 +01:00
Joas Schilling 6b88d56e3a
Update the since version to 11.0.0
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-11-16 09:29:27 +01:00
Joas Schilling cf8b91be52
Add back the support for the short translations
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-11-16 09:25:45 +01:00
Joas Schilling 27c08167df
Don't even try to combine when the subject is different
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-11-16 09:25:45 +01:00
Joas Schilling 6ddf43e27a
Provider for the files app
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-11-16 09:25:45 +01:00
Joas Schilling ca2124a2a1
Register the settings of the files app via info.xml
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-11-16 09:25:44 +01:00
Joas Schilling 0d940e581a
Move the favorites filter to IFilter
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-11-16 09:25:44 +01:00
Joas Schilling 5d71896c8e
Move files filter to IFilter
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-11-16 09:25:44 +01:00