Commit Graph

15037 Commits

Author SHA1 Message Date
Nextcloud bot e8ea9a5d27
[tx-robot] updated from transifex 2016-11-29 01:06:47 +00:00
Roeland Jago Douma 8a9343a709 Merge pull request #2383 from nextcloud/add-icon-for-remote-share-notifications
Add an icon to the federated sharing notification
2016-11-28 21:00:27 +01:00
blizzz cd9d1f589f Merge pull request #2237 from nextcloud/rich-strings-and-icons-for-mention-notifications
Rich strings and icons for mention notifications
2016-11-28 18:13:54 +01:00
Joas Schilling b31d621840
Add an icon to the federated sharing notification
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-11-28 17:23:42 +01:00
Morris Jobke 587f28ad42 Merge pull request #2378 from nextcloud/fix-preview-image_src
Fix image_src link
2016-11-28 17:03:25 +01:00
Lukas Reschke 9def8225c0
Fix image_src link
The link in the image_src link (used for previews on Social Media such as Facebook) was still using the old route. This changes it to use the new route.

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-11-28 16:20:57 +01:00
Morris Jobke a12d2e67e7 Merge pull request #2335 from nextcloud/grouping-for-activities
Bring back grouping for activities
2016-11-28 16:18:02 +01:00
Bjoern Schiessle e5c31b72e1
bring back permissions for mail shares
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2016-11-28 11:24:05 +01:00
Björn Schießle 46b4891bd7 Merge pull request #2312 from nextcloud/move-sharebymail-to-new-api
Move ShareByMail activities to new API
2016-11-28 11:09:47 +01:00
Nextcloud bot ca7b9e5490
[tx-robot] updated from transifex 2016-11-28 09:51:57 +00:00
Nextcloud bot 4e682d4113
[tx-robot] updated from transifex 2016-11-28 01:06:56 +00:00
Joas Schilling 7e6f829d54 Merge pull request #2343 from nextcloud/fix-exteranl-storage-redirect
[Minor] Fix link to external storage settings on error notification
2016-11-27 09:02:26 +01:00
Nextcloud bot 9788cf04ee
[tx-robot] updated from transifex 2016-11-27 01:07:08 +00:00
Felix A. Epp c911a876bf Fix link to external storage settings on error notification
Signed-off-by: Felix A. Epp <work@felixepp.de>
2016-11-26 10:15:42 +01:00
Nextcloud bot 8f4ec8583d
[tx-robot] updated from transifex 2016-11-26 01:06:57 +00: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
Joas Schilling f067d0ee66
Correctly match the subjects to the parameters
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-11-25 11:45:40 +01:00
Joas Schilling 9f915e061c
Remove old test
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-11-25 11:17:40 +01:00
Joas Schilling 719b1905d7
Get user name from contacts if available
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-11-25 11:17:06 +01:00
Roeland Jago Douma 72f9920a58
Add Identityproof tests
* Add tests for Key
* Add tests for Manager
* Add tests for Signer
* Removed URLGenerator from Signer

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-11-24 21:50:19 +01:00
Morris Jobke 8f14ffd734 Merge pull request #2306 from nextcloud/dont-log-user-password
Don't log the user password in case something goes wrong
2016-11-24 17:08:25 +01:00
Joas Schilling 5c2ec58440
Move ShareByMail activities to new API
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-11-24 16:15:51 +01:00
Jan-Christoph Borchardt e75dede590 fix some outdated naming
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2016-11-24 16:05:05 +01:00
Joas Schilling df0eeb8089
Don't log the user password in case something goes wrong
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-11-24 13:58:03 +01:00
Lukas Reschke f4cf125a4a Merge pull request #2296 from nextcloud/nitpicking-on-federation-admin-section
Fix some language issues in the federation admin panel
2016-11-24 10:13:57 +01:00
Joas Schilling fbd574cc82
Fix some language issues in the federation admin panel
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-11-24 09:34:06 +01:00
Joas Schilling 1c564fd554 Fix placeholder typo in public link activity
https://www.transifex.com/nextcloud/nextcloud/translate/#152/files_sharing/101548786/
2016-11-23 21:43:14 +01:00
Lukas Reschke 4c5e7d270a
Add tests
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-11-23 19:58:43 +01:00
root 861c8572c0
restore ldap_password_pr
Signed-off-by: Roger Szabo <roger.szabo@web.de>

remove notification part

Signed-off-by: Roger Szabo <roger.szabo@web.de>

blizzz comments

Signed-off-by: Roger Szabo <roger.szabo@web.de>

morris comment

Signed-off-by: Roger Szabo <roger.szabo@web.de>

improved error message for changing password

Signed-off-by: Roger Szabo <roger.szabo@web.de>

blizz comments 20161013

Signed-off-by: Roger Szabo <roger.szabo@web.de>

Signed-off-by: Roger Szabo <roger.szabo@web.de>

Adjust HintException usage

Signed-off-by: Roger Szabo <roger.szabo@web.de>

