Commit Graph

3613 Commits

Author SHA1 Message Date
Jenkins for ownCloud dc506dcfbf [tx-robot] updated from transifex 2014-12-11 01:55:27 -05:00
Jan-Christoph Borchardt 880e653aef improve update error page: adjust line height of h2 2014-12-10 13:39:30 +01:00
Jan-Christoph Borchardt 5c36b0bf5d improve update error page: remove box, make link visible, insert missing space, remove line break 2014-12-10 13:30:28 +01:00
Jenkins for ownCloud ea95bb0189 [tx-robot] updated from transifex 2014-12-10 01:55:34 -05:00
Thomas Müller 7028c7150d Merge pull request #12664 from owncloud/fix-12164
Use httphelper and cache response even when it is empty
2014-12-10 05:42:08 +01:00
Victor Dubiniuk c9fd3c9d29 Inject config 2014-12-10 01:13:38 +03:00
Morris Jobke bfcd5a3802 Merge pull request #11214 from owncloud/issue/10836
Add an option to disallow sending sharing emails to non-owncloud users
2014-12-09 14:05:52 +01:00
Joas Schilling 539c0aeb04 Add an option to disallow sending sharing emails to non-owncloud users
Fix #10836
2014-12-09 11:32:39 +01:00
Thomas Müller e61f24f2aa Merge pull request #12651 from owncloud/add-requesttoken-to-base-template
Add requesttoken to base template
2014-12-09 11:03:46 +01:00
Victor Dubiniuk 303fce44f4 Use httphelper and cache response even when it empty 2014-12-06 20:17:47 +03:00
Lukas Reschke 2b76227180 Check for working .htaccess via AJAX
Fixes https://github.com/owncloud/core/issues/12650
2014-12-06 15:34:53 +01:00
Lukas Reschke be19e78e69 Add requesttoken to base template
Potentially fixes https://github.com/owncloud/core/issues/12580
2014-12-05 22:23:55 +01:00
Morris Jobke 5f66cb3250 Merge pull request #12561 from oparoz/vectoricon
Improve the bitmap and vector mime icons
2014-12-05 14:51:03 +01:00
Olivier Paroz ab3381d386 PNG and SVG have been compressed 2014-12-05 01:47:44 +01:00
Arthur Schiwon ee168a121d Forward port of #12493
add ldap-search command to occ

Conflicts:
	apps/user_ldap/appinfo/register_command.php

LDAP search filter creation changes:

1. do not prepend * wildcard to search terms. Will result in faster search, but
you don't find "foobar"  when looking for "bar"
2. advanced behaviour when search string contains a space and multiple search
attributes are present. The search string is split into single words. The
resulting filter requires that each word at least appears once in any search
attribute. This is supposed to return better results in big LDAPs.

