e4bf23ce7b
[tx-robot] updated from transifex
2017-12-11 01:10:34 +00:00
0ff717c600
[tx-robot] updated from transifex
2017-12-10 01:10:38 +00:00
0c272f2121
[tx-robot] updated from transifex
2017-12-09 01:10:36 +00:00
ac29608db6
Merge pull request #7409 from nextcloud/swift-retry-12
...
[12]add retry wrapper when reading files from swift
2017-12-08 09:26:41 +01:00
c9318ddd1b
Merge pull request #7407 from nextcloud/12_7348
...
[stable12] Check if owner of share exists
2017-12-08 09:22:07 +01:00
5dd15c4a7d
Merge pull request #7323 from nextcloud/shared-jailed-source-root-12
...
[12]Use the correct root for shared jail when the source storage is also a jail
2017-12-08 09:03:03 +01:00
53fa7fb3c6
[tx-robot] updated from transifex
2017-12-08 01:10:26 +00:00
8d89ec3c30
[tx-robot] updated from transifex
2017-12-07 01:10:49 +00:00
0519ca5893
add retry wrapper when reading files from swift
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-12-06 15:43:00 +01:00
aedc59c636
Fix tests
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-12-06 09:15:49 +01:00
7e6dd02441
A failed storage is a not available storage
...
We have to double check. Since getting the info of the root returns a
generic entry. But actually the stroage is not available. Else we get
very weird sync and web behavior.
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-12-06 09:15:43 +01:00
f3b9b213eb
[tx-robot] updated from transifex
2017-12-06 01:10:37 +00:00
e04dd40516
[tx-robot] updated from transifex
2017-12-05 01:10:33 +00:00
4144580167
delay calculating the shared cache root until it's used
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-12-04 15:18:23 +01:00
b1b02d3b3a
Merge pull request #7322 from nextcloud/12-6303
...
[stable12] Set primary action button color to same as theming color
2017-12-04 11:12:51 +01:00
8054f862a3
[tx-robot] updated from transifex
2017-12-04 01:10:42 +00:00
e87c35837f
[tx-robot] updated from transifex
2017-12-03 01:10:35 +00:00
26f8c3adfa
[tx-robot] updated from transifex
2017-12-02 01:10:44 +00:00
3ee749d37f
[tx-robot] updated from transifex
2017-12-01 01:10:32 +00:00
8656462edb
[tx-robot] updated from transifex
2017-11-30 01:13:31 +00:00
0ba10fa5f9
[tx-robot] updated from transifex
2017-11-29 01:10:26 +00:00
6d8de960c9
Use the correct root for shared jail when the source storage is also a jail
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-11-28 13:55:42 +01:00
1a18b48037
Set primary action button color to same as theming color
...
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2017-11-28 13:50:57 +01:00
036eae6956
[tx-robot] updated from transifex
2017-11-28 01:10:05 +00:00
298b0d67d8
[tx-robot] updated from transifex
2017-11-27 01:10:03 +00:00
a6b3fcae8f
[tx-robot] updated from transifex
2017-11-25 01:10:10 +00:00
e94ba32255
[tx-robot] updated from transifex
2017-11-24 01:10:06 +00:00
fd46475f6e
[tx-robot] updated from transifex
2017-11-23 01:09:59 +00:00
6b189ba1ee
[tx-robot] updated from transifex
2017-11-21 01:10:20 +00:00
9583910104
[tx-robot] updated from transifex
2017-11-20 01:09:53 +00:00
54dcd70dae
[tx-robot] updated from transifex
2017-11-19 01:10:04 +00:00
ccf4f87441
[tx-robot] updated from transifex
2017-11-18 01:10:56 +00:00
9942c39e64
[tx-robot] updated from transifex
2017-11-17 01:10:03 +00:00
fec4e3947e
[tx-robot] updated from transifex
2017-11-16 01:10:03 +00:00
2d8d248d28
[tx-robot] updated from transifex
2017-11-15 01:10:00 +00:00
82e4d9b9cc
[tx-robot] updated from transifex
2017-11-14 01:09:59 +00:00
b1ac0b6198
[tx-robot] updated from transifex
2017-11-13 01:10:31 +00:00
faabc3594d
[tx-robot] updated from transifex
2017-11-12 01:10:15 +00:00
097e8a4994
[tx-robot] updated from transifex
2017-11-11 01:10:24 +00:00
5e14b64c55
[tx-robot] updated from transifex
2017-11-10 01:10:05 +00:00
656ea773e1
[tx-robot] updated from transifex
2017-11-09 09:12:53 +00:00
c91515cfed
Merge pull request #6847 from nextcloud/filelist-confict-path-12
...
[12] still trigger conflict resolution for existing entries when the curre…
2017-11-09 09:34:24 +01:00
69e61b2892
[tx-robot] updated from transifex
2017-11-09 01:09:28 +00:00
98b012d545
[tx-robot] updated from transifex
2017-11-08 01:09:33 +00:00
4d117a5e23
Merge pull request #7096 from nextcloud/backport-stable12-7042
...
[stable12] ensure uid for calendar objects is unique
2017-11-07 21:58:02 +01:00
fe6b4d432b
never show '/' as path for conflicting file names
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-11-07 15:54:11 +01:00
e51acfc717
still trigger conflict resolution for existing entries when the current entry doesn't need it
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-11-07 15:54:07 +01:00
70e20727e5
Merge pull request #6699 from nextcloud/backport-6522-stable12
...
[stable12] fix LDAP User deletion (cleanup), fixes #3365
2017-11-07 14:45:06 +01:00
3059191444
ensure uid for calendar objects is unique
...
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2017-11-07 13:18:38 +01:00
0756fc0893
[tx-robot] updated from transifex
2017-11-07 01:09:08 +00:00
e873b1a3d1
[tx-robot] updated from transifex
2017-11-06 01:09:19 +00:00
0b25217ba6
[tx-robot] updated from transifex
2017-11-05 01:09:07 +00:00
43341833fd
[tx-robot] updated from transifex
2017-11-03 01:09:18 +00:00
8b1417a269
[tx-robot] updated from transifex
2017-11-02 01:11:03 +00:00
52b31a09ef
[tx-robot] updated from transifex
2017-11-01 01:08:55 +00:00
00ffed5a19
[tx-robot] updated from transifex
2017-10-31 01:08:41 +00:00
0ce718796e
Merge pull request #6987 from burned42/stable12-6307-fix_page_title_not_changed
...
#6307 fix page title not changed (stable12)
2017-10-30 12:58:17 +01:00
76ede89b6b
[tx-robot] updated from transifex
2017-10-30 01:08:44 +00:00
e20c4c6a71
[tx-robot] updated from transifex
2017-10-29 00:08:41 +00:00
09a0048f77
[tx-robot] updated from transifex
2017-10-28 00:08:41 +00:00
8eb47de969
bugfix: set/change page title when switching to file tags
...
Signed-off-by: Bernd Stellwag <burned@zerties.org>
2017-10-27 17:32:00 +02:00
bf3f86f1ff
bugfix: set/change page title when switching to filelist
...
Signed-off-by: Bernd Stellwag <burned@zerties.org>
2017-10-27 17:32:00 +02:00
85f612c819
[tx-robot] updated from transifex
2017-10-27 00:08:39 +00:00
f7ac152a6c
[tx-robot] updated from transifex
2017-10-26 00:08:49 +00:00
7ec5689d0e
Merge pull request #6935 from nextcloud/12-5780
...
Backport of translation string fixes
2017-10-25 14:42:46 +02:00
aab0c3f18e
Merge pull request #6946 from nextcloud/12-6574
...
[stable12] Fix undefined offset warning when using '/' as external storage root
2017-10-25 14:33:20 +02:00
aef69efe2e
Merge pull request #6942 from nextcloud/12-6826
...
[stable12] Fix class name in exception logger plugin
2017-10-25 11:51:24 +02:00
27e8352ef1
Merge pull request #6945 from nextcloud/12-6633
...
[stable12] Don't add a LIKE condition when it's not needed
2017-10-25 08:53:37 +02:00
5bd0bde89d
[tx-robot] updated from transifex
2017-10-25 00:08:56 +00:00
f301b12c7b
Fix undefined offset warning when using '/' as external storage root
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-10-25 01:45:25 +02:00
8c56f93124
Don't add a LIKE condition when it's not needed
...
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2017-10-25 01:42:51 +02:00
89d4e1f2ab
Use ::class to avoid errors
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-10-25 01:23:59 +02:00
572f246b78
Fix class name, regression from 44cf67accd
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-10-25 01:23:55 +02:00
d3916b2170
Add space between ellipsis and word
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-10-25 00:11:05 +02:00
59fc88650c
Update file-upload.js
...
Fixed tiny translation issues. Removed space before ellipsis.
2017-10-24 17:34:49 +02:00
293a3d578f
Replace ... with …
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-10-24 17:34:31 +02:00
895336a3f3
[tx-robot] updated from transifex
2017-10-24 00:08:57 +00:00
ad66244bdf
Merge pull request #6910 from nextcloud/backport-6677-s12
...
[stable12] don't reset quota
2017-10-23 07:46:49 -07:00
791fa6905f
and add missing whitespaces to log outout
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-10-23 12:28:32 +02:00
b8afb84b18
Adjust unittest
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-10-23 12:28:27 +02:00
18c35a7ab0
Keep the current quota if no suitable quota is found
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-10-23 12:28:19 +02:00
5c53b162ed
Do not log WebDAV maintenance mode exception
...
Log the maintenance mode exception only in debug level. Fixes #6124
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-10-23 11:24:07 +02:00
e70135bcbf
[tx-robot] updated from transifex
2017-10-23 00:08:49 +00:00
bc19a8b193
[tx-robot] updated from transifex
2017-10-22 00:08:45 +00:00
1c488aae8a
[tx-robot] updated from transifex
2017-10-21 00:08:36 +00:00
5d2c6233a9
[tx-robot] updated from transifex
2017-10-20 00:08:44 +00:00
e8c217ed4f
[tx-robot] updated from transifex
2017-10-19 00:08:38 +00:00
8b0842f020
[tx-robot] updated from transifex
2017-10-18 00:08:33 +00:00
ea269db6d6
[tx-robot] updated from transifex
2017-10-17 00:08:33 +00:00
e6000abdd6
[tx-robot] updated from transifex
2017-10-16 00:08:36 +00:00
95bd9d4c64
[tx-robot] updated from transifex
2017-10-14 02:29:15 +00:00
7762130869
[tx-robot] updated from transifex
2017-10-13 00:08:37 +00:00
c14beb8ee5
[tx-robot] updated from transifex
2017-10-10 00:08:41 +00:00
df2fa2fce2
Merge pull request #6737 from nextcloud/aws-sdk-12
...
[12] Update aws sdk + s3 improvements
2017-10-09 18:05:16 +02:00
35641b54a0
[tx-robot] updated from transifex
2017-10-09 00:08:42 +00:00
7a583c400e
[tx-robot] updated from transifex
2017-10-08 00:08:32 +00:00
adea68e218
[tx-robot] updated from transifex
2017-10-07 00:08:40 +00:00
037376b4ce
[tx-robot] updated from transifex
2017-10-06 00:08:40 +00:00
ceec594cc0
[tx-robot] updated from transifex
2017-10-05 00:08:34 +00:00
1c30c72909
[tx-robot] updated from transifex
2017-10-04 00:08:37 +00:00
82a3a8be06
fix undefined constants
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-10-03 14:11:28 +02:00
d97f66454c
disable part files for s3 external storage
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-10-03 14:11:16 +02:00
83ef030ea6
add stat cache for s3 external storage
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-10-03 14:11:12 +02:00
e42b950521
more efficient is_dir
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-10-03 14:11:09 +02:00
a0848ba202
more efficient permissions for s3 external storage
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-10-03 14:11:05 +02:00
f45a7a43df
more efficient write only fopen
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-10-03 14:11:01 +02:00
474c8aff29
reuse object read/write/delete logic in s3 implementations
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-10-03 14:10:57 +02:00
f62e0a33f3
update aws sdk and move it to 3rdparty
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-10-03 14:09:59 +02:00
14d94abf06
remove non composer aws sdk
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-10-03 14:04:20 +02:00
4a21eb1c7d
[tx-robot] updated from transifex
2017-10-03 00:08:30 +00:00
77931505d3
[tx-robot] updated from transifex
2017-10-02 00:08:33 +00:00
05fe73ef5d
[tx-robot] updated from transifex
2017-10-01 00:08:35 +00:00
489fc55e1d
[tx-robot] updated from transifex
2017-09-30 00:08:35 +00:00
38f84b369c
Backport of #6522
...
fix LDAP User deletion (cleanup)
discovered a bug in the integration test which lead to following a
different code path and giving a false-positive success feedback.
Also listens now to the evendispatcher instead of old hook system
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
fix test
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-09-29 14:36:48 +02:00
cae4a1956b
[tx-robot] updated from transifex
2017-09-29 00:08:31 +00:00
ac31b67f42
navigate to the root directory when showing the main filelist
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-09-28 16:37:47 +02:00
df00dc89d1
[tx-robot] updated from transifex
2017-09-28 00:08:46 +00:00
f6ccc1e0a1
Merge pull request #6554 from nextcloud/stable12-contacts_menu_privacy
...
[Stable12] contacts menu privacy
2017-09-27 15:32:29 +02:00
af923601b9
[tx-robot] updated from transifex
2017-09-27 00:08:33 +00:00
0f39ea5830
[tx-robot] updated from transifex
2017-09-26 00:08:36 +00:00
06ca365ccd
[tx-robot] updated from transifex
2017-09-25 00:08:12 +00:00
29e4c10517
[tx-robot] updated from transifex
2017-09-23 00:08:06 +00:00
c1aa80afe8
[tx-robot] updated from transifex
2017-09-22 00:08:32 +00:00
cb212712f6
[tx-robot] updated from transifex
2017-09-21 00:08:36 +00:00
9945d2f039
Merge pull request #6509 from nextcloud/backport-5689
...
[stable12] LDAP: simplify returning the homePath and fixing #4117
2017-09-20 20:11:30 +02:00
ac0cd59a20
Merge pull request #6502 from nextcloud/backport-6453-stable12
...
[stable12] Fix initializing paged search under some circumstances
2017-09-20 16:07:28 +02:00
7d4fda5c85
Merge pull request #6524 from nextcloud/12-6506
...
[stable12] Fix sharer name overlap with filename
2017-09-20 16:06:09 +02:00
aa586331ea
Merge pull request #6525 from nextcloud/12-6499
...
[stable12] Allow to close sidebar for text files
2017-09-20 16:05:59 +02:00
6a52cda551
Merge pull request #6547 from nextcloud/backport-6545-stable12
...
[stable12] throw 101 when an empty group string is provided
2017-09-20 16:05:41 +02:00
3c449c88be
Merge pull request #6527 from nextcloud/fix_quota_new_endpoint_12
...
[stable12] Fix quota new endpoint 12
2017-09-20 09:19:06 +02:00
2bac01daad
[tx-robot] updated from transifex
2017-09-20 00:08:36 +00:00
4ca0223f37
Use the wrapper to get the parameters which was added in #6369
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-09-19 15:06:22 +02:00
db56ea3e70
[tx-robot] updated from transifex
2017-09-19 00:08:39 +00:00
96e3e0788a
Revert "Do not list system users in contacts menu if sharing autocompletion is disabled"
...
This reverts commit 56a9084dd2
2017-09-18 17:27:57 +02:00
713ce42fdf
throw 101 when an empty group string is provided
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-09-18 13:10:23 +02:00
c854665b0c
[tx-robot] updated from transifex
2017-09-18 00:08:41 +00:00
bc88484e7f
[tx-robot] updated from transifex
2017-09-17 00:08:34 +00:00
18a258c531
[tx-robot] updated from transifex
2017-09-16 00:08:34 +00:00
76cd70aed7
Fix quota calculation on new dav upload endpoint
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-09-15 20:21:37 +02:00
efec52ebeb
Allow to close sidebar for text files
...
* the close button was overlapped by the text preview and you could not close the sidebar then
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-09-15 17:00:14 +02:00
f987347b83
Correctly ellipsize file names, fix #6498
...
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2017-09-15 16:53:01 +02:00
64dd1f6833
Ellipsize sharer name, ref #6498
...
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2017-09-15 16:52:52 +02:00
99916a9bda
[tx-robot] updated from transifex
2017-09-15 00:08:17 +00:00
90ebeae512
listen to deletion hooks for proper handling, adjust and add tests
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-09-14 17:04:12 +02:00
5933c0c55f
simplify returning the homePath and fixing #4117
...
homesToKill was not set in runtime since some changes some place else. It
required deleteUser() to be called first. The method acts independent of it
now.
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-09-14 17:04:01 +02:00
9d5fd7cd92
adapted integration tests
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-09-14 14:14:23 +02:00
9fb8f1fcd3
fix counting found results in search op
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-09-14 14:14:16 +02:00
51e4b49ee9
improve and extend paging integration test
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-09-14 14:14:10 +02:00
30bf1c158d
replace hard-coded attribute with the corresponding settings option
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-09-14 14:14:04 +02:00
de8626694f
fix limit-flaw in search on paged results
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-09-14 14:13:49 +02:00
a7f3fadd37
[tx-robot] updated from transifex
2017-09-14 00:08:21 +00:00
51c110dd66
[tx-robot] updated from transifex
2017-09-13 00:08:21 +00:00
c1690da20b
Merge pull request #6444 from nextcloud/backport-6351-sql-syntax-on-caldav
...
[stable12] not to backquote LIMIT on CalDavBackend.php
2017-09-12 09:43:24 +02:00
5981027f82
Merge pull request #6359 from nextcloud/12-6082
...
[stable12] Use separate element color in theming
2017-09-12 09:41:10 +02:00
c58fdad3de
[tx-robot] updated from transifex
2017-09-12 00:08:34 +00:00
2eaee586c7
not to backquote LIMIT on CalDavBackend.php
2017-09-11 11:21:43 +02:00
206c4da149
Allow translations of the comments activity in the emails too
...
Message and object data is not available on emails atm,
so we can not use them either...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-09-11 11:05:06 +02:00
985cbc6b33
[tx-robot] updated from transifex
2017-09-10 00:08:33 +00:00
ac96dc80de
[tx-robot] updated from transifex
2017-09-08 00:08:25 +00:00
9071f60605
[tx-robot] updated from transifex
2017-09-07 00:08:32 +00:00
e1e248aeb8
Merge pull request #6357 from nextcloud/swift-tmpfiles-12
...
[12] Remove tmpFiles Array in Swift.php
2017-09-06 17:17:36 +02:00
ba71df12cc
[tx-robot] updated from transifex
2017-09-06 00:08:30 +00:00
6e7c37cbd3
Merge setMetaData into constructor
...
This ensures that the meta data is set in the beginning
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-09-05 16:04:09 +02:00
ec00e4b001
Implement metadata for email templates of remaining emails
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-09-05 16:03:40 +02:00
9bcf90adc8
Cleanup theming styles to fit the new login page
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2017-09-04 15:59:46 +02:00
ed11c0d6e2
Fix tests for primary element color
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2017-09-04 15:59:40 +02:00
0f2f19c65f
Use separate element color in theming
...
This way we can use a grey color when the primary color is to bright
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2017-09-04 15:50:33 +02:00
222ec97f5f
Remove tmpFiles Array in Swift.php
...
tmpFiles Array is unnecessary and there has been
a reference without an assignment which lead to a bug making swift external
storage unuseable.
2017-09-04 14:54:13 +02:00
ebadf2f21d
Merge pull request #6355 from nextcloud/6221-12
...
[stable12] Correctly format OCS response with favorites
2017-09-04 12:52:44 +02:00
274b72f223
Merge pull request #6333 from nextcloud/new-dav-event-stable12
...
[stable12] add a new dav event to allow apps to register their own sabredav plugins
2017-09-04 11:57:22 +02:00
38548a7006
Correctly format OCS response with favorites
...
The helper funtion did not handle the response correctly and basically
only returned the last share with tags.
This is a simple rewrite. That is still understandable. Loops maybe more
than strictly required. But preformance is not the issue here.
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-09-04 11:49:19 +02:00
fe2f9ac7ce
[tx-robot] updated from transifex
2017-09-02 00:08:39 +00:00
38a60e44db
also allow to register additional plugins if the old endpoint is used
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-09-01 12:07:05 +02:00
8e1d33369b
add a new dav event to allow apps to register their own sabredav plugins
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-09-01 12:06:55 +02:00
a8f4b1ee52
[tx-robot] updated from transifex
2017-09-01 00:08:36 +00:00
0ba7914d0c
[tx-robot] updated from transifex
2017-08-31 00:08:40 +00:00
6704e89c5a
Merge pull request #5841 from nextcloud/bugfix-stable12/2855/dont_send_invitations_for_past_events
...
[stable12] dont send invitations for past events
2017-08-30 21:01:32 +02:00
c13a06b7a5
[tx-robot] updated from transifex
2017-08-30 00:08:36 +00:00
0433b31d74
Merge pull request #6300 from nextcloud/add-share-with
...
[stable12] Add shareWith to email template metadata
2017-08-29 17:56:42 +02:00
7fd3068184
Add shareWith to email template metadata
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-08-29 16:05:12 +02:00
eb1a8a1934
Merge pull request #6278 from nextcloud/stable12-6182-fixes-in-files-drop-js
...
[stable12] Fixes in files_drop.js
2017-08-29 14:49:05 +02:00
1f7ea1f295
Merge pull request #6284 from nextcloud/add-new-propfind-stable12
...
add propfind to detect encryption status
2017-08-29 10:48:30 +02:00
a6ea872b1f
[tx-robot] updated from transifex
2017-08-29 00:08:37 +00:00
6f9c3ab8a6
Allow the expiration date to be set to null
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-08-28 17:47:51 +02:00
d0bb5c298d
Allow the expiration date to be set to null
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-08-28 17:33:43 +02:00
7df1ddcf2c
Add meta information to emails for better customisation
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-08-28 17:33:35 +02:00
9128786d09
add propfind to detect encryption status
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-08-28 14:03:21 +02:00
eb71c1288d
[tx-robot] updated from transifex
2017-08-28 00:08:33 +00:00
575f0c8421
Do not iterate over the files
...
As "singleFileUpload" is used the "add" callback (which in turn calls
"addFileToUpload") will always be called with a single file. Therefore
there is no need to iterate over the files (and it is not done in the
other callbacks either, so this aligns the code with the rest of the
callbacks).
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-08-27 18:37:44 +02:00
03c6c5bd93
Replace fileName variable with data.files[0].name
...
There is no need to store the file name, as the "data" parameter given to
all the callbacks provides a "files" attribute with all the files that
the callback refers to; moreover, it will always be a single file due to
the use of "singleFileUploads" in the jQuery File Upload plugin.
This also fixes the loading icon not disappearing when several files were
uploaded at once. "singleFileUploads" causes the "add" callback to be
called once for each file to be uploaded, so "fileName" was overwritten
with the name of each new file in the upload set; when "fileName" was
later used in the "done" callback to find the file in the list whose
loading icon replace with the MIME type icon "fileName" always had the
name of the last file, and thus its icon was the only one replaced.
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-08-27 18:37:43 +02:00
b68bad45dc
Update the whole file item instead of only its contents
...
The "done" and "fail" callbacks both update the item for the uploaded
file using "setFileIcon". "setFileIcon" updates the contents of the
"<li>" element for the file, but the "fail" callback was giving
"setFileIcon" an element generated by the template, so the resulting
HTML contained a "<li>" element nested in another "<li>" element.
However, generating the HTML is better done through a template, so the
template now receives the icon to show in order to be used by a
successful upload and a failed one, and "setFileIcon" was changed to
"updateFileItem".
Note that the mimeTypeUrl does no longer need to be escaped, as
Handlebars templates escape the needed characters automatically.
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-08-27 18:37:43 +02:00
8a1850f6b1
Remove "errorThrown" parameter
...
When the "fail" callback is called, "errorThrown" is a property of the
data object instead of a parameter.
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-08-27 18:37:43 +02:00
ad283e40b4
Merge pull request #6270 from nextcloud/6252-12
...
[stable12] Don't try the actual file upload if the checks already error out
2017-08-26 18:32:03 +02:00
0ec858f7e9
Merge pull request #6269 from nextcloud/6251-12
...
[stable12] Don't fetch the translation from core but from files
2017-08-26 16:26:40 +02:00
99b102e15d
Don't try the actual file upload if the checks already error out
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-08-26 13:34:29 +02:00
7338f7aa21
Don't fetch the translation from core but from files
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-08-26 13:33:34 +02:00
6f06426bd4
update icewind/smb to 2.0.2
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-08-26 12:14:43 +02:00
2c6bc236cb
[tx-robot] updated from transifex
2017-08-26 00:08:36 +00:00
992c91e288
[tx-robot] updated from transifex
2017-08-25 00:09:08 +00:00
4c2f194589
Merge pull request #6114 from nextcloud/stable12_5852
...
[stable12] Delete trash using node API to trigger preview deletion
2017-08-24 02:59:44 +02:00
Nextcloud bot
Roeland Jago Douma
Morris Jobke
Robin Appelman
Roeland Jago Douma
Jan-Christoph Borchardt
Lukas Reschke
Georg Ehrke
Bernd Stellwag
Joas Schilling
Thomas Citharel
rakekniven
Arthur Schiwon
Juan Pablo Villafáñez
nhirokinet
Julius Härtl
Christopher Bartz
Bjoern Schiessle
Daniel Calviño Sánchez