Commit graph

41550 commits

Author SHA1 Message Date
Abijeet
ac14d02e1e Added newline to end of htaccess file
Signed-off-by: Abijeet <abijeetpatro@gmail.com>
2017-12-18 21:40:02 +05:30
Abijeet
ec28c54dbc Adds search by email function on the users screen.
Fixes #7175.

- Updated the query to fetch the users in users > everyone tab.
- Updated the query to fetch the users in users > admin tab.
- Tested to ensure that the disabled users are also being fetched.
- Added test cases.

Signed-off-by: Abijeet <abijeetpatro@gmail.com>
2017-12-16 17:18:05 +05:30
Nextcloud bot
bd1e357eef
[tx-robot] updated from transifex 2017-12-03 01:10:22 +00:00
Nextcloud bot
cec236f0af
[tx-robot] updated from transifex 2017-12-02 01:10:32 +00:00
Morris Jobke
dc10a31a4a
Merge pull request #7361 from nextcloud/cheap-check-first
check userExists later, saves lookups for appData_INSTANCEID userids
2017-12-01 12:28:56 +01:00
Morris Jobke
007fba6fd9
Merge pull request #7347 from nextcloud/fix-3245
Allow to skip data dir permission checks by config
2017-12-01 11:53:12 +01:00
Arthur Schiwon
65d7468bf3
check userExists later, saves lookups for appData_INSTANCEID userids
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-12-01 11:47:56 +01:00
Nextcloud bot
ffc627e18e
[tx-robot] updated from transifex 2017-12-01 01:10:20 +00:00
Joas Schilling
288f50bdc7
Merge pull request #7346 from nextcloud/fix-federation-scope-menu-l10n
Fix translation of federation scope menu
2017-11-30 12:29:16 +01:00
Arthur Schiwon
1b7dfd73af
Allow to skip data dir permission checks by config
Enables installation on services that don't allow/support permission
changes.

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-11-30 11:16:00 +01:00
Morris Jobke
3b390ef430
Fix translation of federation scope menu
* l10n in Nextcloud works by extracting the values only passed on their location and not based on the first parameter
* we need to change the translation pool from `core` to `settings` then
* fixes #7345

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-11-30 11:13:16 +01:00
Nextcloud bot
49ec86a81f
[tx-robot] updated from transifex 2017-11-30 01:13:19 +00:00
Morris Jobke
87aa0723f8
Merge pull request #7343 from nextcloud/fix_exception_on_unreachable_server_take2
Actually set the status so we don't cause another exception
2017-11-29 21:13:55 +01:00
Roeland Jago Douma
d24b6866b1
Actually set the status so we don't cause another exception
* And add tests so I don't mess up again

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-11-29 16:37:54 +01:00
Roeland Jago Douma
a9eb0d4a40
Merge pull request #7338 from nextcloud/fix_exception_on_unreachable_server
Do not log Exception if a connection error occured
2017-11-29 16:03:23 +01:00
Roeland Jago Douma
f03aa0480a
Merge pull request #7316 from nextcloud/fix-silent-conflicts-due-to-merging-7256-after-7251
Fix silent conflicts due to merging #7256 after #7251
2017-11-29 15:38:24 +01:00
Roeland Jago Douma
6097b74970
Merge pull request #7333 from nextcloud/mario-readme-patch
Update README.md
2017-11-29 14:19:09 +01:00
Roeland Jago Douma
79554a29e0
Do not log Exception if a connection error occured
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-11-29 13:06:32 +01:00
Mario Đanić
3c0d6ccbed
Update README.md
authentification is not a real word :)
2017-11-29 09:09:11 +01:00
Nextcloud bot
095eba0aa3
[tx-robot] updated from transifex 2017-11-29 01:10:12 +00:00
blizzz
0597cca596
Merge pull request #7327 from nextcloud/bugfix/7325/access-list-regression-for-not-current-accesss
Only in case of $currentAccess the array uses the user id as index
2017-11-28 17:57:44 +01:00
Joas Schilling
80b34f5f7d
Only in case of $currentAccess the array uses the id as index
Otherwise its a normal string[] with the user ids, in that
case the array_merge did it's job just fine, apart from it
not being deduplicated.
The array+array is only needed when the user id is the key,
so integer only user ids are kept as they are instead of being
reindexed.