trim search string before passing it on
2014-12-04 19:02:09 +01:00
Morris Jobke c5ee95a49e Merge pull request #12522 from owncloud/bower-jstz
Bower jstz
2014-12-04 11:58:46 +01:00
Volkan Gezer 7dcf0b02aa Merge pull request #12563 from owncloud/usermenu-remove-border
remove border from user menu, adjust to apps menu
2014-12-03 12:11:21 +01:00
Olivier Paroz 5990293331 Improve the bitmap and vector mime icons
* Vector files such as Illustrator files currently show the "image"
icon. I propose to add a new type to mimetypeIcon() called
"image/vector" and which would be used by SVG as well
* We can use the current image-svg+xml icon, but would simply rename it
to image-vector
* The black and white "image" icon looks too much like a settings icon.
A simple picture representation pasted over the file icon should work
2014-12-02 21:11:56 +01:00
Morris Jobke 48f00df08e move jstz to bower management 2014-12-01 10:40:31 +01:00
Morris Jobke fefeb506b2 include lock files of bower to be able to use "bower install" 2014-12-01 10:30:15 +01:00
Jenkins for ownCloud 83d097c524 [tx-robot] updated from transifex 2014-11-29 01:54:28 -05:00
Jan-Christoph Borchardt e7ed62b2c8 remove border from user menu, adjust to apps menu 2014-11-28 09:35:50 +01:00
Jenkins for ownCloud 96b0328d39 [tx-robot] updated from transifex 2014-11-28 01:55:29 -05:00
Morris Jobke 4ed0a418a0 Merge pull request #12414 from owncloud/delay-autoconfig-kill-2
autoconfig.php only to be deleted on successful installation
2014-11-26 11:05:23 +01:00
Jenkins for ownCloud 3766d98df6 [tx-robot] updated from transifex 2014-11-26 01:54:31 -05:00
Thomas Müller b68c07d687 autoconfig.php only to be deleted on successful installation 2014-11-25 11:14:35 +01:00
Thomas Müller e956bd1094 Merge pull request #12359 from owncloud/fix-redirect-url-for-password-change
Use `/` as redirect location if webroot is set to an empty value
2014-11-24 11:09:17 +01:00
Vincent Petry 49ad10cfd0 Merge pull request #12362 from owncloud/add-ocs-header-per-default
Add OCS API header per default
2014-11-24 11:09:00 +01:00
Jenkins for ownCloud 0edcfc1dc1 [tx-robot] updated from transifex 2014-11-24 01:54:35 -05:00
Jenkins for ownCloud fa3f7ad9e9 [tx-robot] updated from transifex 2014-11-22 01:55:21 -05:00
Lukas Reschke 8c2aeb9b21 Add OCS API header per default
Relieve @PVince from having to write it all the time ;-)
2014-11-21 19:54:19 +01:00
Lukas Reschke 0fa8b449b2 Use `/` as redirect location if webroot is set to an empty value
If the webroot has been set to an empty value or ownCloud has been installed at the root location (`/``) there is a fair chance that the redirect for password resets does not work at all.

This means that while the password is getting resetted the user is not redirected to the login page.

I'm aware that it might be better to just set the webroot to `/` in those cases but this patch is better in the regard that it cannot break stuff.

Thanks to @PVince81 for helping me debugging this. (I'm a moron and assumed it couldn't be THAT easy)

Reported by @cdamken
2014-11-21 15:38:36 +01:00
Jenkins for ownCloud f8421958b3 [tx-robot] updated from transifex 2014-11-21 02:54:26 -05:00
Morris Jobke 985f8c3f69 Merge pull request #12330 from owncloud/jenkins-eat-that
drop dependency of some commands on old config object
2014-11-20 17:11:08 +01:00
Morris Jobke 8ae8eb4734 drop dependency of some commands on old config object 2014-11-20 15:03:16 +01:00
Volkan Gezer 995fe4a176 cleanup languages. closes #11274 2014-11-20 14:46:17 +01:00
Vincent Petry 10d0883da9 Merge pull request #12257 from owncloud/l10n-loadtranslationsfromjs
Added function to load translations from JS
2014-11-20 10:53:46 +01:00
Jenkins for ownCloud fffc5bc002 [tx-robot] updated from transifex 2014-11-20 01:55:06 -05:00
Vincent Petry ffe57d89e4 Fix l10n promises 2014-11-19 17:02:17 +01:00
Vincent Petry 1c5933c96c Better use of promise in OC.L10N.load() 2014-11-19 14:49:15 +01:00
Lukas Reschke 1c8f9564a4 Merge pull request #11696 from owncloud/addWarningToEncryptionLostPassword
Warn for password reset when files_encryption is enabled
2014-11-19 13:05:02 +01:00
Vincent Petry cd60a27ad6 Remove stray generateUrl 2014-11-19 10:59:38 +01:00
Jenkins for ownCloud 705976ba0a [tx-robot] updated from transifex 2014-11-19 01:54:59 -05:00
Vincent Petry 152da9796b Added function to load translations from JS
For apps that support async translation loading, a new function
OC.L10N.load() can be used to asynchronously load the translations
for a given app.
2014-11-18 12:20:01 +01:00
Morris Jobke 345eb62ffa center spinner 2014-11-18 10:25:16 +01:00
Lukas Reschke 9eeea57e3a Show spinner 2014-11-17 17:50:25 +01:00
Morris Jobke 68e77f4659 fix unreadable label in warning box 2014-11-17 17:50:20 +01:00
Lukas Reschke f530865b3d Hide submit button after password change
Creating a new key pair can take 1-2 seconds. So it could happen that the user click the "Reset password" button again which can lead to many nasty things, e.g. we could create two new key pairs in parallel.
2014-11-17 17:50:20 +01:00
Bjoern Schiessle 11ab457b72 add password as parameter to the signal so that the encryption can create a new key-pair 2014-11-17 17:50:19 +01:00
Lukas Reschke 357465eac9 Add "postPasswordReset" hook 2014-11-17 17:50:19 +01:00