Commit Graph

1365 Commits

Author SHA1 Message Date
Morris Jobke 13fa0e2a9d Fix implied evals and doubled definition of variable
fixes #7119
fixes #7120
fixes #7121
fixes #7122
2014-02-07 17:47:42 +01:00
Jan-Christoph Borchardt 61aa6ead83 Merge pull request #6490 from owncloud/theming-for-appstemplate
do not show 'Add app' and 'More apps' for themed ownCloud
2014-02-05 16:49:07 +01:00
Jan-Christoph Borchardt 13ed59c1cf merge master into mobile-style 2014-01-29 10:55:44 +01:00
Morris Jobke d182b4f59f Merge pull request #6927 from owncloud/enc_dont_reload_page_on_decrypt
remove the form, it isn't needed here
2014-01-27 04:30:06 -08:00
Jan-Christoph Borchardt 150d3856a0 prevent autofill for password change settings, prevent leak of existing password, fix #6552 2014-01-24 18:58:56 +01:00
Bjoern Schiessle 6bb27ea76b disable button and input field during decryption 2014-01-24 12:15:06 +01:00
Bjoern Schiessle 2a3cb7ac5b remove the form, it isn't needed here 2014-01-24 11:41:24 +01:00
Jan-Christoph Borchardt 5956277ed4 Merge pull request #6234 from owncloud/change-email-by-enter
change mail address by pressing enter - fixes #6179
2014-01-23 08:03:22 -08:00
Thomas Müller f950ce82ae Merge branch 'master' into mobile-style
Conflicts:
	apps/files/js/files.js
	apps/files_sharing/css/public.css
	apps/files_sharing/js/public.js
	apps/files_sharing/templates/public.php
2014-01-23 00:39:11 +01:00
Morris Jobke 80dead5a9f fix double call of changeEmailAddress() 2014-01-18 22:59:49 +01:00
Bjoern Schiessle 80d871ab1e added website field 2014-01-17 16:35:48 +01:00
Bjoern Schiessle e2de3b8337 distinguish app links from doc links 2014-01-17 16:08:32 +01:00
Bjoern Schiessle bf0471a92e show link to app documentation 2014-01-17 14:56:25 +01:00
Bjoern Schiessle d36da7e43a use appstoreenabled config switch 2014-01-16 12:58:17 +01:00
Björn Schießle 45709937af Merge pull request #6786 from wakeup/master
Fix untranslated text when deleting user
2014-01-16 03:22:55 -08:00
Volkan Gezer 97b0840bbe Fix untranslated text when deleting user
This should fix issue #6728
2014-01-15 18:40:04 +01:00
Jan-Christoph Borchardt 5f95356592 remove unused log icon 2014-01-15 15:48:42 +01:00
Morris Jobke 5c1a9f35f1 Indicate password strength using strengthify
* uses zxcvbn
 * outsourced to separate jquery plugin
 * async loading
 * hide strength meter if input is empty
 * feedback if user enters weakest password
 * fade in and out
 * show tipsy with strength
 * Opera 12, IE8-10, FF 23, Chromium 29
2014-01-15 11:10:12 +01:00
Thomas Müller 92969052d7 remove ru_RU - it has bee removed from transifex 2014-01-13 16:41:10 +01:00
Jenkins for ownCloud 0e843b9d7d [tx-robot] updated from transifex 2014-01-06 01:55:59 -05:00
Jenkins for ownCloud e4616199df [tx-robot] updated from transifex 2014-01-05 01:55:53 -05:00
Jenkins for ownCloud aaa48576ee [tx-robot] updated from transifex 2014-01-04 01:55:57 -05:00
Jenkins for ownCloud 095f9b8ee0 [tx-robot] updated from transifex 2014-01-02 01:56:21 -05:00
Jenkins for ownCloud e345f3f511 [tx-robot] updated from transifex 2013-12-29 01:55:36 -05:00
Jenkins for ownCloud dbbd99db09 [tx-robot] updated from transifex 2013-12-24 01:55:40 -05:00
Jenkins for ownCloud f60ecfc7fd [tx-robot] updated from transifex 2013-12-22 01:56:05 -05:00
Jenkins for ownCloud cd26631a6d [tx-robot] updated from transifex 2013-12-21 01:56:13 -05:00
Jenkins for ownCloud 37cdbc3be0 [tx-robot] updated from transifex 2013-12-19 01:57:03 -05:00
Jan-Christoph Borchardt 3c21fd5bfc do not show 'Add app' and 'More apps' for themed ownCloud 2013-12-18 14:59:57 +01:00
Jenkins for ownCloud 6488ff2c75 [tx-robot] updated from transifex 2013-12-17 16:43:17 -05:00
Jenkins for ownCloud a99dd3183c [tx-robot] updated from transifex 2013-12-17 06:46:52 -05:00
Jenkins for ownCloud 77b68505c2 [tx-robot] updated from transifex 2013-12-13 14:44:31 -05:00
Jenkins for ownCloud 7b20212c0a [tx-robot] updated from transifex 2013-12-11 13:32:13 -05:00
Morris Jobke bc23f46198 fix typo 2013-12-09 16:05:10 +01:00
Jenkins for ownCloud 079d20a80e [tx-robot] updated from transifex 2013-12-07 22:28:29 -05:00
Morris Jobke 44a55056e7 change mail address by pressing enter - fixes #6179 2013-12-07 17:33:27 +01:00
Vincent Petry db0b291f63 Merge pull request #6213 from owncloud/fix-full-name-edit
Fix full name edit for repetitive edit
2013-12-06 06:46:34 -08:00
Morris Jobke ac77218d57 parent().parent() -> closest() 2013-12-06 13:53:01 +01:00
Jenkins for ownCloud 4dd84b3627 [tx-robot] updated from transifex 2013-12-05 22:24:39 -05:00
Morris Jobke 008bfc6793 Fix full name edit for repetive edit
fixes #6212

fixes the data attributes after edit
fixes markup to successfully re-edit display name
2013-12-05 23:44:59 +01:00
Jenkins for ownCloud 7e702f294f [tx-robot] updated from transifex 2013-12-04 18:14:17 -05:00
Frank Karlitschek 61296ed7bb lower required php version to 5.3.3 2013-12-04 10:25:22 +01:00
Jenkins for ownCloud 83ec234f53 [tx-robot] updated from transifex 2013-12-02 17:28:29 -05:00
Jenkins for ownCloud 1b18c5a047 [tx-robot] updated from transifex 2013-11-29 14:10:40 -05:00
Jenkins for ownCloud 4a78f12682 [tx-robot] updated from transifex 2013-11-27 12:10:54 -05:00
Morris Jobke 8506d2bf42 fix wording 2013-11-27 00:38:56 +01:00
Morris Jobke 2d822e3b95 add warning for HTTP connection 2013-11-27 00:05:48 +01:00
blizzz 4f15282bc9 Merge pull request #6058 from owncloud/ldap2avatar
Set Avatar for LDAP users automatically (if a picture is available)
2013-11-26 12:05:32 -08:00
Jenkins for ownCloud fb7aa2f014 [tx-robot] updated from transifex 2013-11-26 10:47:07 -05:00
Bjoern Schiessle 2556647a10 check if user is logged in 2013-11-26 12:47:59 +01:00