Regression from 3820d6883d

Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-11-28 17:17:51 +01:00
Joas Schilling
2a01c0f3f6
Fix current access list test and add one for $currentAccess === false
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-11-28 17:17:34 +01:00
Daniel Calviño Sánchez
0c45778219 Fix silent conflicts due to merging #7256 after #7251
Although #7256 was merged cleanly some of the changes really conflicted
with those introduced by the last commit of #7251, and this broke the
appearance of the author row of comments. This commit fixes those silent
conflicts and restores the appearance of the author row.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-11-28 02:35:39 +01:00
Nextcloud bot
a0ce2c1204
[tx-robot] updated from transifex 2017-11-28 01:09:52 +00:00
Morris Jobke
7d9e475434
Merge pull request #7303 from nextcloud/fix-contact-menu
Fix contacts menu height for Safari
2017-11-27 18:30:06 +01:00
Morris Jobke
3f7267e0e9
Merge pull request #6901 from nextcloud/bugfix/4014/catch_parsing_error
catch errors when parsing calendar data for calendar query requests
2017-11-27 17:50:37 +01:00
Morris Jobke
3e1860e3d6
Merge pull request #7305 from nextcloud/log-level-for-log-extending
Pass log level to log reporters
2017-11-27 17:49:46 +01:00
Lukas Reschke
4d200851f9
Merge pull request #7292 from Neraste/fix/4789_disabled_users
Fix #4789: Group admins cannot see disabled users
2017-11-27 17:29:59 +01:00
Morris Jobke
573551253e
Merge pull request #7308 from nextcloud/do-not-log-InvalidSyncToken
Log InvalidSyncToken on DAV in debug level
2017-11-27 17:27:41 +01:00
Lukas Reschke
5cc8ea8feb
Merge pull request #7307 from nextcloud/do-not-log-not-implemented-dav
Log NotImplementedException on DAV in debug level
2017-11-27 17:25:56 +01:00
Georg Ehrke
ea117bac31
catch errors when parsing calendar data for calendar query requests
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2017-11-27 17:14:18 +01:00
Morris Jobke
132764bff5
Pass log level to log reporters
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-11-27 16:46:47 +01:00
blizzz
f700cd14fa
Merge pull request #7222 from nextcloud/fix-filerow-avatars
Fix filerow avatars
2017-11-27 16:46:11 +01:00
Morris Jobke
4a63727ed9
Merge pull request #7210 from nextcloud/pg10
add postgresql 10 compatibility to dbal
2017-11-27 16:40:58 +01:00
Morris Jobke
88905c6293
Log InvalidSyncToken on DAV in debug level
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-11-27 16:37:11 +01:00
Morris Jobke
26a5fff423
Log NotImplementedException on DAV in debug level
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-11-27 16:17:01 +01:00
Lukas Reschke
b331c67859
Bump thirdparty ref
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-11-27 15:20:42 +01:00
blizzz
e428ef9d75
Merge pull request #7256 from nextcloud/fix-cursor-for-avatar-and-user-names-in-comments
Fix cursor for avatar and user names in comments
2017-11-27 15:14:40 +01:00
Morris Jobke
cfae590ac9
Merge pull request #7266 from nextcloud/fix-input-field-not-disabled-while-a-comment-is-being-sent
Fix input field not disabled while a comment is being sent
2017-11-27 13:40:03 +01:00
Morris Jobke
152b2824dc
Fix contacts menu height for Safari
* fixes #5119
* in Safari the input field was 38px in height and not 34px like in all other browsers

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-11-27 13:32:05 +01:00
Lukas Reschke
e02229e412
Merge pull request #7246 from william-p/Add_html5_audioplayer_public
Add HTML5 audio player in public view
2017-11-27 12:32:21 +01:00
Morris Jobke
7bb42438fa
Merge pull request #7280 from nextcloud/fix-working-icon-position-when-sending-or-deleting-a-comment
Fix working icon position when sending or deleting a comment
2017-11-27 12:19:21 +01:00
Morris Jobke
c5446ebd9a
Merge pull request #7251 from nextcloud/contact-menu-position-fix
Fixed contact menu position on comments
2017-11-27 12:14:30 +01:00
Lukas Reschke
fb1a92b07d
Merge pull request #7295 from nextcloud/remove-unused-method
Remove unused mimetype detection method in OC_Image
2017-11-27 11:55:20 +01:00
Lukas Reschke
d15ca9ffaf
Replace with non-deprecated JS call
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-11-27 11:53:24 +01:00
Lukas Reschke
8ccb486876
Merge pull request #7264 from nextcloud/cache-fetched-apps
Cache fetched apps in update check
2017-11-27 11:48:59 +01:00
Morris Jobke
f0d809fdde
Merge pull request #7298 from nextcloud/fix-wording
Fix a sentence in the README
2017-11-27 11:32:03 +01:00
Morris Jobke
4b73ddc9ce
Merge pull request #6437 from nextcloud/support-mail-send-in-share
Add support for `\OCP\Share\IShare::getMailSend` back
2017-11-27 11:29:38 +01:00
Morris Jobke
7a88c34c2c
Fix a sentence in the README
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-11-27 11:23:56 +01:00