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

14994 commits

Author SHA1 Message Date
Joas Schilling
ad10c5c4b4
Deduplicate the provider code 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2016-11-30 11:39:38 +01:00
Joas Schilling
de1cb1ec32
Add unit tests for ISetting instances 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2016-11-30 10:52:16 +01:00
Joas Schilling
56f45e4960
Add tests for the filters 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2016-11-30 10:47:55 +01:00
Joas Schilling
4c0263b78a
Move event and todo parsing to new API 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2016-11-29 16:27:12 +01:00
Joas Schilling
8d87e39146
Deduplicate icon assignment 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2016-11-29 16:08:58 +01:00
Joas Schilling
ddc82b4ca2
Move calendar activity parsing to new API 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2016-11-29 15:47:43 +01:00
Joas Schilling
a16fd3991a
Move CalDAV activity settings to new API 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2016-11-29 15:06:54 +01:00
Joas Schilling
253a75e5ae
Move CalDAV activity filters to new API 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2016-11-29 15:04:08 +01:00
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