wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
35693 commits 157 branches 562 tags 714 MiB
Commit graph

3430 commits

Author SHA1 Message Date
Nextcloud bot
fc02c4a980
[tx-robot] updated from transifex 2016-09-04 00:09:21 +00:00
Nextcloud bot
ab876619dc
[tx-robot] updated from transifex 2016-09-02 00:09:11 +00:00
Nextcloud bot
4a5cd74fb2
[tx-robot] updated from transifex 2016-09-01 00:09:24 +00:00
Roeland Jago Douma
14136295b7
Cache avatars properly 
* Set proper caching headers for avatars (15 minutes)
* For our own avatar use some extra logic to invalidate when we update
 2016-08-30 09:00:16 +02:00
Vincent Petry
1f3d34eb28
Fix group sorting in user list group selection 2016-08-29 13:34:37 +02:00
Vincent Petry
17964a8955
Extra non-available groups also in list 2016-08-29 13:34:28 +02:00
Vincent Petry
e8c2d62c6b
Users page lazy multiselect group dropdowns 
Instead of pre-rendering all multiselects with lots of group entries,
the current groups are now displayed as simple labels.
Behind the labels there is a pencil icon like for other fields.
When clicking the pencil icon, the dropdown will be spawned and will
open itself.
Upon closing of the dropdown, the label comes back with the updated
selection and the dropdown is destroyed.
 2016-08-29 13:34:13 +02:00
Roeland Jago Douma
c20aef8795 Merge pull request #1085 from nextcloud/fix-ffs-sharing-syntax 
Fix the syntax of the federation ID share buttons
 2016-08-26 15:10:03 +02:00
Lukas Reschke
00bb9294ed Merge pull request #1053 from nextcloud/set-quota-non-int 
fix setting quota to default or unlimited
 2016-08-26 14:56:53 +02:00
