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 |
|
Jenkins for ownCloud
|
29068d3845
|
[tx-robot] updated from transifex
|
2016-06-24 01:56:13 -04:00 |
Vincent Chan
|
75cd7df4fb
|
select css changes in setting/admin
|
2016-06-23 12:37:58 +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 |