Signed-off-by: Roger Szabo <roger.szabo@web.de>
2016-11-23 19:02:48 +01:00
Morris Jobke 59db9fada2 Merge pull request #2281 from nextcloud/fix-translation
Fix language typo
2016-11-23 17:53:21 +01:00
Lukas Reschke 5473475fa7 Merge pull request #2232 from nextcloud/imagescale-fix
Workaround for PHP bug when calling imagescale
2016-11-23 17:45:59 +01:00
Joas Schilling 14f01dbe33
Fix language typo
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-11-23 16:55:49 +01:00
Lukas Reschke 6d92550772 Merge pull request #2278 from nextcloud/filelist-share-visible
make the share icon in the filelist visible again
2016-11-23 16:40:10 +01:00
Morris Jobke 6281607d7a
improved style of shared entry
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2016-11-23 15:25:48 +01:00
Lukas Reschke aa30c4cd80 Merge pull request #2240 from nextcloud/daita-encryption-init_on_master_key
init Session/privateKeys on Master Key
2016-11-23 15:19:24 +01:00
Morris Jobke 25f519c855 Merge pull request #2266 from nextcloud/avatar_image
VCARDS don't hold binary data
2016-11-23 14:49:32 +01:00
Robin Appelman 3bb3296c53
make the share icon in the filelist visible again
Signed-off-by: Robin Appelman <robin@icewind.nl>
2016-11-23 14:44:53 +01:00
Lukas Reschke 2eca9cc384 Merge pull request #2262 from nextcloud/specify-parameters-on-public-download
Specify the parameters on public download
2016-11-23 14:02:38 +01:00
Roeland Jago Douma e9f98fd5a9
VCARDS don't hold binary data
* We need to base64 encode the avatar!
* Switched to vcard v4
* User proper data uri

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-11-23 13:30:32 +01:00
Bjoern Schiessle 8a401ee156
check if session is initialized
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2016-11-23 12:20:43 +01:00
Lukas Reschke f692ea34f1 Merge pull request #2263 from nextcloud/remove91_migration
Remove migration steps in app dav
2016-11-23 12:18:06 +01:00
Joas Schilling d2489ebee4
Adjust tests
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-11-23 11:31:35 +01:00
Joas Schilling bfecdd4422
Use the comment icon for the notifications
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-11-23 11:19:44 +01:00
Joas Schilling 56cfd0a6e4
Set the rich object string for comment notifications
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-11-23 11:19:41 +01:00
Joas Schilling a36d26950e
Only do stuff when its a remote-share activity
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-11-22 22:46:18 +01:00
Thomas Müller 181af830fd
Remove 9.1 migration steps in app dav (#25654) 2016-11-22 20:17:05 +01:00
Joas Schilling e9336dddd5
Specify the parameters on public download
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-11-22 20:14:42 +01:00
Lukas Reschke f4470b6861 Merge pull request #2246 from nextcloud/display-name-for-files-and-tagging-activities-again
Use the display name for files activities again
2016-11-22 18:25:52 +01:00
Lukas Reschke 717fd9fdd6 Merge pull request #2229 from nextcloud/select2-fix-bis
Select2 fix bis
2016-11-22 17:50:53 +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
Maxence Lange 558a934842 init Session/privateKeys on Master Key
I can't find another way to init the session ...
2016-11-22 13:19:42 -01:00
Roeland Jago Douma 9619f49ba4
Fix undefined systemtags stuff
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-11-22 14:59:51 +01:00
Julius Haertl 6c4664bc82
Workaround for PHP bug when calling imagescale
Signed-off-by: Julius Haertl <jus@bitgrid.net>
2016-11-22 12:12:59 +01:00
Joas Schilling b8732a1a53 Merge pull request #2179 from nextcloud/update-systemtags-to-new-activity-api
Update systemtags activity to new API
2016-11-22 11:05:06 +01:00
John Molakvoæ 6bcb6e08be
Fix systemtagsfilelist unwanted margin and clean aera a bit
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2016-11-22 10:49:24 +01:00
Roeland Jago Douma 08ef7356f6 Merge pull request #2165 from nextcloud/sharing-activities-update
Move file sharing activities to the new API
2016-11-22 10:19:15 +01:00
Morris Jobke a02d0975dd Merge pull request #2154 from nextcloud/comments-activities-update
Move comments activities to the new API
2016-11-22 09:56:22 +01:00
Nextcloud bot b0cf78aa1e
[tx-robot] updated from transifex 2016-11-22 01:06:54 +00:00
Lukas Reschke d0c3c5cee3 Merge pull request #2225 from nextcloud/fix_caldav_proppatch_requests
fix PropPatch requests on calendars
2016-11-21 22:54:17 +01:00
Georg Ehrke 3a8c4230be
fix PropPatch requests on calendars
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2016-11-21 22:10:51 +01:00
Lukas Reschke ccf3e4255a
Remove debug code
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-11-21 11:30:02 +01:00
Lukas Reschke 7b3855a375
Add config switch
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-11-21 11:30:02 +01:00
Lukas Reschke c49b0d3834
Remove unused variable
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-11-21 11:30:01 +01:00
Lukas Reschke dac980115f
Add retry job
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-11-21 11:30:01 +01:00
Roeland Jago Douma 15c075eba8
Fix lookup url
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-11-21 11:30:01 +01:00
Roeland Jago Douma c20c7f31da
Push json to the lookupserver
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-11-21 11:30:01 +01:00
Roeland Jago Douma f7f70028d1
Search on lookup server
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-11-21 11:30:00 +01:00
Lukas Reschke fb91bf6a5b
Add a signer class for signing
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-11-21 11:30:00 +01:00
Bjoern Schiessle 069023416c
lookup server connector
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2016-11-21 11:29:59 +01:00
Bjoern Schiessle b23a4ca96b
push public user data to the lookup server
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2016-11-21 11:29:59 +01:00
Bjoern Schiessle 3a880879ce
update unit tests
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2016-11-21 11:29:59 +01:00
Bjoern Schiessle 8f33d9d1c0
update system address book if the user change the personal settings
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2016-11-21 11:29:57 +01:00
John Molakvoæ (skjnldsv) b75ef0f8b3
Fix popover layout fix for files and global
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2016-11-21 11:29:57 +01:00
Nextcloud bot ba9b17c906
[tx-robot] updated from transifex 2016-11-21 01:06:58 +00:00
Nextcloud bot 97af4f762d
[tx-robot] updated from transifex 2016-11-20 01:06:44 +00:00
Nextcloud bot b1ee9862f8
[tx-robot] updated from transifex 2016-11-19 01:06:44 +00:00
Joas Schilling 041dd937cf
Update test
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-11-18 16:51:50 +01:00
Morris Jobke 332eaec4c0 Merge pull request #1447 from nextcloud/password-confirmation-for-some-actions
Password confirmation for some actions
2016-11-18 15:42:30 +01:00
Morris Jobke faee255ff4 Merge pull request #840 from nextcloud/theming-icon-endpoint
Add dynamic icon creation
2016-11-18 15:35:34 +01:00
Morris Jobke e8511660f0 Merge pull request #2109 from nextcloud/oc_26533
Transfer ownership only analyze home storage
2016-11-18 15:32:28 +01:00
Robin Appelman 8b9ad46ba3 Merge pull request #768 from nextcloud/s3-objectstore
Add S3 objectstore backend
2016-11-18 14:55:07 +01:00
Lukas Reschke 6c11c54434 Merge pull request #2196 from nextcloud/cache-owner-displayname
cache the displayname of the share owner
2016-11-18 13:51:24 +01:00
Morris Jobke 310d60b585 Merge pull request #2064 from nextcloud/oc-26189
[downstream] Add submit button to validate the federated server,
2016-11-18 12:12:53 +01:00
Joas Schilling b2d9c20aac
Fix unit tests
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-11-18 12:10:51 +01:00
Joas Schilling 410e0fc28f
Require password confirmation when changing workflow rules
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-11-18 12:10:50 +01:00
Joas Schilling 86aa6197b8
Require confirmation when generating backup codes
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-11-18 11:57:16 +01:00
Morris Jobke 0e699c4d14 Merge pull request #2116 from nextcloud/downstream-26511
Display changes in file versions tab view and detailsView
2016-11-18 11:37:29 +01:00
Morris Jobke ccdf387041 Merge pull request #2184 from nextcloud/share-join-cache
Get the share root info directly when querying for shares
2016-11-18 11:33:33 +01:00
Robin Appelman dbd7f6dea6
cache the displayname of the share owner
Signed-off-by: Robin Appelman <robin@icewind.nl>
2016-11-18 11:26:00 +01:00
Julius Haertl 2ab4d1e0a3
Use IAppManager instead of OC_App
Signed-off-by: Julius Haertl <jus@bitgrid.net>
2016-11-18 11:07:44 +01:00
Julius Haertl d409fe1c52
Error handling and tests if file was not found
Signed-off-by: Julius Haertl <jus@bitgrid.net>
2016-11-18 10:23:25 +01:00
Julius Haertl 78de213b85
Sanitize input and small fixes
Signed-off-by: Julius Haertl <jus@bitgrid.net>
2016-11-18 10:23:25 +01:00
Julius Haertl 3a400f92d1
Replace null return with NotFoundException
Signed-off-by: Julius Haertl <jus@bitgrid.net>
2016-11-18 10:23:25 +01:00
Julius Haertl cc8b1d3829
Fix icon-folder css
Signed-off-by: Julius Haertl <jus@bitgrid.net>
2016-11-18 10:23:24 +01:00
Julius Haertl 43097eabee
Fix svg resizing and remove deprecated method call
Signed-off-by: Julius Haertl <jus@bitgrid.net>
2016-11-18 10:23:24 +01:00
Julius Haertl 2e8dd21815
Improve caching
Signed-off-by: Julius Haertl <jus@bitgrid.net>
2016-11-18 10:23:24 +01:00
Julius Haertl 492d0b9f9b
Caching for icon files using AppData
Signed-off-by: Julius Haertl <jus@bitgrid.net>
2016-11-18 10:23:24 +01:00
Julius Haertl 9e28a3ba12
Theming: Code cleanup and cache buster for mime icons
Signed-off-by: Julius Haertl <jus@bitgrid.net>
2016-11-18 10:23:24 +01:00