Joas Schilling
419c42b0aa
Fix more HTML "syntax" 2016-08-26 14:04:37 +02:00
Robin Appelman
abb3127ff2 fix setting quota to default or unlimited 2016-08-25 15:55:30 +02:00
Arthur Schiwon
44f3fcc187
fix internal links in security & setup warnings, resolves #1048 2016-08-25 13:24:50 +02:00
Morris Jobke
429eb21780
Show hint if password policy disallows password change 2016-08-19 13:31:43 +02:00
Jack Davis
dfb66e1101
25532_issue_password_update_notification_updated (#25756) 
* Password Update Notification

Added an IF ELSE statement to ensure that feedback is provided to the
user on successfully updating a user password in settings.

* Password Update Success Message

Updated the password update success message
 2016-08-19 13:31:19 +02:00
Roeland Jago Douma
77bce68b45
Fix some jshint errors in settings/users 2016-08-19 10:46:42 +02:00
Roeland Jago Douma
59da5972f6
SVG defintions always take the first one 
* Move filter definition out
 2016-08-18 16:16:01 +02:00
Lukas Reschke
5581a602cc
Add cachebuster to app icons in the admin screen 2016-08-18 12:44:33 +02:00
Morris Jobke
ec4d127e58 Merge pull request #905 from nextcloud/invisible_icons 
Fix icons on App page in FF
 2016-08-17 17:24:16 +02:00
Morris Jobke
28c192c9f5
Fix null reference in IE 2016-08-17 16:04:53 +02:00
Morris Jobke
bded787d0c
Empty tags are not allowed for image and feColorMatrix in IE11 and below 2016-08-17 15:59:30 +02:00
Nextcloud bot
39c180117e
[tx-robot] updated from transifex 2016-08-17 13:30:52 +00:00
Roeland Jago Douma
314b4005bb
Remove hack 2016-08-17 15:16:48 +02:00
Morris Jobke
1444c1d345
Introduce weird hack for Firefox 
* everything is 4 times as big (doubled width and doubled height)
 2016-08-17 14:45:08 +02:00
Roeland Jago Douma
960d0d1242
Filter can't be named invert in FF 2016-08-17 13:36:17 +02:00
Roeland Jago Douma
c5d0a056de Merge pull request #868 from nextcloud/changepasswordcontroller 
Make ChangePassword a real Controller
 2016-08-17 11:50:41 +02:00
Roeland Jago Douma
ce0604bd06 Merge pull request #892 from nextcloud/fix_phpdoc 
Some scrutinizer phpdoc fixes
 2016-08-17 10:38:21 +02:00
Roeland Jago Douma
32a6f5f182
Moved ChangePassword to an actual Controller 
* Still no full DI because of encryption fu
* Remove old "Controller"
 2016-08-17 10:21:14 +02:00
Marius Blüm
c1632c3abd Merge pull request #893 from nextcloud/ie8_be_gone 
IE8 be gone!
 2016-08-17 09:02:58 +02:00
Nextcloud bot
0cc8b8b244
[tx-robot] updated from transifex 2016-08-17 00:09:19 +00:00
Roeland Jago Douma
fd95985a21
Remove IE8 support in CertificateController 
* Also fix getMock warnings in tests
 2016-08-16 20:51:43 +02:00
Roeland Jago Douma
15c1b3c509
Fix phpdoc 2016-08-16 20:25:09 +02:00
Arthur Schiwon
717e22267a
Merge branch 'master' into implement_712 2016-08-16 18:31:59 +02:00
Arthur Schiwon
4946cc220d
for new we cannot have nested settings, default module is only appended if available 2016-08-16 18:26:16 +02:00
Arthur Schiwon
58530ab42f
fix missing parameters in sharing settings page 2016-08-16 17:59:21 +02:00
Marius Blüm
dec4ee73c5 Merge pull request #871 from nextcloud/move-apps 
move apps between 'Language' and 'Session' in personal settings
 2016-08-16 11:25:48 +02:00
Marius Blüm
c994524e98 Merge pull request #834 from nextcloud/feature/similar-app-colors 
Use darker colors for app icons in app management.
 2016-08-16 11:07:48 +02:00
Nextcloud bot
8c424c7971
[tx-robot] updated from transifex 2016-08-16 00:10:47 +00:00
Arthur Schiwon
d96e8f5810
adopt to Controller constructor changes 2016-08-16 00:56:18 +02:00
Lukas Reschke
6c6338b810
Merge branch 'master' into implement_712 2016-08-15 21:55:09 +02:00
Lukas Reschke
910176c540
Fix CheckSetupController tests 2016-08-15 17:36:45 +02:00
Lukas Reschke
8a7a0f3287
Add unit tests 2016-08-15 16:25:34 +02:00
Bjoern Schiessle
5f28b8b5c1
move apps between 'Language' and 'Session' in personal settings 2016-08-15 12:03:55 +02:00
Nextcloud bot
f3124b5052
[tx-robot] updated from transifex 2016-08-15 00:12:16 +00:00
Raghu Nayyar
7c61fa14ae Fixes image preview when fetched from the store. 2016-08-15 00:49:33 +05:30
Roeland Jago Douma
5cd5233952
Do not translate HTML 2016-08-13 14:16:17 +02:00
Jan-Christoph Borchardt
c8113a4269
compress images and fix position 2016-08-13 14:03:56 +02:00
Jan-Christoph Borchardt
18d7ca21f5
use shorthand for padding values 2016-08-13 14:03:56 +02:00
Lukas Reschke
4806ea20fe
Remove accidentially added line 2016-08-13 14:03:56 +02:00
Frank Karlitschek
707fc30304
adding rel="noreferrer noopener" 2016-08-13 14:03:56 +02:00
Frank Karlitschek
629c3dd39f
adding social buttons 2016-08-13 14:03:56 +02:00
Nextcloud bot
4da01eeef6
[tx-robot] updated from transifex 2016-08-13 00:13:29 +00:00
Arthur Schiwon
158d78e1ab
move mail settings and file handling to additional ones, thus files_external gets its own section 2016-08-13 01:02:25 +02:00
Arthur Schiwon
a133e7970d
make updatenotification settings appear as if it is part of the version part in server settings 2016-08-13 00:29:39 +02:00
Arthur Schiwon
90e58b7fb3
mark current section 2016-08-12 17:08:32 +02:00
Nextcloud bot
35358bdde0
[tx-robot] updated from transifex 2016-08-12 00:10:18 +00:00
Lukas Reschke
82bf4796f9
Resolve conflict 2016-08-11 19:40:52 +02:00
Lukas Reschke
8261ccce1b
Merge branch 'master' into implement_712 2016-08-11 19:37:17 +02:00
Arthur Schiwon
14ddf9d923
rename IAdmin to ISettings, the interface is not bound to a specific settings scope 2016-08-11 14:48:21 +02:00
Nextcloud bot
f68f1d5f37
[tx-robot] updated from transifex 2016-08-11 12:08:42 +00:00
Raghu Nayyar
eeee9681d5 Adds opacity to image container. 2016-08-11 15:53:39 +05:30
Raghu Nayyar
7c2346b373 Removes uneeded styles. 2016-08-11 13:09:42 +05:30
Raghu Nayyar
c489cd4d3a Uses javascript to invert the SVGs. 2016-08-11 12:59:57 +05:30
Nextcloud bot
56bf0a8399
[tx-robot] updated from transifex 2016-08-11 00:14:12 +00:00
Arthur Schiwon
1eb8b951c2
more admin page splitup improvements 
* bump version to ensure tables are created
* make updatenotification app use settings api
* change IAdmin::render() to getForm() and change return type from Template to TemplateResponse
* adjust User_LDAP accordingly, as well as built-in forms
* add IDateTimeFormatter to AppFramework/DependencyInjection/DIContainer.php. This is important so that \OC::$server->query() is able to resolve the
constructor parameters. We should ensure that all OCP/* stuff that is available from \OC::$server is available here. Kudos to @LukasReschke
* make sure apps that have settings info in their info.xml are loaded before triggering adding the settings setup method
 2016-08-10 15:21:25 +02:00
Morris Jobke
e9db2bcfd9
add more margin to right of the icon 2016-08-10 10:47:51 +02:00
Roeland Jago Douma
7d643fc539
Add sliding animation 2016-08-10 09:17:14 +02:00
Roeland Jago Douma
965804425d
Add clipboardjs for token 2016-08-10 09:10:39 +02:00
Roeland Jago Douma
de44ab0244
Always show delete icon for new tokens 
* Always show delete icon
* Hide form if the new icon is deleted
 2016-08-10 08:58:57 +02:00
Roeland Jago Douma
3bf609cd31
Add note password is only shown once 2016-08-10 08:58:41 +02:00
Nextcloud bot
d6bee61131
[tx-robot] updated from transifex 2016-08-10 00:09:59 +00:00
Lukas Reschke
3d54f1151f Merge pull request #784 from nextcloud/admin_php_smtp_casing 
Admin setting PHP and SMTP casing
 2016-08-09 23:45:31 +02:00
Arthur Schiwon
518545fc2f
Fallback for legacy settings. They are placed into Additional Settings 2016-08-09 23:30:07 +02:00
Arthur Schiwon
ceeb44bd04
Initial work on Apps page split: 
* interfaces for the Admin settings (IAdmin) and section (ISection)
* SettingsManager service
* example setup with LDAP app
 2016-08-09 18:05:09 +02:00
Roeland Jago Douma
81b45d0c90
Admin setting PHP and SMTP casing 2016-08-09 14:12:39 +02:00
Roeland Jago Douma
3f859d8a38
Remove AGPL title 2016-08-09 13:37:25 +02:00
Nextcloud bot
344916de15
[tx-robot] updated from transifex 2016-08-07 00:10:23 +00:00
Nextcloud bot
b80e3e70e5
[tx-robot] updated from transifex 2016-08-06 00:10:17 +00:00
Nextcloud bot
c44c9a55f4
[tx-robot] updated from transifex 2016-08-05 00:10:09 +00:00
Nextcloud bot
258ee140a4
[tx-robot] updated from transifex 2016-08-04 00:11:51 +00:00
Nextcloud bot
0874460e48
[tx-robot] updated from transifex 2016-08-03 00:11:12 +00:00
Morris Jobke
c76dc835c4 Merge pull request #701 from nextcloud/fix-add-apps-icon 
Apply black app icon style to newly installed app icons
 2016-08-02 14:23:42 +02:00
Nextcloud bot
5f83f4d9a8
[tx-robot] updated from transifex 2016-08-02 00:09:59 +00:00
Julius Haertl
c8e4988f85
Apply inverted app icon style to newly installed icons 2016-08-01 21:48:06 +02:00
Nextcloud bot
50c8367041
[tx-robot] updated from transifex 2016-08-01 00:10:15 +00:00
Nextcloud bot
2a2526e1d1
[tx-robot] updated from transifex 2016-07-31 00:09:54 +00:00
Nextcloud bot
2565a39361
[tx-robot] updated from transifex 2016-07-30 00:11:16 +00:00
Frédéric LIETART
7335539838 Transifex Owncloud > Nextcloud 
Change transifex link Owncloud > Nextcloud
 2016-07-29 22:33:10 +02:00
Stefan Weil
bb8a42bd44 Fix misspelling of database "READ COMMITTED" 
Signed-off-by: Stefan Weil <sw@weilnetz.de>
 2016-07-29 11:06:32 +02:00
Nextcloud bot
937577f7bc
[tx-robot] updated from transifex 2016-07-29 00:09:49 +00:00
Jan-Christoph Borchardt
d705b936a9 fix capitalization of text in users management 2016-07-28 11:30:36 +02:00
Nextcloud bot
ffa25ff74d
[tx-robot] updated from transifex 2016-07-28 00:11:51 +00:00
Nextcloud bot
95a0714973
[tx-robot] updated from transifex 2016-07-27 00:09:48 +00:00
Morris Jobke
9f4a53429e Merge pull request #563 from nextcloud/log-internet-connection-exception 
Log exception that is thrown by internet connection check
 2016-07-26 16:22:43 +02:00
root
3b44d73108 Orders Admin Log Button 2016-07-26 09:27:48 +00:00
Morris Jobke
5da813f477
Log exception that is thrown by internet connection check 2016-07-26 10:03:31 +02:00
Nextcloud bot
31e807b155
[tx-robot] updated from transifex 2016-07-26 00:09:19 +00:00
Joas Schilling
4ad0c383ad Merge pull request #523 from Faldon/master 
Renamed file logging
 2016-07-25 11:41:24 +02:00
Nextcloud bot
7d969962db
[tx-robot] updated from transifex 2016-07-25 00:09:09 +00:00
Nextcloud bot
a20f4c432b
[tx-robot] updated from transifex 2016-07-24 00:09:10 +00:00
Nextcloud bot
e36decc12b
[tx-robot] updated from transifex 2016-07-23 00:09:06 +00:00
Thomas Pulzer
ba3f4f118e Changed logtype to file instead of owncloud. 
- Updated the config sample to point to log_type='file'
- Renamed the Class for logfile logging to File in namespace 'OC\Log\'.
  Changed the occurrences of 'OC\Log\Owncloud' to 'OC\Log\File'.
- Renamed the Class for log:file command to File in namespace 'OC\Core\Command\Log\File'.
  Changed registration of the command to use 'OC\Core\Command\Log\File'.
- Changed default Syslog tag to Nextcloud
- Retained backwards compatibility for configs with 'logtype' => 'owncloud'

- Adjusted tests for the new file log.

Closes #490.
 2016-07-22 11:44:19 +02:00
Nextcloud bot
4b4990c48f
[tx-robot] updated from transifex 2016-07-22 00:10:05 +00:00
Morris Jobke
8c7d7d7746 Merge pull request #507 from nextcloud/run-le-script 
Update emails and license headers with latest changes
 2016-07-21 23:27:15 +02:00
William Bargent
6da54a6987 Merge pull request #374 from lpszBuffer/master 
Alters 'No Internet Connection' error message. #181
 2016-07-21 18:55:58 +01:00
Joas Schilling
0215b004da
Update with robin 2016-07-21 18:13:58 +02:00
Joas Schilling
ba87db3fcc
Fix others 2016-07-21 18:13:57 +02:00
Morris Jobke
ca6c2c7855 Merge pull request #484 from nextcloud/reenable-help-section 
[master] Reenable help section
 2016-07-21 09:19:11 +02:00
Lukas Reschke
14b1edeb5d
Add proper links 2016-07-21 02:25:00 +02:00
Lukas Reschke
90a529f8da
[master] Properly link to nextcloud 2016-07-21 02:24:48 +02:00
Derek
b236100619 Alters 'No Internet Connection' error message. #181 2016-07-20 19:12:10 -05:00
Nextcloud bot
b7c5a59adf
[tx-robot] updated from transifex 2016-07-21 00:09:07 +00:00
Robin Appelman
2ba5785d68 sort tokens 2016-07-20 15:59:00 +02:00
Robin Appelman
703794339c right allign last activity 2016-07-20 14:26:03 +02:00
Robin Appelman
341948155d fix apppassword table with only a few entries being streched 2016-07-20 14:25:23 +02:00
Robin Appelman
66db0f3155 Change "recent activity" to "last activity" 2016-07-20 14:25:03 +02:00
Robin Appelman
eb3410322e improve matching safari user agent 2016-07-20 14:13:23 +02:00
Nextcloud bot
78e0bdc003
[tx-robot] updated from transifex 2016-07-20 00:09:13 +00:00
Morris Jobke
21b05b646f Merge pull request #452 from nextcloud/session-passwords-design 
Adjust wording and layout of Sessions and App passwords personal settings
 2016-07-19 20:57:54 +02:00
Lukas Reschke
56496f98ab Merge pull request #451 from nextcloud/github-link 
fix Github link in Personal and Admin settings Version note
 2016-07-19 20:46:23 +02:00
Morris Jobke
a3ea826b82 Merge pull request #446 from nextcloud/cron-radio-buttons-color 
Use the themed radio buttons for cron selection
 2016-07-19 17:54:16 +02:00
Joas Schilling
10fa8a05a0
Use the themed radio buttons for cron selection 2016-07-19 16:41:47 +02:00
Jan-Christoph Borchardt
9b22be2023 set max width for sessions tables so it doesn’t go crazy on large screens 2016-07-19 11:42:57 +02:00
Jan-Christoph Borchardt
762cc2a773 adjust layout of Sessions and App passwords sections 2016-07-19 11:37:46 +02:00
Jan-Christoph Borchardt
f1c0c90ac9 simplify wording of Sessions and App passwords sections 2016-07-19 11:37:20 +02:00
Robin Appelman
df2dffaf7c add fancy formating for most browsers 2016-07-19 11:27:58 +02:00
Jan-Christoph Borchardt
6797b2b90f fix Github link in Personal and Admin settings Version note 2016-07-19 11:15:46 +02:00
Robin Appelman
fac970b065 format current and sync client sessions in Personal 2016-07-18 19:39:03 +02:00
Nextcloud bot
b23d3c6418
[tx-robot] updated from transifex 2016-07-18 14:08:51 +00:00
Björn Schießle
ea470f8777 Merge pull request #405 from nextcloud/theming-fixes 
Theming fixes
 2016-07-18 15:59:47 +02:00
Nextcloud bot
91c281c4b4
[tx-robot] updated from transifex 2016-07-17 00:09:26 +00:00
Nextcloud bot
d6907fe84d
[tx-robot] updated from transifex 2016-07-16 00:09:18 +00:00
Joas Schilling
2c988ecbf4
Use the themed Defaults everywhere 2016-07-15 09:17:30 +02:00
Morris Jobke
3c432a8afe
Use tooltip for ssl certs table 2016-07-13 10:00:02 +02:00
Morris Jobke
cf79417490
Use tooltip for background job execution time 2016-07-13 09:59:42 +02:00
Morris Jobke
e9eb94e899
Use tooltip for app management badges 2016-07-13 09:59:08 +02:00
Nextcloud bot
afef11f84a
[tx-robot] updated from transifex 2016-07-13 00:09:46 +00:00
Nextcloud bot
e29835a702
[tx-robot] updated from transifex 2016-07-12 00:09:34 +00:00
Lukas Reschke
0c1cf5f7eb Merge pull request #347 from nextcloud/drop-windows-foo 
Remove unneeded checks if it runs on a Windows machine
 2016-07-11 13:16:03 +02:00
Nextcloud bot
67278d12e1
[tx-robot] updated from transifex 2016-07-11 00:09:22 +00:00
Nextcloud bot
4aae157087
[tx-robot] updated from transifex 2016-07-10 00:09:23 +00:00
Nextcloud bot
c108d816ac
[tx-robot] updated from transifex 2016-07-09 00:09:16 +00:00
Morris Jobke
c2d88a08b7
Remove unneeded checks if it runs on a Windows machine 
* the setup check is still there
 2016-07-08 15:55:17 +02:00
Nextcloud bot
a84250e0af [tx-robot] updated from transifex 2016-07-08 00:09:25 +00:00
Lukas Reschke
2a1a3957b6 Merge pull request #333 from nextcloud/sync-master 
Sync master
 2016-07-07 19:29:43 +02:00
Morris Jobke
ba16fd0d33 Merge branch 'master' into sync-master 2016-07-07 11:29:46 +02:00
Morris Jobke
5ace43f438 Revert "[tx-robot] updated from transifex" 
This reverts commit 3731b2a006eca1e96d4087212a5e779c85a002e4.

Revert "[tx-robot] updated from transifex"

This reverts commit 94d91113f1206161b00bbc28da00aaf80bcd0a3e.

Revert "[tx-robot] updated from transifex"

This reverts commit e7cc8bac1e.

Revert "[tx-robot] updated from transifex"

This reverts commit 59fc3ff45a.

Revert "[tx-robot] updated from transifex"

This reverts commit 6a89a63d2e.

Revert "[tx-robot] updated from transifex"

This reverts commit b0bad03234.
 2016-07-07 11:04:08 +02:00
Nextcloud bot
4a0efa38c0 [tx-robot] updated from transifex 2016-07-07 08:58:00 +00:00
Jenkins for ownCloud
38718bf89e [tx-robot] updated from transifex 2016-07-07 01:56:27 -04:00
Vincent Petry
d769e718a5 Set content type when downloading log file to force download in some browsers (#25382) 2016-07-06 22:47:16 +02:00
Nextcloud bot
da2363a1dd [tx-robot] updated from transifex 2016-07-06 13:28:06 +00:00
Jenkins for ownCloud
6103df97cc [tx-robot] updated from transifex 2016-07-06 01:56:27 -04:00
Jenkins for ownCloud
34eec57262 [tx-robot] updated from transifex 2016-07-05 02:31:32 -04:00
Morris Jobke
387ac9e048 Merge pull request #25240 from owncloud/remove-svg 
Remove SVG fallback
 2016-07-04 17:49:00 +02:00
Vincent Petry
a48df671a3 Merge pull request #25253 from owncloud/users-fixotherquotadropdown 
Fix "Other" value handling in quota dropdown in users page
 2016-07-04 16:13:18 +02:00
Jenkins for ownCloud
9e0d8fcf41 [tx-robot] updated from transifex 2016-07-04 01:56:34 -04:00
Jenkins for ownCloud
cea84cf7a8 [tx-robot] updated from transifex 2016-07-03 01:54:52 -04:00
Jenkins for ownCloud
dea7b5be35 [tx-robot] updated from transifex 2016-07-02 01:54:53 -04:00
Hendrik Leppelsack
c47833718f remove svg classes 2016-07-01 16:36:37 +02:00
Vincent Petry
6f92aef265 Merge pull request #25276 from owncloud/delete-own-session-token 
prevent users from deleting their own session token
 2016-07-01 16:15:31 +02:00
Lukas Reschke
179a355b2c Merge remote-tracking branch 'upstream/master' into master-sync-upstream 2016-07-01 11:36:35 +02:00
Jenkins for ownCloud
2d2d2267f7 [tx-robot] updated from transifex 2016-07-01 01:57:04 -04:00
Lukas Reschke
700a57d8b6 Set content-type to "application/octet-stream" 
Some browsers such as Firefox on Microsoft Windows otherwise do offer to open the file directly which is kinda silly.
 2016-06-30 12:47:46 +02:00
Jenkins for ownCloud
1b9fa4dd5f [tx-robot] updated from transifex 2016-06-30 01:55:56 -04:00
Jenkins for ownCloud
2b0f053126 [tx-robot] updated from transifex 2016-06-29 05:52:18 -04:00
Christoph Wurst
c9a2790893 prevent users from deleting their own session token 2016-06-28 16:17:37 +02:00
Jenkins for ownCloud
894b7d93f6 [tx-robot] updated from transifex 2016-06-28 01:57:10 -04:00
Lukas Reschke
6670d37658 Merge remote-tracking branch 'upstream/master' into master-sync-upstream 2016-06-27 18:23:00 +02:00
Bjoern Schiessle
2a990a0db5
verify user password on change 2016-06-27 14:08:11 +02:00
Vincent Petry
579bc57d16 Merge pull request #25261 from owncloud/app-password-login-name 
show which login name to use for the new app password
 2016-06-27 13:40:20 +02:00
Morris Jobke
b9edcd78bf Merge pull request #25252 from owncloud/authtoken-removetooltipondisconnect 
Remove tooltip when disconnecting token
 2016-06-27 10:42:35 +02:00
Vincent Petry
93f29f57c5 Merge pull request #25129 from owncloud/remove-ie 
Remove ie8+9 support
 2016-06-27 10:20:47 +02:00
Vincent Petry
3a7b9fc41d Merge pull request #25251 from owncloud/authtoken-assetpipelinefix 
Use OC.Backbone instead of Backbone directly in authtoken JS code
 2016-06-27 09:56:37 +02:00
Jenkins for ownCloud
ee90bef50a [tx-robot] updated from transifex 2016-06-27 01:55:57 -04:00
Lukas Reschke
db6361ef03 Merge pull request #226 from nextcloud/master-upstream-sync 
[Master] upstream sync
 2016-06-26 14:51:00 +02:00
Lukas Reschke
7a9d60d87e
Merge remote-tracking branch 'upstream/master' into master-upstream-sync 2016-06-26 12:55:05 +02:00
Jenkins for ownCloud
52eab2a61a [tx-robot] updated from transifex 2016-06-26 01:55:53 -04:00
Jenkins for ownCloud
3d65979f0a [tx-robot] updated from transifex 2016-06-25 01:56:48 -04:00
Christoph Wurst
1454b4515c fix layout 2016-06-24 17:00:59 +02:00
Christoph Wurst
26aacb4e62 show which login name to use for the new app password 2016-06-24 15:31:48 +02:00
Vincent Petry
0501d8daac Prevent negative or non-number values in quota input 2016-06-24 09:20:13 +02:00
Jenkins for ownCloud
29068d3845 [tx-robot] updated from transifex 2016-06-24 01:56:13 -04:00
Vincent Petry
9092d7f5ea Fix "Other" value handling in quota dropdown in users page 
Prevents "other" value to be deleted.
When appending custom value, put it above the "other" entry.
 2016-06-23 18:42:11 +02:00
Vincent Petry
9524115c2c Remove tooltip when disconnecting token 2016-06-23 18:30:45 +02:00
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