Commit Graph

14475 Commits

Author SHA1 Message Date
Nextcloud bot 14d226dc33
[tx-robot] updated from transifex 2016-10-04 00:06:56 +00: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
Lukas Reschke 0f321fe116 Merge pull request #1534 from nextcloud/svg-optimization
Svgo optimization
2016-09-28 23:05:48 +02:00
Morris Jobke 85301df817 Merge pull request #1513 from nextcloud/fix-etag-on-move
Return ETag and OC-ETag in case of a move (#25683)
2016-09-28 21:46:51 +02:00
Morris Jobke ef0760f84f Merge pull request #1545 from nextcloud/delete-calendars-with-their-users
Delete calendars with their users
2016-09-28 21:42:55 +02:00
Thomas Müller bd96c6aa38
Return ETag and OC-ETag in case of a move (#25683)
Downstreaming of https://github.com/owncloud/core/pull/25683

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-09-28 21:12:50 +02:00
Morris Jobke f4eee1d3a5 Merge pull request #1512 from nextcloud/share-alttext
Display "Share" alt text for share action icon (#26158)
2016-09-28 20:44:15 +02:00
Thomas Citharel 6c8bcb38f1
Rename deleteAllSharesForUser() to deleteAllSharesByUser()
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2016-09-28 15:32:03 +02:00
Lukas Reschke 1602e82363
UpdateState is empty if no update is available
This leads to log messages such as "Undefined index: updaterEnabled at /media/psf/nextcloud/apps/updatenotification/lib/Controller/AdminController.php#116".

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-09-28 12:37:08 +02:00
Joas Schilling c9c64141ee
Fix comment count tooltip
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-09-28 10:54:37 +02:00
Julius Härtl f219ed2e99 Merge pull request #1535 from nextcloud/files-loading-css-fix
Use css loading animation and not gif
2016-09-28 10:38:46 +02:00
Nextcloud bot e2670e62eb
[tx-robot] updated from transifex 2016-09-28 00:10:20 +00:00
Lukas Reschke 479c427f2a
Add IL10N to unit test
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-09-27 21:12:37 +02:00
John Molakvoæ f623d020f7 Use css loading animation and not gif
Signed-off-by: John Molakvoæ <fremulon@protonmail.com>
2016-09-27 21:06:25 +02:00
skjnldsv 71830b285c Svgo optimization
Signed-off-by: John Molakvoæ <fremulon@protonmail.com>
2016-09-27 20:56:26 +02:00
Lukas Reschke 2f488ce373 Merge pull request #1459 from nextcloud/upstream-fix_trashbin_deleteallhooks_solution2
[Upstream] fix trashbin deleteallhooks solution2
2016-09-27 18:52:14 +02:00
Lukas Reschke 06e969cb74 Merge pull request #1197 from nextcloud/oc-public-sharing
CalDAV calendar public sharing
2016-09-27 18:51:40 +02:00
Vincent Petry 7de4c809ef
Translate file summary connector (#26221)
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-09-27 18:38:56 +02:00
Thomas Citharel da1543eef7
fix deletion of calendars
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-09-27 18:33:56 +02:00
Thomas Citharel 5215833fe4
delete shares to an user
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-09-27 18:30:19 +02:00
Thomas Müller 97a47f49a1
Adjust delete logic and ann unit tests
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-09-27 18:30:10 +02:00
Thomas Citharel 18c07f0692
delete also addressbooks on user deletion
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-09-27 18:30:02 +02:00
Thomas Citharel 7db01ff805
delete calendars when users are deleted
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-09-27 18:29:53 +02:00
Björn Schießle 6ca8ce6228 Merge pull request #1543 from nextcloud/increase-component-length
Increase the max length for components
2016-09-27 18:01:45 +02:00
Joas Schilling a7315e98ff
Increase the max length for components
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-09-27 17:03:57 +02:00
Joas Schilling 3e00554d35
Respect updater kill switch and fall back to download button
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-09-27 14:47:59 +02:00
Nextcloud bot 810f72df46
[tx-robot] updated from transifex 2016-09-27 00:09:46 +00:00
Lukas Reschke a43c680d9f Merge pull request #1499 from nextcloud/updater
Add repair step and revert "Open updater" button
2016-09-26 22:28:21 +02:00
Morris Jobke 6b2920a6bc Merge pull request #1520 from nextcloud/upload-allow-zero
Allow uploading empty files (#26113)
2016-09-26 17:40:53 +02:00
Morris Jobke 3e4a4cab34 Merge pull request #1510 from nextcloud/workflow-fix-handlebar-update
Fix selection of workflowengine rules and operators
2016-09-26 17:33:22 +02:00
Joas Schilling fc65093694 Merge pull request #1460 from nextcloud/fed-share-retry
[upstream] Fix fed share test call to return proper result
2016-09-26 13:59:28 +02:00
Morris Jobke 4064010c29
Revert "Fix tests"
This reverts commit 27a3c68d84.

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2016-09-26 13:44:50 +02:00
Lukas Reschke 4f4286932f Merge pull request #1457 from nextcloud/upstream-fix-birthday-calendar-component
[Upstream] fix birthday calendar component
2016-09-26 13:21:08 +02:00
Lukas Reschke 0873fe4284 Merge pull request #1524 from nextcloud/addScript
use correct case for addScript (#26214)
2016-09-26 13:18:41 +02:00
Lukas Reschke 0c6957dfb7 Merge pull request #1406 from nextcloud/fix-folder-drop-in-firefox
Fix folder drag glitch in Firefox
2016-09-26 13:10:19 +02:00
Thomas Citharel dcc23114e9
fix annotations & copyright headers 2016-09-26 11:55:43 +02:00