8549fcf6e4
[tx-robot] updated from transifex
2017-08-09 00:08:20 +00:00
9707ef9ba7
Merge pull request #5982 from nextcloud/fix-loading-icon-inside-upload-button-in-theming-app
...
Fix loading icon inside upload button in Theming app
2017-08-08 18:41:57 +02:00
d7645ee928
Merge pull request #5972 from nextcloud/replace-loading-icon-gif-with-pure-css-in-login-button
...
Replace loading icon GIF with pure CSS in login button
2017-08-08 14:40:35 +02:00
481002a00b
[tx-robot] updated from transifex
2017-08-08 00:08:10 +00:00
2398e845c9
Fix loading icon inside upload button in Theming app
...
Pull request #5969 fixed the vertical alignment of loading icon and
status message in Theming app, but in doing so it broke the loading icon
inside the upload button.
When an image is being uploaded the upload icon is replaced by a loading
icon, so the loading icon and the upload icon have to share their CSS
rules, but only in that specific case.
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-08-07 15:04:43 +02:00
eb2442b871
[tx-robot] updated from transifex
2017-08-06 00:08:24 +00:00
21f2fe5cb9
[tx-robot] updated from transifex
2017-08-05 00:08:08 +00:00
de94eefe97
Merge pull request #5969 from nextcloud/fix-vertical-alignment-of-loading-icon-and-status-message-in-theming-app
...
Fix vertical alignment of loading icon and status message in Theming app
2017-08-04 12:08:16 +02:00
3266e81577
Merge pull request #5954 from nextcloud/textpreview_range
...
Do not fetch the whole text file for the sidebar preview
2017-08-04 11:23:42 +02:00
d63beffe9e
Merge pull request #5967 from nextcloud/revert-5682-inline-svg-icon
...
Revert "Proof of concept #5593 - inline SVG icon for icon-contacts"
2017-08-04 10:53:21 +02:00
1f8a45bbd7
[tx-robot] updated from transifex
2017-08-04 00:08:18 +00:00
b237379fa1
Replace loading icon GIF with pure CSS loading icon
...
The pure CSS loading icon uses an ::after pseudo-element, and thus it
can only be used on container elements; the input element is not a
container element, so when the class "icon-loading-small" is set on an
input element it falls back to a loading icon GIF.
This commit modifies the markup of the login button to add a div element
that holds the confirm icon and the loading icon (depending on the
case). In order to position the icon in the same place as before the
input and the icon are both wrapped by another div making possible to
set the absolute position of the icon relative to the input.
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-08-03 21:09:43 +02:00
09a8c4a5d4
Fix code style
...
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-08-03 21:09:25 +02:00
c723d093a8
Remove superfluous selector part
...
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-08-03 21:09:25 +02:00
4fbcbd3e6d
Align vertically loading icon and status message
...
As both elements are inline/inline-block and belong to the same line
they can be aligned vertically using "vertical-align: middle".
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-08-03 21:09:25 +02:00
fa7f4e5cae
Do not use the same rules for loading icon than for upload icon
...
The loading icon is used in a totally different way than the upload icon
and thus it should not share its CSS rules.
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-08-03 21:09:25 +02:00
33c4a674a2
Remove ignored rules
...
The removed rules were either always overriden by other rules or never
used due to not matching any element.
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-08-03 21:09:25 +02:00
3aa819c62c
Do not fetch the whole text file for the sidebar preview
...
Just fetch the first 10kb. This should be more than enough in 99% of the
cases. And avoid downloading a 10mb text file just to display a tiny
portion.
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-08-03 20:32:59 +02:00
9abbd6ab13
Revert "Proof of concept #5593 - inline SVG icon for icon-contacts"
2017-08-03 17:27:24 +02:00
bb865a55fe
Merge pull request #5738 from nextcloud/comradekingu-patch-3
...
Spelling: UID
2017-08-03 14:28:41 +02:00
8fecc336ac
Merge pull request #5959 from nextcloud/drop-logo-claim
...
Logo claim is not used anymore
2017-08-03 08:20:56 +02:00
21dd85678f
[tx-robot] updated from transifex
2017-08-03 00:08:06 +00:00
ea2e629c6c
Merge pull request #5953 from nextcloud/theming-lightness-correction
...
Use same lightness calculation as the SCSS compiler for theming
2017-08-02 23:17:19 +02:00
585e5c6ea5
Logo claim is not used anymore
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-08-02 23:08:45 +02:00
ffcdc96a0b
Proof of concept #5593 - inline SVG icon for icon-contacts
...
Signed-off-by: Marin Treselj <marin@pixelipo.com>
2017-08-02 18:27:24 +02:00
2fcf4f2f29
Improve spelling in LDAP
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-08-02 18:12:31 +02:00
6ca4b9eee9
Merge pull request #5920 from nextcloud/gallery-share-view-fix
...
Top bar buttons in share view are wrong positioned
2017-08-02 16:59:24 +02:00
6290ba8299
Merge pull request #4790 from nextcloud/fix-comparisons-in-apps
...
Fix comparisons in apps
2017-08-02 16:28:33 +02:00
1a711b1e73
Merge pull request #5956 from nextcloud/proper-update-notification-layout
...
Improve update notification layout and show non-default update server
2017-08-02 16:26:57 +02:00
fbfd371493
Merge pull request #5923 from nextcloud/expire-federation-jobs
...
Expire federation jobs
2017-08-02 16:15:28 +02:00
4ca4b270e7
Close all the cursors
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-08-02 14:35:14 +02:00
81c54ea515
Use automatic injection whenever possible
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-08-02 14:34:51 +02:00
9391d8fc60
Improve update notification layout and show non-default update server
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-08-02 13:56:36 +02:00
7f2e9d10a3
Show correct status in update notification
...
Sometimes it could be the case that after a channel change the last updated
timestamp is reset, but the check for updates is not yet completed. In this
case the update notification showed "You are up to date" and the date was
"1970-01-01 00:00:00". With this fix the state is properly shown.
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-08-02 10:45:26 +02:00
2800e017de
[tx-robot] updated from transifex
2017-08-02 00:08:10 +00:00
9cd21bbe8a
Use same lightness calculation as the SCSS compiler for theming
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2017-08-01 18:09:07 +01:00
f93a82b8b0
Remove explicit type hints for Controller
...
This is public API and breaks the middlewares of existing apps. Since this also requires maintaining two different code paths for 12 and 13 I'm at the moment voting for reverting this change.
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-08-01 17:32:03 +02:00
578e4f9903
Filter magic dot object when swift directory
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-08-01 14:57:33 +02:00
6010c4f267
Merge pull request #5877 from nextcloud/typehint_middleware
...
Prop argument type for Middleware
2017-08-01 14:28:16 +02:00
a20934227c
Remove undocumented config
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-08-01 13:59:10 +02:00
c23c05d4f6
Fix versions app
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-08-01 13:57:08 +02:00
231bb47ae6
Fix file size comparison
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-08-01 13:56:12 +02:00
d703744d4a
Fix comparisions in the trashbin app
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-08-01 13:56:12 +02:00
80febeae21
Fix comparisons in the sharing app
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-08-01 13:56:12 +02:00
7a62fbd205
Fix comparisons in the files external app
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-08-01 13:56:12 +02:00
e30287cf81
Fix comparisons in the files app
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-08-01 13:56:12 +02:00
45e2c415d4
Fix comparison in the ldap app
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-08-01 13:56:12 +02:00
1e2de86c3a
Fix comparisons in the versions app
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-08-01 13:56:12 +02:00
89238164e1
Fix comparisons in the dav app
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-08-01 13:55:07 +02:00
0ebdf871e0
Fix comparisons in encryption app
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-08-01 13:54:07 +02:00
c8452803ef
Merge pull request #5897 from nextcloud/add-share-mail-for-user-share
...
Send an email once a file/folder is shared with a user
2017-08-01 13:27:15 +02:00
bc54e6ff7c
Use ITimeFactory
...
* Inject the timefacotry so we can mock it properly in the tests.
* Extended unit tests to cover the new paths
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-08-01 11:23:40 +02:00
3ffff08819
we don't need to remove the job manually here, even if we ask once more the other server will decline and the background job will be removed
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-08-01 10:07:53 +02:00
80c08e8fd0
update unit tests
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-08-01 10:07:53 +02:00
9c9cb1a6db
cleanup constructors
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-08-01 10:07:53 +02:00
06b9e58081
expire requestSharedSecret job after 30 days
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-08-01 10:07:53 +02:00
51d85eb2f8
expire getShareadSecret job after 30 days
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-08-01 10:07:51 +02:00
2fae696d35
Fix tests
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-08-01 08:20:17 +02:00
61a6adff14
Fix sabre test
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-08-01 08:20:17 +02:00
ede15f0988
Fix L10N::t
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-08-01 08:20:17 +02:00
fd465d4e49
[files_external] Fix phpdoc
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-08-01 08:20:17 +02:00
fc369dd86e
[DAV] Fix URLUtil::splitPath usage
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-08-01 08:20:17 +02:00
f57a3aa81b
[DAV][CalDAV] Fixes
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-08-01 08:20:16 +02:00
201bbb962c
Fix Comments
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-08-01 08:20:16 +02:00
19b039e6e0
[files_external] fix commands
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-08-01 08:20:16 +02:00
b7c8e9ed88
[files_external] Fix phpdoc
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-08-01 08:20:16 +02:00
dfd8125aeb
Replace wrong PHPDocs
...
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-08-01 08:20:16 +02:00
d321e9792e
Add |null to PHPDoc
...
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-08-01 08:20:15 +02:00
e1f52fc901
Stricter phan config fixes
...
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-08-01 08:20:13 +02:00
456392e627
[tx-robot] updated from transifex
2017-08-01 00:08:26 +00:00
f71dc7523f
Fix tests
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-07-31 16:54:19 +02:00
3548603a88
Fix middleware implementations signatures
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-07-31 16:54:19 +02:00
f53db38c03
Change id to class in the main share template
...
Signed-off-by: Marin Treselj <marin@pixelipo.com>
2017-07-31 12:19:19 +02:00
7b2c08a31a
Merge pull request #5905 from nextcloud/ocp-config
...
Use IConfig instead of static OCP\Config
2017-07-31 10:54:40 +02:00
baee0b4bcc
Merge pull request #5913 from nextcloud/fix-anchor-name
...
Fix anchor name for federated sharing settings
2017-07-31 08:51:23 +02:00
a309fa7d6b
Disable default activity email for incoming shares
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-07-31 08:19:54 +02:00
97d06a7698
[tx-robot] updated from transifex
2017-07-31 00:08:02 +00:00
98b664a000
[tx-robot] updated from transifex
2017-07-30 00:08:03 +00:00
b43abf7512
[tx-robot] updated from transifex
2017-07-29 00:08:31 +00:00
fae327799b
Fix anchor name for federated sharing settings
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-07-28 08:21:25 +02:00
baa6db3539
[tx-robot] updated from transifex
2017-07-28 00:08:05 +00:00
dc58206ded
Merge pull request #5852 from nextcloud/preview_trash_cleanup
...
Preview trash cleanup
2017-07-27 17:24:47 +02:00
c27498db71
Use IConfig instead of static OCP\Config
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-07-27 13:43:18 +02:00
65ade4b6d5
[tx-robot] updated from transifex
2017-07-27 00:08:03 +00:00
28290d8691
Allow to enable the external storage app via the web ui
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-07-26 14:30:21 +02:00
da31a30edb
[tx-robot] updated from transifex
2017-07-26 00:08:06 +00:00
3faef644a1
Merge pull request #5864 from nextcloud/legacy_user
...
Remove legacy OC_User_Backend and OC_User_Interface
2017-07-25 17:15:11 +02:00
89a7b007f2
Fix comments
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-07-25 08:57:58 +02:00
11e182fff2
[tx-robot] updated from transifex
2017-07-25 00:08:02 +00:00
b930f32e89
Remove legacy OC_User_Backend and OC_User_Interface
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-07-24 20:42:55 +02:00
e785b849c7
Merge pull request #5835 from nextcloud/cleanup_testing_app
...
Cleanup testing app
2017-07-24 15:03:15 +02:00
c775d5e497
Merge pull request #5514 from nextcloud/assembly-stream-seek
...
refactor chunked assembly stream
2017-07-24 15:00:03 +02:00
7f6a72b65d
Move over locking controller
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-07-24 13:44:03 +02:00
10efec246d
Move over Config
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-07-24 13:43:00 +02:00
d1993c32e5
Move Application to AppInfo
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-07-24 13:42:58 +02:00
6d4731024a
Some app fixes of phpstorm inspections
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-07-24 11:42:07 +02:00
549845aa73
Delete trash using node API to trigger preview deletion
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-07-24 11:14:12 +02:00
d95b46ffb7
[tx-robot] updated from transifex
2017-07-24 00:08:01 +00:00
69f6d42b17
LDAP: Simplify conditions in establishConnection
...
Signed-off-by: Jarkko Lehtoranta <devel@jlranta.com>
2017-07-23 14:50:01 +03:00
6a62b4784a
LDAP: Add testStartTlsNegotiationFailure unit test
...
Signed-off-by: Jarkko Lehtoranta <devel@jlranta.com>
2017-07-23 14:50:01 +03:00
3a6511eac8
LDAP: Add testBindWithInvalidCredentials unit test
...
Signed-off-by: Jarkko Lehtoranta <devel@jlranta.com>
2017-07-23 14:50:01 +03:00
6103677a91
LDAP: Use imported exception in Connection class
...
Signed-off-by: Jarkko Lehtoranta <devel@jlranta.com>
2017-07-23 14:50:01 +03:00
79fbed4064
LDAP: Clean-up doConnect
...
Signed-off-by: Jarkko Lehtoranta <devel@jlranta.com>
2017-07-23 14:50:01 +03:00
d87375cbaa
LDAP: Throw an exception if disabling LDAP referrals fails
...
Signed-off-by: Jarkko Lehtoranta <devel@jlranta.com>
2017-07-23 14:50:01 +03:00
97e14cccf2
LDAP: Fix testUseBackupServer unit test
...
Signed-off-by: Jarkko Lehtoranta <devel@jlranta.com>
2017-07-23 14:50:01 +03:00
de9a9bc004
LDAP: Throw an exception if Start TLS fails
...
This ensures that only a secure connection to the LDAP server will be used,
if Start TLS has been enabled.
Signed-off-by: Jarkko Lehtoranta <devel@jlranta.com>
2017-07-23 14:50:01 +03:00
ee2c6e8215
LDAP: Remove unnecessary "recursion" fix
...
This reverts commit 86d72b9a61
2017-07-23 14:50:01 +03:00
039a836d4a
LDAP: Don't handle invalid credentials as a connection error
...
Signed-off-by: Jarkko Lehtoranta <devel@jlranta.com>
2017-07-23 14:50:01 +03:00
4e2e592635
LDAP: Connect to backup server only if it exists + handle errors
...
Signed-off-by: Jarkko Lehtoranta <devel@jlranta.com>
2017-07-23 14:50:01 +03:00
46332b0d8e
[tx-robot] updated from transifex
2017-07-23 00:07:58 +00:00
b6c67f585e
Merge pull request #5827 from nextcloud/improve-public-share-header
...
Add filename and sharer in public page
2017-07-22 10:59:33 +02:00
ce7c62d9bb
[tx-robot] updated from transifex
2017-07-22 00:08:07 +00:00
50fc5a1e25
Merge pull request #5823 from nextcloud/improve-error-handling
...
Improve error handling for accepting federated shares
2017-07-21 22:54:14 +02:00
b2b4691e48
Add filename and sharer in public page
...
* shows the filename and sharer on the public page
* allows the user to identify, that this is a user page and not an official page of the Nextcloud hosting
* remove link on logo that redirects to login (fixes #5720 )
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-07-21 18:55:37 +02:00
25439919f8
fix phpdoc return types (no code change)
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-07-21 14:55:12 +02:00
9b2f171cbd
do not attempt to recognise cert issue by using LDAPTLS_REQCERT
...
first, it does not work (at least not everywhere/reliably), second if it
did it was not reset properly. Removes a bit of complexity.
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-07-21 14:55:11 +02:00
89b747d066
refactor chunked assembly stream
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-07-21 12:49:39 +02:00
86d2fe516e
Merge pull request #5753 from nextcloud/fed-unshare-fail-remote
...
still remove the federated share even if we cant notify the remote
2017-07-21 12:45:01 +02:00
8b3dfcc429
use OCSv2 to make sure that the error also arrives at the web front-end
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-07-21 12:09:13 +02:00
e78040d250
improved error handling
...
check if table was updated successfully and only then send a notification
mail and return "true".
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-07-21 12:07:32 +02:00
407a500745
Merge pull request #5803 from nextcloud/fix-public-links
...
fix preview for public links
2017-07-21 09:34:36 +02:00
3d9fd4d0d1
Merge pull request #5817 from nextcloud/add-basic-sql-injection-checker
...
Add Phan plugin to check for SQL injections
2017-07-21 09:25:24 +02:00
964d5338dc
[tx-robot] updated from transifex
2017-07-21 00:08:06 +00:00
3d2600b039
Add Phan plugin to check for SQL injections
...
This adds a phan plugin which checks for SQL injections on code using our QueryBuilder, while it isn't perfect it should already catch most potential issues.
As always, static analysis will sometimes have false positives and this is also here the case. So in some cases the analyzer just doesn't know if something is potential user input or not, thus I had to add some `@suppress SqlInjectionChecker` in front of those potential injections.
The Phan plugin hasn't the most awesome code but it works and I also added a file with test cases.
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-07-20 22:48:13 +02:00
c0e9b374f1
Merge pull request #5629 from nextcloud/add-recovery-key-on-public-upload
...
Add recovery key on public upload
2017-07-20 14:07:57 +02:00
473824fa06
make sure that we always have a owner
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-07-20 11:40:17 +02:00
20a6b22db6
Add recovery key on public upload
...
In order to decide if a recovery key needs to be added we always
need to check the files owner settings and not the settings of
the currently logged in user.
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-07-20 11:40:14 +02:00
ae8a3ce085
fix preview for public links
...
in case a user is already logged in on the same server from
which the public link comes from, we need to setup the owners
file system in order to show the preview
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-07-20 11:24:52 +02:00
0b3266531b
Fix copy and paste error on activity descriptions
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-07-20 09:31:14 +02:00
26c42d3d30
[tx-robot] updated from transifex
2017-07-20 00:08:04 +00:00
3ff3c338c9
Merge pull request #5734 from nextcloud/only-readable-chars-in-share-tokens
...
Only use readable chars in Share Tokens
2017-07-19 16:40:18 +02:00
d5e3428af5
Merge pull request #5776 from nextcloud/install-phan
...
Run phan over code base
2017-07-19 13:45:31 +02:00
d8ec399454
Run phan over code base
...
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-07-19 10:28:11 +02:00
e48ca730fe
Add Android and iOS URLs to theming app
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-07-19 10:20:47 +02:00
e2298e0a71
Allow overwriting of IOS theming values
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-07-19 08:22:45 +02:00
0ee83ac56b
[tx-robot] updated from transifex
2017-07-19 00:08:22 +00:00
984933e586
Only use readable chars in Share Tokens
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-07-18 15:44:34 +02:00
1ac6eae7d5
Merge pull request #5739 from nextcloud/comradekingu-patch-4
...
Spelling: Bigversal and LDAP
2017-07-18 09:09:46 +02:00
58f72309cc
Merge pull request #5736 from smueller18/patch-2
...
do not show hyphen in og:title if slogan does not exist
2017-07-18 09:04:47 +02:00
4b1f258198
Merge pull request #5735 from nextcloud/comradekingu-patch-1
...
Spelling: Shortening and binding
2017-07-18 08:52:09 +02:00
99555faffd
Merge pull request #5737 from nextcloud/comradekingu-patch-2
...
Spelling: command-line, Consider narrowing
2017-07-18 08:49:48 +02:00
7642492cfe
Merge pull request #5741 from nextcloud/comradekingu-patch-6
...
Spelling: sent, an invitation, - successful
2017-07-18 08:49:06 +02:00
79cf7d610f
Merge pull request #5740 from nextcloud/comradekingu-patch-5
...
Spelling: log out, : Bigversal
2017-07-18 08:48:08 +02:00
b1b843e572
[tx-robot] updated from transifex
2017-07-18 00:08:02 +00:00
1956ea0e13
Merge pull request #5743 from nextcloud/comradekingu-patch-7
...
Spelling: - your
2017-07-17 14:42:13 +02:00
7fa02905aa
still remove the federated share even if we cant notify the remote
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-07-17 14:19:44 +02:00
125767265d
[tx-robot] updated from transifex
2017-07-17 00:08:02 +00:00
1d24c82e38
- your
...
This avoids it being «"access to your "the cloud"» or similar. Italicizing %s might be a middleground here.
2017-07-15 11:39:50 +02:00
a23cdd04bb
[tx-robot] updated from transifex
2017-07-15 00:08:54 +00:00
de6b7668c1
sent, an invitation, - successful
2017-07-14 17:28:57 +02:00
6ab8b90e94
log out, : Bigversal
2017-07-14 17:02:48 +02:00
ddc804aa32
: Bigversal and LDAP
2017-07-14 15:46:05 +02:00
4b8c1eaa91
command-line, Consider narrowing
2017-07-14 15:32:47 +02:00
7cf3dc4e29
do not show hyphen in og:title if slogan does not exist
2017-07-14 15:26:44 +02:00
66cbf90853
Spelling: Shortening and binding
2017-07-14 15:24:55 +02:00
3865c77279
[tx-robot] updated from transifex
2017-07-14 00:08:37 +00:00
e335121d5e
Merge pull request #5070 from nextcloud/theming-vs-themes
...
Prefer custom theme over the theming app
2017-07-13 13:41:31 +02:00
261513b04a
[tx-robot] updated from transifex
2017-07-13 00:08:31 +00:00
86a496d94a
Merge pull request #5567 from nextcloud/public-capabilities
...
Public capabilities API
2017-07-12 13:04:54 +02:00
08d3cb9107
Merge pull request #5685 from nextcloud/jail-propagator
...
Fix propagating changes within jail wrapper
2017-07-12 12:14:51 +02:00
ce5ad7e7f4
Prefer custom theme over theming app
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2017-07-12 11:42:15 +02:00
13295c2d1d
[tx-robot] updated from transifex
2017-07-12 00:08:43 +00:00
9e2d1caba2
Merge pull request #5681 from nextcloud/upstream-fix-circles
...
upstream fix circles
2017-07-11 18:03:06 +02:00
dfe662ad42
Fix propagating changes within jail wrapper
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-07-11 17:55:04 +02:00
4153e1de79
Merge pull request #5672 from nextcloud/upload-hidden-filelist
...
properly block file upload to non-active filelist
2017-07-11 15:15:49 +02:00
e1d6ca3c53
fix test
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-07-11 14:03:11 +02:00
6e7be6acfd
upstream
...
Signed-off-by: Maxence Lange <maxence@nextcloud.com>
2017-07-11 13:21:24 +02:00
7df7d0ff3b
Merge pull request #5656 from nextcloud/fix-unselecting-items-on-multi-select-dropdowns
...
Fix unselecting items on multi select dropdowns
2017-07-10 23:39:43 +02:00
22693aec47
Merge pull request #5669 from nextcloud/fix-remote-share-activity-emails
...
Fix remote share activity emails
2017-07-10 16:16:54 +02:00
12c9b1efb0
properly block file upload to non-active filelist
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-07-10 14:32:10 +02:00
0ebec6f9a4
Rectify variable $uid->$user
...
Signed-off-by: Roger Szabo <roger.szabo@web.de>
2017-07-10 18:46:39 +08:00
33cb45d4a3
Fix owner cloud id in unshare activity
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-07-10 12:20:56 +02:00
b69ddfba8b
Fix activity emails for accept/decline of remote shares
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-07-10 12:10:36 +02:00
c7b28064e3
Merge pull request #5649 from nextcloud/fix-5611
...
fix alignment of radio button and its label in encryption settings
2017-07-10 09:26:05 +02:00
46e813e749
Enable the toggleSelect extension in multi-select dropdowns
...
The toggleSelect extension for Select2 makes possible to unselect items
in a multi-select dropdown by clicking on them; this behaviour should be
enabled in all the multi-select dropdowns used in the server.
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-07-10 03:38:22 +02:00
4f7fafb5c5
[tx-robot] updated from transifex
2017-07-10 00:08:41 +00:00
cf8db31bce
[tx-robot] updated from transifex
2017-07-09 00:08:31 +00:00
f59062ce83
[tx-robot] updated from transifex
2017-07-08 00:08:27 +00:00
c46006934c
fix alignment of radio button and its label in encryption settings
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-07-07 16:59:28 +02:00
b4deba2078
Merge pull request #5483 from nextcloud/issue-5075-png-files-for-activity-emails
...
Use PNGs for icons in activity emails
2017-07-07 11:05:00 +02:00
f8735a3205
recognize groupOfUniqueNames as valid LDAP group object
...
This was already partly done in f88109b
2017-07-07 08:29:58 +02:00
d23bc9a99a
[tx-robot] updated from transifex
2017-07-07 00:08:24 +00:00
001a9c02dd
adjust encryption tests to the new master key default
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-07-06 11:47:12 +02:00
c46b158e10
update sharing test to new master key default
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-07-06 11:47:12 +02:00
f186a5cfb1
fix and extend dav test to also test the master-key setup
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-07-06 11:47:11 +02:00
d668e17769
since the default for the master key changed we need to write the setting explicitely to the database if we migrate from a older version
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-07-06 11:47:11 +02:00
66debbe18e
add occ command to disable the master key again
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-07-06 11:47:11 +02:00
5f75468aa4
improve status messages
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-07-06 11:47:11 +02:00
28a7e72868
after the master key was loaded we are ready to go, no re-login needed
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-07-06 11:47:10 +02:00
da51ec38f4
only collect detailed access list if it is really needed
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-07-06 11:33:08 +02:00
9c5ba2f12c
make master key the new default
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-07-06 11:33:03 +02:00
984953ef4a
[tx-robot] updated from transifex
2017-07-06 00:08:44 +00:00
60398b919b
Merge pull request #5231 from nextcloud/migrations
...
Migrations
2017-07-05 17:32:40 +02:00
ca565644b3
Merge pull request #5621 from nextcloud/fix-sorting-of-favorite-files-in-file-list
...
Fix sorting of favorite files in file list
2017-07-05 17:31:41 +02:00
6879573b2e
Merge pull request #5580 from nextcloud/admin-audit-update
...
Admin audit update
2017-07-05 16:16:00 +02:00
be56374c51
Fix sorting of favorite files
...
The sort comparator checks the "isFavorite" property of the FileInfo
objects to compare. That property is set when the file list is loaded
and the response from the server is parsed, and thus a freshly loaded
file list has the proper sorting for favorite files. However, the
property is not set in other cases, like when the FileInfo objects are
derived from FileInfoModels due to a file being marked as a favorite or
a text editor being closed, which causes the file to be sorted in the
wrong position.
There is no need to add the property in those situations, though; in all
cases the TagsPlugin adds a "tags" array property that contains an
OC.TAG_FAVORITE tag, so that tag can be checked instead of "isFavorite".
Moreover, although "isFavorite" was added by the main "_parseFileInfo"
function it did not really belong there but to the "FileInfoParser" from
the TagsPlugin; however, as that property now is not used anywhere it
was removed altogether.
A cleaner solution would have been to make the sort comparator
extensible by plugins like other behaviours of the file list and then
add the sorting logic related to favorite files to the TagsPlugin.
However, right now only the TagsPlugin would need to alter the main
sorting logic, and it seems like a corner case anyway. Even if it is
implemented as a plugin, favorite files is a core feature, so for the
time being it will be taken into account directly in the main sorting
logic; making the sort comparator extensible by plugins is defered until
there are other use cases for that.
Fixes #5410
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-07-05 15:01:23 +02:00
fe6e8c2710
Fix dropping tables and handle the prefix automatically
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-07-05 13:02:16 +02:00
543c181ec5
Move twofactor_backupcodes to migrations
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-07-05 13:02:16 +02:00
d8af9d4c9b
Merge pull request #5557 from nextcloud/dont-log-passwords-on-dav-exceptions-either
...
Don't log passwords on dav exceptions
2017-07-05 11:58:32 +02:00
e836efe68b
Merge pull request #5569 from GitHubUser4234/ldap_password_renew_nc12fix
...
Ldap password renewal fixes for NC12
2017-07-05 11:49:13 +02:00
Nextcloud bot
Lukas Reschke
Morris Jobke
Daniel Calviño Sánchez
Roeland Jago Douma
Joas Schilling
Marin Treselj
Allan Nordhøy
Roeland Jago Douma
Julius Härtl
Robin Appelman
Bjoern Schiessle
Jarkko Lehtoranta
Arthur Schiwon
Stephan Müller
Maxence Lange
Roger Szabo
Tobias Brunner