wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
35107 commits 157 branches 562 tags 714 MiB
Commit graph

14611 commits

Author SHA1 Message Date
Lukas Reschke
62e19dfa80 Merge pull request #1441 from nextcloud/getby-id-less-queries 
optimize Folder::getById to use less queries
 2016-10-14 15:18:23 +02:00
Thomas Citharel
3b055b160e
fix typo 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2016-10-14 11:48:18 +02:00
Thomas Müller
5cd90d4116
[9.2] Sync deathdate and anniversary to birthday calendar (#25655) 
* Sync deathdate and anniversary to birthday calendar (which should be renamed maybe)

* Sync deathdate and anniversary to birthday calendar (which should be renamed maybe)

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2016-10-14 10:12:43 +02:00
Nextcloud bot
92c24a91fa
[tx-robot] updated from transifex 2016-10-14 00:07:00 +00:00
Roeland Jago Douma
6c5f7d586e
Fix migration tests 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2016-10-13 19:40:44 +02:00
Arthur Schiwon
a49d571799
fix and tidy up tests after merge conflicts 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2016-10-13 15:34:40 +02:00
Morris Jobke
05869e4d22 Merge pull request #1726 from nextcloud/fix-symfony-table 
symfony replaced table helper by class, fixes two broken LDAP occ com…
 2016-10-13 12:19:15 +02:00
Nextcloud bot
9aae4a0d02
[tx-robot] updated from transifex 2016-10-13 00:07:02 +00:00
Victor Dubiniuk
c4fcd1f282
Update tests for phunit 5.5 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2016-10-13 01:06:45 +02:00
Victor Dubiniuk
011d5f554c
Harden empty 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2016-10-13 00:53:34 +02:00
Arthur Schiwon
9e817e9e0b
symfony replaced table helper by class, fixes two broken LDAP occ commands 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2016-10-12 23:47:07 +02:00
Arthur Schiwon
1bcd2ca8e3
emit pre-update event for comments 
* notifications can be cleaned up, no polluted DB
* updating comments will re-notify users or remove notifications, depending on the message

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2016-10-12 18:06:22 +02:00
Robin Appelman
2de59d8a2a
remove unneeded unlock 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2016-10-12 16:12:40 +02:00
Robin Appelman
ab10a54836
remove duplicate trait 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2016-10-12 16:12:38 +02:00
Robin Appelman
f63f0aa1ae
get node by path as fallback 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2016-10-12 16:12:37 +02:00
Robin Appelman
9754724c8b
fix getting recipient share in ocs api 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2016-10-12 16:12:37 +02:00
Robin Appelman
7d1e800c15
fix share tests not passing path 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2016-10-12 16:12:36 +02:00
Robin Appelman
1b3b816a0a
re-use the share node while formating if we already have it 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2016-10-12 16:12:35 +02:00
Robin Appelman
3845d4ec9a
more robust test setup 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2016-10-12 16:12:34 +02:00
Robin Appelman
7ce68ce6ac
phpunit is weird 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2016-10-12 16:12:34 +02:00
Robin Appelman
37eded7e7c
Always unlock node after trying to create a share 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2016-10-12 16:12:29 +02:00
Roeland Jago Douma
b2d68c0009 Merge pull request #1713 from nextcloud/rebase_1493 
fix issue #1482 - mail invites through v1 webdav
 2016-10-12 10:24:44 +02:00
Claudemir Todo Bom
5b7f272fd4
fix issue #1482 - mail invites through v1 webdav 
Signed-off-by: Claudemir Todo Bom <claudemir@todobom.com>
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2016-10-12 09:13:55 +02:00
Roeland Jago Douma
0c574569a4
Readd Notify command 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2016-10-12 08:04:49 +02:00
Thomas Müller
8628d57b2c
Move console command registration to info.xml for encryption as well as files_external 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2016-10-12 08:04:15 +02:00
Nextcloud bot
c2be9cb605
[tx-robot] updated from transifex 2016-10-12 00:08:16 +00:00
Thomas Müller
c5ca71ee82
[9.2] Register commands in info.xml (#26248) 
* Use DI to load console commands from the apps - class name to be defined in the info.xml

* Load commands from info.xml

* Fix unit test

* Allow Di magic for IMountManager

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2016-10-11 19:48:26 +02:00
Morris Jobke
675230f86d Merge pull request #1407 from nextcloud/multiline_comments 
Bring back multiline comments
 2016-10-11 16:17:51 +02:00
skjnldsv
1930aa3102
Fix bold no results search text 
Fix wording
 2016-10-11 15:06:25 +02:00
skjnldsv
dcddd4b9d5 fix textarea submit 2016-10-11 12:33:20 +02:00
Nextcloud bot
cc4b51490e
[tx-robot] updated from transifex 2016-10-11 00:06:54 +00:00
Roeland Jago Douma
ada4d6cafc Merge pull request #1680 from nextcloud/downstream-26308 
Remove PNG fallbacks from files app
 2016-10-10 22:09:48 +02:00
Lukas Reschke
d99ab1b038 Merge pull request #1675 from nextcloud/remove-unneeded-variable 
remove unneeded variable & proper element creation
 2016-10-10 20:28:30 +02:00
Morris Jobke
0497affc46
fix drag and drop icon for files app 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2016-10-10 15:09:15 +02:00
Vincent Petry
db472b20cc
Remove PNG fallbacks from files app (#26308) 2016-10-10 15:08:40 +02:00
Morris Jobke
5158328190
remove unneeded variable & proper element creation 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2016-10-10 14:06:43 +02:00
Roeland Jago Douma
7d2f70ef72
Use more IConfig and add unit tests 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2016-10-10 10:51:13 +02:00
Roeland Jago Douma
bdf4bf4669
DI IConfig into ldap helper 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2016-10-10 10:18:18 +02:00
Roeland Jago Douma
1ba2b7e5d4
Do not query data that is already in the appconfig 
This is already available. We better use a simple regex.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2016-10-10 09:39:20 +02:00
Nextcloud bot
3f40bb69f8
[tx-robot] updated from transifex 2016-10-10 00:06:58 +00:00
Nextcloud bot
9fc3209d2c
[tx-robot] updated from transifex 2016-10-09 00:06:49 +00:00
Nextcloud bot
0beecbf2c5
[tx-robot] updated from transifex 2016-10-08 00:06:50 +00:00
Arthur Schiwon
a9671a4dc2
adjust wording of the notification 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2016-10-08 01:17:51 +02:00
Arthur Schiwon
a35d4e7b44
remove notifications of deleted comments from the DB 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2016-10-08 01:10:49 +02:00
Arthur Schiwon
006da9afd7
use different files route/controller 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2016-10-07 17:27:33 +02:00
Arthur Schiwon
e1073cf442
Notificacations for simple @-mentioning in comments 
(WIP) notify user when mentioned in comments

Fix doc, and create absolute URL for as notification link.

PSR-4 compatibility changes

also move notification creation to comments app

Do not notify yourself

unit test for controller and application

smaller fixes

- translatable app name
- remove doubles in mention array
- micro perf optimization
- display name: special label for deleted users, keep user id for users that could not be fetched from userManager

Comment Notification-Listener Unit Test

fix email adresses

remove notification when triggering comment was deleted

add and adjust tests

add missing @license tags

simplify NotificationsController registration

appinfo simplification, php docs

make string easier to translate

adjust test

replace dispatcher-based listeners with a registration method and interface

safer to not pass optional data parameter to setSubject for marking as processed. ID and mention suffices

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>

update comment

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2016-10-07 17:11:19 +02:00
Morris Jobke
7264d20152 Merge pull request #1643 from nextcloud/ldap_more_caching 
cache loginName2UserName and cover the method with unit tests
 2016-10-07 09:38:53 +02:00
Nextcloud bot
838e258b44
[tx-robot] updated from transifex 2016-10-07 00:07:04 +00:00
Arthur Schiwon
a30341823e
cache loginName2UserName and cover the method with unit tests 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2016-10-07 01:39:57 +02:00
Morris Jobke
6278d3bbfd Merge pull request #1144 from nextcloud/translate-default-calendar 
translate default calendar & default address book displaynames & add …
 2016-10-06 23:00:26 +02:00
Arthur Schiwon
979612fa08
get rid of test warnings 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2016-10-06 22:53:14 +02:00
Morris Jobke
55e72caf9b Merge pull request #1616 from nextcloud/downstream_ldap_6 
Prevent user with empty uid
 2016-10-06 14:43:25 +02:00
Morris Jobke
70e0074e5c
Add transifex config 2016-10-06 14:20:02 +02:00
Joas Schilling
7dd952d5a2
Fix unit tests 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2016-10-06 14:20:02 +02:00
Joas Schilling
ce964f0a10
Translate the Contacts addressbook when it's default 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2016-10-06 14:20:01 +02:00
Joas Schilling
a4f82f13f3
Translate the personal calendar 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2016-10-06 14:19:58 +02:00
Morris Jobke
0a092e94c7 Merge pull request #1636 from nextcloud/downstream-26203-fix-synjob-class-name 
Fix SyncJob class name in info.xml
 2016-10-06 12:45:54 +02:00
Joas Schilling
82c29e1204
Log the error with display name 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2016-10-06 11:21:43 +02:00
Joas Schilling
f6e8da186d Merge pull request #1525 from nextcloud/newdav-tagsplugin 
Newdav tagsplugin
 2016-10-06 11:13:48 +02:00
Joas Schilling
1a26e7a8e7
Fix SyncJob class name in info.xml 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2016-10-06 10:55:28 +02:00
Morris Jobke
ff3e8c2139 Merge pull request #1518 from nextcloud/dav-fileshome-directory-properties 
FilesHome now also returns DAV properties
 2016-10-06 00:21:44 +02:00
Morris Jobke
fe2116ecf7 Merge pull request #1519 from nextcloud/better-comments-in-activity-sidebar 
Better comments in activity sidebar
 2016-10-05 23:56:10 +02:00
Lukas Reschke
f2b1a1781c Merge pull request #1568 from nextcloud/test-running-coverage-also-for-db 
[Test] Generate coverage for DB group
 2016-10-05 14:37:25 +02:00
Joas Schilling
43265befac
Update file header 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2016-10-05 14:33:54 +02:00
Vincent Petry
dba72a48cd
Fix activity rendering plugin name 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2016-10-05 14:21:26 +02:00
Joas Schilling
ed70d4a2dc
Mark the methods as copied 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2016-10-05 14:21:26 +02:00
Joas Schilling
bd0c9489f6
Make sure the CSS rules apply to the activityTabView as well 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2016-10-05 14:21:25 +02:00
Joas Schilling
724cd50e52
Register a ActivityTabView plugin 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2016-10-05 14:21:25 +02:00
Joas Schilling
fe6c9f7f47
Remove resolved FIXME 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2016-10-05 14:21:25 +02:00
Joas Schilling
b8cf2fb58b
Do not shorten comments in the activity sidebar 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2016-10-05 14:21:22 +02:00
Morris Jobke
088dd716a3 Merge pull request #1418 from nextcloud/add-move-rename-support 
Add support for translations of move/rename activities
 2016-10-05 14:02:35 +02:00
Lukas Reschke
a1f5364d7f
Generate coverage for quick DB tests 
This adds the "QUICKDB" group which excludes some tests that abuse unit tests as integration tests as displayed in https://github.com/nextcloud/server/issues/1626

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2016-10-05 13:55:44 +02:00
Joas Schilling
671f16f706
Add icons to activity navigation 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2016-10-05 11:38:06 +02:00
Joas Schilling
de81c52c80
Add support for translations of move/rename activities 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2016-10-05 10:06:59 +02:00
Vincent Petry
5d25563634
New dav endpoint register tags plugin 
This makes it possible to retrieve and PROPPATCH the favorite info

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2016-10-05 08:19:41 +02:00
Nextcloud bot
66ae43880b
[tx-robot] updated from transifex 2016-10-05 00:06:57 +00:00
Morris Jobke
7c20aa2d72 Merge pull request #1617 from nextcloud/issue-1605-update-notification-readable-version 
Update notification readable version (10.0.1 instead of 9.1.1.5)
 2016-10-04 17:12:10 +02:00
Roeland Jago Douma
c83b3e6bd5
Fix js test 2016-10-04 13:07:44 +02:00
Roeland Jago Douma
5ca50d9f31
Add autosize to comments input 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2016-10-04 13:04:56 +02:00
Joas Schilling
db57190e33
Use new URL schema 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2016-10-04 12:49:55 +02:00
Joas Schilling
b74c12c3f5
Use the readable version for notifications 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2016-10-04 12:49:27 +02:00
Jörn Friedrich Dreyer
0ae9a2c9fe
Prevent user with empty uid 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2016-10-04 12:26:06 +02:00
Joas Schilling
3a0e06147c Merge pull request #1613 from nextcloud/2fa-backup-codes-psr4 
Do not use underscores in PSR4 namespaces of the backup codes app
 2016-10-04 10:37:36 +02:00
Nextcloud bot
14d226dc33
[tx-robot] updated from transifex 2016-10-04 00:06:56 +00:00
Christoph Wurst
f27b7fa8d1
Do not use underscores in PSR4 namespaces of the backup codes app 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2016-10-03 21:47:33 +02:00
Morris Jobke
62d5daa94f Merge pull request #1590 from nextcloud/issue-1432-special-chars-on-name-conflict 
Fix special characters when renaming to a conflict
 2016-10-03 16:47:20 +02:00
Lukas Reschke
08b0e5c112 Merge pull request #607 from nextcloud/sharing-popover-menu 
Move sharing options into popover menu
 2016-10-03 14:18:17 +02:00
Christoph Wurst
407232b772 Merge pull request #1547 from nextcloud/files-translate-filesummary 
Translate file summary connector (#26221)
 2016-10-03 10:41:20 +02:00
Christoph Wurst
96af627bb7
fix sharing icon's alignment and add padding to the unshare icon 2016-10-03 09:35:54 +02:00
Nextcloud bot
07a1be2e06
[tx-robot] updated from transifex 2016-10-03 00:12:47 +00:00
Nextcloud bot
6297d201df
[tx-robot] updated from transifex 2016-10-02 00:16:25 +00:00
Nextcloud bot
da03018add
[tx-robot] updated from transifex 2016-10-01 00:08:23 +00:00
Joas Schilling
0ecaf8e602
Fix special characters when renaming to a conflict 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2016-09-30 12:44:49 +02:00
Nextcloud bot
99076a8c0d
[tx-robot] updated from transifex 2016-09-30 00:08:13 +00:00
Olivier Mehani
60cab0d73e Unset user PHOTO before setting new one in OCA\DAV\CardDAV\Converter::updateCard (#26243) 
Signed-off-by: Olivier Mehani <shtrom@ssji.net>

#26242
 2016-09-29 17:09:24 +02:00
Lukas Reschke
8a14f4a899 Merge pull request #1567 from nextcloud/inject-http-service 
Inject IHTTPClientService
 2016-09-29 11:56:07 +02:00
Nextcloud bot
4b873b35b7
[tx-robot] updated from transifex 2016-09-29 00:07:08 +00:00
Lukas Reschke
498b7399c1
Inject IHTTPClientService 
Otherwise the unit test execution will do a ton of external HTTP requests which fail and then timeout…

See https://blackfire.io/profiles/compare/3c67acfa-a11e-4aec-bcd4-c945b006f01e/graph for reference

Pretty similar to https://github.com/nextcloud/server/pull/1565

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2016-09-29 00:26:20 +02:00
Lukas Reschke
bd70221d61
Mock HTTPClientService 
These tests were not using any kind of mocks at all! This made the test execution time took 2 minutes instead of now less than 1 second… (because multiple HTTP requests were queued and timed-out then…)

See https://blackfire.io/profiles/compare/6d2611f2-ad08-47b6-973b-2b5f9c8b96d2/graph for reference

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2016-09-29 00:06:56 +02:00
Lukas Reschke
2eab2ffa22 Merge pull request #1553 from nextcloud/fix-comment-count-translation 
Fix comment count tooltip
 2016-09-28 23:17:05 +02:00