Commit Graph

3197 Commits

Author SHA1 Message Date
Vincent Petry da4ba82b83 Use OC.Backbone instead of Backbone directly in authtoken JS code
Fixes asset pipeline issue with the auth token in personal page
2016-06-23 18:26:01 +02:00
Vincent Chan 75cd7df4fb select css changes in setting/admin 2016-06-23 12:37:58 +02:00
Hendrik Leppelsack e5d8726859 remove ie8+9 support 2016-06-23 12:34:53 +02:00
Jenkins for ownCloud 1e1903e4fe [tx-robot] updated from transifex 2016-06-23 02:09:38 -04:00
Vincent Petry 293ae8a8cf Merge pull request #25134 from owncloud/app-passwords
app passwords/device tokens wording
2016-06-22 13:50:11 +02:00
Jenkins for ownCloud b85bcccc09 [tx-robot] updated from transifex 2016-06-22 01:54:55 -04:00
Christoph Wurst 178fa11ec1
use theme name instead of hard-coded 'ownCloud' 2016-06-21 16:39:51 +02:00
Christoph Wurst 2c1db51e7c
fix tranlations 2016-06-21 16:39:51 +02:00
Christoph Wurst 31f3aaa36b
app passwords/device tokens wording 2016-06-21 16:39:51 +02:00
Christoph Wurst 7f22aeb5d6 redirect to new login route (#25099)
* redirect to new login route

* encode anchor in url and restore it client-side
2016-06-21 16:14:51 +02:00
Christoph Wurst 195fc5b048 Merge pull request #25196 from owncloud/update-session-token-password
update session token password on user password change
2016-06-21 15:39:01 +02:00
Vincent Petry af98e3e641 Merge pull request #25042 from owncloud/session-settings-ellipsis
add overflow ellipsis to session and device tokens list
2016-06-21 12:15:38 +02:00
Christoph Wurst db11c20dcb
pass new password instead of username 2016-06-21 11:54:54 +02:00
Lukas Reschke 2b493e2f9d
Merge remote-tracking branch 'upstream/master' into master-sync-upstream 2016-06-21 11:18:22 +02:00
Christoph Wurst b805908dca
update session token password on user password change 2016-06-21 10:24:25 +02:00
Jenkins for ownCloud 0e575c7eea [tx-robot] updated from transifex 2016-06-21 03:49:50 -04:00
Morris Jobke 232ab8f6dd Merge pull request #122 from nextcloud/readd-labels-for-usability
Re-add labels for password inputs for usability
2016-06-20 15:14:00 +02:00
Morris Jobke 19b531fd14
fix more strings 2016-06-20 13:14:24 +02:00
Morris Jobke 7a09b3daff
fix translations 2016-06-20 08:28:54 +02:00
Jenkins for ownCloud bd13353c4d [tx-robot] updated from transifex 2016-06-20 01:54:50 -04:00
Timo Witte 205e936370 rename owncloud to nextcloud in Official apps button popup 2016-06-20 01:58:39 +02:00
Vincent Petry a5a66f38f1
Fix tooltip position in token list 2016-06-17 15:11:31 +02:00
Jenkins for ownCloud cc532bb14a [tx-robot] updated from transifex 2016-06-17 02:00:01 -04:00
Morris Jobke 41e48de84e
Use blue as approved color in app management
* only changing the color - based on #53
2016-06-16 13:09:55 +02:00
Morris Jobke b729703b6c
Re-add labels for password inputs for usability
* ref https://github.com/nextcloud/server/pull/112#discussion_r67245286
2016-06-16 13:07:22 +02:00
Jenkins for ownCloud d08eee489f [tx-robot] updated from transifex 2016-06-16 02:32:23 -04:00
blizzz 700ff6da58 Merge pull request #112 from nextcloud/drop-useless-ie8-stuff
Drop useless IE8 rules
2016-06-15 22:58:34 +02:00
Morris Jobke a95b572f1a
Drop useless IE8 rules 2016-06-15 15:30:23 +02:00
Morris Jobke ea25be51da
fix strengthify in personal settings 2016-06-15 15:27:40 +02:00
Jenkins for ownCloud be4a29d75f [tx-robot] updated from transifex 2016-06-15 05:54:49 +00:00
Jenkins for ownCloud 5887afbb37 [tx-robot] updated from transifex 2016-06-14 08:02:15 +02:00
Arthur Schiwon ae02685e6f
Merge branch 'master' of https://github.com/owncloud/core into downstream-160614 2016-06-14 01:06:25 +02:00
Jenkins for ownCloud 3840466f9a [tx-robot] updated from transifex 2016-06-13 12:21:11 +00:00
Arthur Schiwon 42c66efea5
Merge branch 'master' of https://github.com/owncloud/core into downstream-160611 2016-06-11 15:34:43 +02:00
Lukas Reschke edf62eb41a
Add user ID to log entries in admin page 2016-06-10 15:38:21 +02:00
Joas Schilling 372213b052 Add developer documentation, website and bug to the applist (#25041) 2016-06-10 15:15:27 +02:00
Christoph Wurst 663459ca26
rearrange personal settings sections 2016-06-10 14:58:30 +02:00
Christoph Wurst a9ea908413
add tooltip to token names 2016-06-10 14:49:56 +02:00
Christoph Wurst d0d1684588
add overflow ellipsis to session and device tokens list 2016-06-10 14:15:27 +02:00
Jenkins for ownCloud e8a66f8e7d [tx-robot] updated from transifex 2016-06-10 05:55:19 +00:00
Arthur Schiwon a636e4ff28
Downstream 2016-06-09
Merge branch 'master' of https://github.com/owncloud/core into downstream-160609
2016-06-09 18:45:12 +02:00
blizzz 51fd2602a7 Revert "Downstream 2016-06-08" 2016-06-09 17:41:57 +02:00
Jörn Friedrich Dreyer 75870c943c
decrease initial users to load to 50
Prevents timeouts on the initial loading of users. proper fix will be in https://github.com/owncloud/core/pull/10994
Workaround for https://github.com/owncloud/core/issues/24734
2016-06-09 14:00:00 +02:00
Vincent Petry 90c1ec1c49 Merge pull request #25014 from owncloud/admin-datadircheck-fix
Use temporary htaccesstest.txt for data dir security check
2016-06-09 11:58:28 +02:00
Jenkins for ownCloud 355f50bd6c [tx-robot] updated from transifex 2016-06-09 06:16:41 +00:00
Jan-Christoph Borchardt 81145ee57c THIS IS NEXTCLOUD! adjusting the design 2016-06-08 17:02:18 +02:00
Vincent Petry fb087a0261
Use temporary htaccesstest.txt for data dir security check 2016-06-07 18:36:13 +02:00
Jörn Friedrich Dreyer 2989584b45 decrease initial users to load to 50
Prevents timeouts on the initial loading of users. proper fix will be in https://github.com/owncloud/core/pull/10994
Workaround for https://github.com/owncloud/core/issues/24734
2016-06-07 11:40:04 +02:00
Jenkins for ownCloud fb5fb6a9b5 [tx-robot] updated from transifex 2016-06-06 06:51:58 -04:00
Jenkins for ownCloud c0a91ddca7 [tx-robot] updated from transifex 2016-06-05 02:00:36 -04:00
Jenkins for ownCloud 4234892a60 [tx-robot] updated from transifex 2016-06-04 02:01:18 -04:00
Vincent Petry 2d5bee0661 Merge pull request #24954 from owncloud/issue-24536-language-name-reused-for-fallback-languages
Do not use the language name, when it's not the one from the language…
2016-06-03 10:50:59 +02:00
Jenkins for ownCloud f9f8fb7bf2 [tx-robot] updated from transifex 2016-06-02 01:55:16 -04:00
Joas Schilling 1b5797a4e5
Do not use the language name, when it's not the one from the language we want 2016-06-01 17:07:51 +02:00
Vincent Petry 7b4459d28d Merge pull request #24912 from owncloud/session-tokens-apache-auth
Create session tokens for apache auth users
2016-06-01 10:56:10 +02:00
Jenkins for ownCloud a9f666f36e [tx-robot] updated from transifex 2016-06-01 01:56:03 -04:00
Christoph Wurst c58d8159d7
Create session tokens for apache auth users 2016-05-31 17:07:49 +02:00
MTRichards 397da7620e Update personal.php (#24923) 2016-05-31 15:58:02 +02:00
Vincent Petry ba6226259d Merge pull request #24889 from owncloud/add-warning-wrong-transaction-isolation-level
Add a warning when the transaction isolation level is not READ_COMMITED
2016-05-31 10:13:23 +02:00
Jenkins for ownCloud b2e524b936 [tx-robot] updated from transifex 2016-05-31 01:54:58 -04:00
Joas Schilling 4da5a74192
Add a warning when the transaction isolation level is not READ_COMMITED 2016-05-30 12:31:33 +02:00
Jenkins for ownCloud c870e77546 [tx-robot] updated from transifex 2016-05-29 01:55:25 -04:00
Jenkins for ownCloud c778fa062c [tx-robot] updated from transifex 2016-05-28 01:55:21 -04:00
Jenkins for ownCloud a95275d27b [tx-robot] updated from transifex 2016-05-27 01:55:35 -04:00
Lukas Reschke aba539703c
Update license headers 2016-05-26 19:57:24 +02:00
Jenkins for ownCloud 567381e361 [tx-robot] updated from transifex 2016-05-26 01:56:23 -04:00
Joas Schilling cbba55a26c
Move Group_LDAP and Group_Proxy to PSR-4 2016-05-25 16:04:56 +02:00
Jenkins for ownCloud 6972f4dc50 [tx-robot] updated from transifex 2016-05-25 02:03:38 -04:00
Jenkins for ownCloud f1f7511c61 [tx-robot] updated from transifex 2016-05-24 15:24:38 -04:00
Vincent Petry d3fb5d618e Merge pull request #24748 from owncloud/login-explicitly
Log in explicitly, save login name when generating browser/device tokens
2016-05-24 17:51:49 +02:00
Vincent Petry ecb2bbf730 Merge pull request #24809 from owncloud/remove-console-log
remove debug console.log
2016-05-24 13:58:03 +02:00
Christoph Wurst 1671d8e337
remove debug console.log 2016-05-24 13:40:01 +02:00
Vincent Petry fdddc11f63 Merge pull request #22929 from owncloud/bugfix-removequota-subadmins
Bugfix removequota subadmins
2016-05-24 12:13:57 +02:00
Christoph Wurst ad10485cec
when generating browser/device token, save the login name for later password checks 2016-05-24 11:49:15 +02:00
Christoph Wurst 74277c25be
add button to invalidate browser sessions/device tokens 2016-05-23 09:11:12 +02:00
Christoph Wurst 6495534bcd
add button to add new device tokens 2016-05-23 09:11:12 +02:00
Christoph Wurst 12431aa399
list user's auth tokens on the personal settings page 2016-05-23 09:11:12 +02:00
Jenkins for ownCloud 357d342467 [tx-robot] updated from transifex 2016-05-23 01:55:10 -04:00
Vincent Petry 6934840083 Merge pull request #24307 from owncloud/systemtags-perminterface
Add interface methods for permission check for system tags
2016-05-21 19:06:54 +02:00
Jenkins for ownCloud bca7586574 [tx-robot] updated from transifex 2016-05-21 01:55:53 -04:00
Vincent Petry 79f6b7b7ff
Make it possible to exclude admin groups from groups select2 2016-05-20 17:56:02 +02:00
Vincent Petry 37ef9dfd65
Fix default quota field from reviews 2016-05-20 16:28:30 +02:00
Jenkins for ownCloud 67162e636e [tx-robot] updated from transifex 2016-05-20 01:54:52 -04:00
Vincent Petry 819b725022 Merge pull request #24634 from owncloud/sharesettings-sort
fix admin link share settings sorting, use same order as in sidebar
2016-05-17 10:12:19 +02:00
Jenkins for ownCloud c24a685ab5 [tx-robot] updated from transifex 2016-05-17 01:54:56 -04:00
Jenkins for ownCloud bafa02d312 [tx-robot] updated from transifex 2016-05-16 01:54:58 -04:00
Jenkins for ownCloud 7c28f62e20 [tx-robot] updated from transifex 2016-05-15 01:55:34 -04:00
Jan-Christoph Borchardt 0d78fbdc26 fix admin share settings sorting, use same order as in sidebar 2016-05-14 08:02:39 +02:00
Jenkins for ownCloud cba4875e4d [tx-robot] updated from transifex 2016-05-13 02:08:45 -04:00
Jenkins for ownCloud c5ae14453a [tx-robot] updated from transifex 2016-05-12 02:08:58 -04:00
Joas Schilling bc1d70f08c Pass on the error message from the user manager to the UI (#24526) 2016-05-11 19:41:13 +02:00
Thomas Müller 199b447527
Yo-ho-oh - Murder all band 'o pirates 2016-05-11 09:16:17 +02:00
Jenkins for ownCloud 7da5331782 [tx-robot] updated from transifex 2016-05-11 01:55:55 -04:00
Jenkins for ownCloud 1fb7be42e5 [tx-robot] updated from transifex 2016-05-10 03:30:51 -04:00
Jenkins for ownCloud 10e0fc0629 [tx-robot] updated from transifex 2016-05-09 02:08:23 -04:00
Jenkins for ownCloud 5d35844aff [tx-robot] updated from transifex 2016-05-08 01:54:53 -04:00
Jenkins for ownCloud 956c3f2719 [tx-robot] updated from transifex 2016-05-07 01:54:56 -04:00
Jenkins for ownCloud 6a95af0a4b [tx-robot] updated from transifex 2016-05-06 01:54:56 -04:00
Jenkins for ownCloud 48be0b781a [tx-robot] updated from transifex 2016-05-05 01:55:08 -04:00
Joas Schilling 3ff314c6f2
Fix usages of OC\Log\Owncloud 2016-05-04 10:37:52 +02:00
Jenkins for ownCloud cd7f4ed96f [tx-robot] updated from transifex 2016-05-04 02:11:59 -04:00
Roeland Jago Douma fc82047e26
Move OC_Log_xx to \OC\Log namespace 2016-05-03 08:57:26 +02:00
Thomas Müller e049953d1a
OC_Installer -> \OC\Installer 2016-05-02 08:52:06 +02:00
Jenkins for ownCloud a323111bd1 [tx-robot] updated from transifex 2016-05-02 02:08:49 -04:00
Jenkins for ownCloud ff8980d59c [tx-robot] updated from transifex 2016-05-01 01:55:00 -04:00
Jenkins for ownCloud 023c8b0eac [tx-robot] updated from transifex 2016-04-30 01:55:54 -04:00
Jenkins for ownCloud 2b67f87ea8 [tx-robot] updated from transifex 2016-04-27 01:55:59 -04:00
Jenkins for ownCloud 14c3491977 [tx-robot] updated from transifex 2016-04-26 04:50:32 -04:00
Thomas Müller 9ad30f9c92 Merge pull request #22783 from patelfenil/bugfix-issue-17320
Remove image now not coming when user changes fullname. Fixes #17320
2016-04-25 23:02:00 +02:00
Jenkins for ownCloud dab4633300 [tx-robot] updated from transifex 2016-04-25 01:54:53 -04:00
Jenkins for ownCloud 4dc17e4863 [tx-robot] updated from transifex 2016-04-24 01:55:06 -04:00
Roeland Jago Douma 4eebccd81f
Fix inconsistent nameing of AppFramework 2016-04-22 16:00:00 +02:00
Jenkins for ownCloud 02ecd040e6 [tx-robot] updated from transifex 2016-04-21 01:58:49 -04:00
Thomas Müller 1ab27ddd4a Merge pull request #24081 from owncloud/migrate-deprecated-jquery-v1-functions
migrate deprecated jQuery 1.x functions
2016-04-20 20:38:38 +02:00
Thomas Müller 01b09b4f92 Merge pull request #24118 from owncloud/add-load-script-events-for-settings
Add loadAdditionalScripts events to admin and personal settings
2016-04-20 20:36:27 +02:00
Joas Schilling c670c23455
Add loadAdditionalScripts events to admin and personal for plugins that have no section 2016-04-20 12:30:48 +02:00
Thomas Müller 98f854ba1c Merge pull request #24104 from tyrylu/accessibility_settings_fix
App settings screen accessibility fixes
2016-04-20 11:54:23 +02:00
Jenkins for ownCloud a296cbd203 [tx-robot] updated from transifex 2016-04-20 01:54:55 -04:00
Lukáš Tyrychtr c2f2edc092 Fix reporting of the categories in app settings as links by screen readers. 2016-04-19 19:49:31 +02:00
Christoph Wurst e4a8456d01
replace $().attr('checked') by $().prop('checked', state) or $().is(':checked') 2016-04-19 16:20:17 +02:00
Christoph Wurst 05d203a989
replace $.parseJSON() by JSON.parse() 2016-04-19 15:06:42 +02:00
Jenkins for ownCloud f812f51c5d [tx-robot] updated from transifex 2016-04-19 01:55:59 -04:00
Lukas Reschke ff1150bb4d
Properly escape URL
Fixes https://github.com/owncloud/core/issues/23499
2016-04-18 17:43:20 +02:00
Jenkins for ownCloud d33f048bee [tx-robot] updated from transifex 2016-04-17 01:54:52 -04:00
Jenkins for ownCloud e6b0874087 [tx-robot] updated from transifex 2016-04-15 01:54:55 -04:00
Jenkins for ownCloud 54f6c05c79 [tx-robot] updated from transifex 2016-04-14 01:55:58 -04:00
Thomas Müller e90a3b5ba7 Merge pull request #23954 from stweil/master
misc: Fix some typos
2016-04-13 11:08:58 +02:00
Thomas Müller 4856d95135 Merge pull request #23921 from owncloud/show-app-download-tooltip
Show tooltip if the app is downloaded from a remote server
2016-04-13 11:08:38 +02:00
Jenkins for ownCloud a2da7614a0 [tx-robot] updated from transifex 2016-04-13 01:54:59 -04:00
Stefan Weil ee5f5eebe5 misc: Fix some typos
Some of them were found by codespell.

Signed-off-by: Stefan Weil <sw@weilnetz.de>
2016-04-12 18:36:39 +02:00
Christoph Wurst 7365bd798a Show tooltip if the app is downloaded from a remote server
fixes #14405
2016-04-12 09:39:53 +02:00
Jenkins for ownCloud 59080bef51 [tx-robot] updated from transifex 2016-04-12 02:08:35 -04:00
Jenkins for ownCloud a29e732607 [tx-robot] updated from transifex 2016-04-10 01:54:49 -04:00
Jenkins for ownCloud e68c4b1d73 [tx-robot] updated from transifex 2016-04-09 12:28:39 -04:00
Jenkins for ownCloud 1576a9a10b [tx-robot] updated from transifex 2016-04-07 01:56:01 -04:00
Roeland Douma 7ed271b168 Merge pull request #23820 from owncloud/move-settings-completely-to-psr4
Move OC/Settings completely to PSR-4
2016-04-06 13:31:05 +02:00
Jenkins for ownCloud de122a9b04 [tx-robot] updated from transifex 2016-04-06 06:47:12 -04:00
Lukas Reschke c12bb839e1
Rename files to be PSR-4 compliant 2016-04-06 11:12:22 +02:00
Morris Jobke 22898fa107 Use proper shortcut methods in templates 2016-04-06 10:25:04 +02:00
Lukas Reschke 433c0160b6 Move OC\Core and OC\Settings to composer autoloader 2016-04-05 16:47:38 +02:00
Pau e0bae32288 Fixed 'Help Translate' link 2016-04-04 10:56:36 +02:00
Jenkins for ownCloud deca08a683 [tx-robot] updated from transifex 2016-04-02 01:55:25 -04:00
Jenkins for ownCloud cce6194368 [tx-robot] updated from transifex 2016-04-01 01:56:19 -04:00
Jan-Christoph Borchardt a8a98d42cb improve emptycontent styles 2016-03-31 15:31:04 +02:00
Thomas Müller 52f51c94db Merge pull request #15750 from owncloud/loading-feedback-email-usermanagement
Add loading feedback for email change in user management
2016-03-31 11:24:27 +02:00
Jenkins for ownCloud 82da373ee7 [tx-robot] updated from transifex 2016-03-31 01:55:24 -04:00
Jenkins for ownCloud fc708c1e04 [tx-robot] updated from transifex 2016-03-30 01:57:41 -04:00
Jenkins for ownCloud dd5bbc31f2 [tx-robot] updated from transifex 2016-03-29 01:55:16 -04:00
Jenkins for ownCloud 1079554284 [tx-robot] updated from transifex 2016-03-27 01:55:45 -04:00
Jenkins for ownCloud 3e33b686b1 [tx-robot] updated from transifex 2016-03-26 01:55:15 -04:00