Commit graph

5871 commits

Author SHA1 Message Date
Nextcloud bot
4da01eeef6
[tx-robot] updated from transifex 2016-08-13 00:13:29 +00:00
Lukas Reschke
11e089f112 Merge pull request #844 from nextcloud/twofactor_mw_excep
TwoFactorMiddleware should forward Exception
2016-08-12 20:15:32 +02:00
Morris Jobke
4a887d851e Merge pull request #837 from nextcloud/when-logged-in-then-just-redirect-to-redirected-page
When logged in then just redirect to redirected page
2016-08-12 14:21:36 +02:00
Roeland Jago Douma
33f1532079
Throw exception if you don't handle it 2016-08-12 14:04:23 +02:00
Nextcloud bot
35358bdde0
[tx-robot] updated from transifex 2016-08-12 00:10:18 +00:00
Lukas Reschke
8261ccce1b
Merge branch 'master' into implement_712 2016-08-11 19:37:17 +02:00
Faldon
14bf180837 Removed debug code. 2016-08-11 16:43:07 +02:00
Lukas Reschke
9ca25e857c
Redirect users when already logged-in on login form 2016-08-11 15:22:29 +02:00
Thomas Pulzer
b2b7fa4854 Fixed user and main menu closing on right mouse button click.
Fixed wrong variable assignment when trying to open link in new window.
2016-08-11 07:22:13 +02:00
Nextcloud bot
56bf0a8399
[tx-robot] updated from transifex 2016-08-11 00:14:12 +00:00
Roeland Jago Douma
ba922c9f73 Merge pull request #807 from nextcloud/ocs_dataresponse
OCSController requires DataResponse
2016-08-10 22:36:25 +02:00
Roeland Jago Douma
9544c97ffe
Fix Core's OCSController response 2016-08-10 20:53:13 +02:00
Thomas Müller
4cf2f97a16
Add missing array element - fixes #25714 2016-08-10 11:11:23 +02:00
Nextcloud bot
d6bee61131
[tx-robot] updated from transifex 2016-08-10 00:09:59 +00:00
Morris Jobke
93047f5e4d Merge pull request #777 from nextcloud/ocs_capabilities
Move /cloud/capabilities and /cloud/user to Core
2016-08-10 00:43:13 +02:00
Lukas Reschke
7e23351bf0 Merge pull request #677 from nextcloud/app-menu-fix
Fix closing app menu on mobile
2016-08-10 00:28:04 +02:00
Lukas Reschke
2b04b58d9a Merge pull request #783 from nextcloud/app-disable-yellow
make disabled apps more clear during upgrade
2016-08-10 00:24:02 +02:00
Roeland Jago Douma
69da896785
Move /cloud/user to Core app 2016-08-09 20:56:31 +02:00
Roeland Jago Douma
02449c8336
Move getCapabilities over to Core 2016-08-09 20:56:31 +02:00
Roeland Jago Douma
575875e8d0
Allow OCS routes in Core and Settings 2016-08-09 20:56:31 +02:00
Roeland Jago Douma
7a4e5d8f40
Open exiration date picker directly on toggle 2016-08-09 19:55:58 +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
Robin Appelman
e783006fe2 make disabled apps more clear during upgrade 2016-08-09 13:46:41 +02:00
Thomas Pulzer
c5033670d5
Changed app and user menu delegates to mousedown events.
Added proper handling of primary mouse button click with and without ctrl-/meta-key modifier.
Added handlig of middle mouse button click.
2016-08-09 11:58:32 +02:00
Thomas Pulzer
8c9961aa22
Added OS X meta key check for stopping spinning animation in app and user menu. 2016-08-09 11:58:32 +02:00
Thomas Pulzer
1ab9477ac1
Fixed user menu to not show spinner on ctrl+click.
Fixes #616
2016-08-09 11:58:32 +02:00
Morris Jobke
4277051442 Merge pull request #660 from gdamjan/custom-config-dir
introduce NEXTCLOUD_CONFIG_DIR env variable (see #300)
2016-08-09 10:58:23 +02:00
Nextcloud bot
3a26def7cf
[tx-robot] updated from transifex 2016-08-09 00:10:11 +00:00
Lukas Reschke
fa352a81a5 Merge pull request #728 from nextcloud/update-styling
Design fixes for updates
2016-08-08 11:23:31 +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
Roeland Jago Douma
dd44624540 Merge pull request #732 from nextcloud/fix-shipped.json
Order alphabetically and deduplicate the shipped.json
2016-08-05 15:11:28 +02:00
Nextcloud bot
c44c9a55f4
[tx-robot] updated from transifex 2016-08-05 00:10:09 +00:00
Joas Schilling
89cb7b59f8
Order alphabetically and deduplicate the shipped.json 2016-08-04 14:40:43 +02:00
Lukas Reschke
966e2d8dde [master] Add new apps as official 2016-08-04 14:15:42 +02:00
Jan-Christoph Borchardt
835dc59d6a reduce info on update screens, introduce button to refresh 2016-08-04 12:48:25 +02:00
Joas Schilling
dab0a6223a Merge pull request #718 from jurgenhaas/patch-1
Exit from upgrade without reporting error
2016-08-04 09:04:24 +02:00
Nextcloud bot
258ee140a4
[tx-robot] updated from transifex 2016-08-04 00:11:51 +00:00
Jan-Christoph Borchardt
2f9725469d switch nested containers in update to semibold style 2016-08-03 18:58:44 +02:00
Jürgen Haas
aeb5dfa4ac Exit from upgrade without reporting error
As reported at https://help.nextcloud.com/t/silent-mode-for-occ-upgrade/2120 we should exit with a return value of 0 (zero) if the current instance is already up to date so that automatic deployment tools don't recognize that as an error.
2016-08-03 15:51:55 +02:00
Joas Schilling
d1d891fed0
Add access control and automated tagging as shipped 2016-08-03 14:47:52 +02:00
Vincent Petry
0f3674a446
Group incoming shares for resharing in JS 2016-08-03 10:16:28 +02:00
Damjan Georgievski
4d559267bd SetupController should use \OC::$configDir too 2016-08-02 15:28:19 +02:00
Morris Jobke
d97fe1775a
Shake the login fields if password is wrong 2016-08-01 21:42:29 +02:00
Morris Jobke
32e5e48b0b Merge pull request #653 from nextcloud/animate-sidebar
slight animation for the sidebar for better feedback what happens
2016-08-01 18:21:31 +02:00
Morris Jobke
ffd29e9ec5 Merge pull request #672 from sndrr/occ-rebrand-to-nextcloud
Occ rebrand to nextcloud
2016-08-01 11:15:22 +02:00
Nextcloud bot
8ef5fcec1d
[tx-robot] updated from transifex 2016-08-01 08:53:07 +00:00
Nextcloud bot
50c8367041
[tx-robot] updated from transifex 2016-08-01 00:10:15 +00:00
Julius Haertl
6b807af619
Fix closing app menu on mobile 2016-07-31 11:57:03 +02:00
Nextcloud bot
2a2526e1d1
[tx-robot] updated from transifex 2016-07-31 00:09:54 +00:00
Julius Haertl
217b52085d
Fix javascript tests for sidebar animation 2016-07-30 16:30:05 +02:00
Sander Ruitenbeek
06fd2e7d5a Revert (c) back to ownCloud, Inc.
To be dealt with later
2016-07-30 16:26:34 +02:00
Julius Haertl
fdcba04c98
Add animation to app-content 2016-07-30 16:24:04 +02:00
sanderr
a7f998a454 Update Upgrade.php 2016-07-30 15:09:43 +02:00
Sander Ruitenbeek
3101f9e234 Rebranded to Nextcloud for the occ command line tool 2016-07-30 15:39:32 +02:00
Marius Blüm
3b386af295 Merge pull request #664 from nextcloud/white-app-menu-fix
Fix wrong preserveAspectRatio at app menu icons
2016-07-30 09:11:19 +02:00
Nextcloud bot
2565a39361
[tx-robot] updated from transifex 2016-07-30 00:11:16 +00:00
Julius Haertl
9f50838cff
Fix wrong preserveAspectRatio at app menu icons 2016-07-29 23:06:26 +02:00
Björn Schießle
3728479beb Merge pull request #627 from nextcloud/white-app-menu
Change app menu to white background with dark icons
2016-07-29 20:24:24 +02:00
Jan-Christoph Borchardt
5d0f9dabf6 fix shading of apps icon in app menu 2016-07-29 15:48:05 +02:00
Jan-Christoph Borchardt
fe8d13c935 slight animation for the sidebar for better feedback what happens 2016-07-29 12:08:12 +02:00
Roeland Jago Douma
41d044cf89 Merge pull request #630 from nextcloud/enoch85-patch-1
ownCloud -> Nextcloud
2016-07-29 10:55:47 +02:00
Nextcloud bot
937577f7bc
[tx-robot] updated from transifex 2016-07-29 00:09:49 +00:00
Julius Haertl
f55ba62a00
Move to svg filter on app menu to support IE9+ 2016-07-28 22:33:17 +02:00
Jan-Christoph Borchardt
319449434e
adjust opacity of icons in apps and user menu 2016-07-28 20:56:49 +02:00
Julius Haertl
21bb05ca7e
Change app menu to white 2016-07-28 20:56:39 +02:00
Daniel Hansson
0b4789b162 ownCloud -> Nextcloud 2016-07-28 20:55:26 +02:00
Daniel Hansson
bbc7c0f3dd ownCloud -> Nextcloud 2016-07-28 15:47:04 +02:00
Jan-Christoph Borchardt
9ebd0914b7 Merge pull request #415 from nextcloud/theming-colorize-checkboxes
Colorize checkboxes depending on theming color
2016-07-28 11:12:39 +02:00
Nextcloud bot
ffa25ff74d
[tx-robot] updated from transifex 2016-07-28 00:11:51 +00:00
Julius Haertl
217b02aaa0
Theming: Cleanup and remove opacity from checkbox/radiobutton 2016-07-27 20:21:53 +02:00
Julius Haertl
7ff19e342e
Theming: Colorize radio buttons and append new styles on preview 2016-07-27 20:00:23 +02:00
Julius Haertl
9ebe0c8d64
Colorize checkboxes depending on theming color 2016-07-27 19:45:57 +02:00
Morris Jobke
638f852ed8 Merge pull request #571 from nextcloud/no-missing-preview
Don't try to load previews when we know there is none
2016-07-27 15:48:40 +02:00
Robin Appelman
03c17ff614 dont load filelist previews if we know we dont have one 2016-07-27 12:59:43 +02:00
Bjoern Schiessle
4ecd16c555
Redirect to default page after login 2016-07-27 12:11:58 +02:00
Joas Schilling
318d68a9a9 Merge pull request #565 from nextcloud/workflowengine
Add workflowengine
2016-07-27 10:07:20 +02:00
Nextcloud bot
95a0714973
[tx-robot] updated from transifex 2016-07-27 00:09:48 +00:00
Morris Jobke
2f42a3fc31
Add workflowengine 2016-07-26 11:16:34 +02:00
Joas Schilling
cc5ddcf537 Merge pull request #525 from nextcloud/fix-theme-logo-position
Fix theme logo position and shape
2016-07-26 10:46:13 +02:00
Nextcloud bot
31e807b155
[tx-robot] updated from transifex 2016-07-26 00:09:19 +00:00
Julius Haertl
d58ff68531
Theming: Fix preview and center alignment of logo 2016-07-25 18:54:13 +02:00
Joas Schilling
4ad0c383ad Merge pull request #523 from Faldon/master
Renamed file logging
2016-07-25 11:41:24 +02: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
Jan-Christoph Borchardt
dd1a5b9ac3 Fix search box overlapping on mobile (#450)
* fix searchbox overlapping on mobile

* also adjust log in background color in theme

* Fix unit tests
2016-07-22 15:38:37 +02:00
Jos Poortvliet
642f59e159 Update header.css
make the logo look good on the login page
2016-07-22 14:23:00 +02: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
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
Lukas Reschke
c385423d10 Merge pull request #479 from nextcloud/add-bruteforce-throttler
Implement brute force protection
2016-07-21 00:31:02 +02:00
Lukas Reschke
c1589f163c
Mitigate race condition 2016-07-20 23:09:27 +02:00
Lukas Reschke
ba4f12baa0
Implement brute force protection
Class Throttler implements the bruteforce protection for security actions in
Nextcloud.

It is working by logging invalid login attempts to the database and slowing
down all login attempts from the same subnet. The max delay is 30 seconds and
the starting delay are 200 milliseconds. (after the first failed login)
2016-07-20 22:08:56 +02:00
Lukas Reschke
020a2a6958 Merge pull request #476 from nextcloud/port-same-site-cookies
[master] Port Same-Site Cookies to master
2016-07-20 21:35:02 +02:00
Roeland Douma
1088916eda Merge pull request #390 from nextcloud/occ-user
More occ user management commands
2016-07-20 20:36:33 +02:00
Roeland Douma
9f219f55f2 Merge pull request #467 from nextcloud/use-clipboard-api
Use clipboard api
2016-07-20 20:11:08 +02:00
Lukas Reschke
a299fa38a9
[master] Port Same-Site Cookies to master
Fixes https://github.com/nextcloud/server/issues/50
2016-07-20 18:37:57 +02:00
Morris Jobke
032e6b1701 Merge pull request #473 from nextcloud/ux-improvement-share-dialog
only show additional edit permissions for folders
2016-07-20 18:34:55 +02:00
Bjoern Schiessle
77d2338bd2
only show additional edit permissions for folders 2016-07-20 15:24:51 +02:00
Thomas Müller
4d67429cf0
Use an icon to set the email instead of a button with string 2016-07-20 15:07:46 +02:00
Thomas Müller
daaa3ded8d
Add clipboard button to public share link 2016-07-20 15:07:41 +02:00
Joas Schilling
45c99c226b
Fix the HTML encoding when uploading a folder in FF when using french l10n 2016-07-20 13:03:27 +02:00
Joas Schilling
5632cb9a3b
Remove pre-fork EE apps from shipped.json 2016-07-20 11:19:55 +02:00
Nextcloud bot
78e0bdc003
[tx-robot] updated from transifex 2016-07-20 00:09:13 +00:00
Robin Appelman
586c58efa7
add occ command to show user information 2016-07-19 09:58:59 +02:00
Robin Appelman
3d874c407d
Add commands to add/remove users to/from groups 2016-07-19 09:58:59 +02:00
Robin Appelman
413d577b29
add command to list groups 2016-07-19 09:58:59 +02:00
Robin Appelman
b44d439010
add occ command to list users 2016-07-19 09:58:59 +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
Joas Schilling
89a32a2f84 Merge pull request #412 from nextcloud/theming-foreground-color
Theming: invert foreground color on bright backgrounds
2016-07-18 12:43:11 +02:00
Nextcloud bot
d6907fe84d
[tx-robot] updated from transifex 2016-07-16 00:09:18 +00:00
Roeland Douma
f8167c0f9a Merge pull request #395 from nextcloud/user-preferences-occ
Allow to change user preferences via occ
2016-07-15 21:26:07 +02:00
Julius Haertl
387550be88
Theming: Implement swapping the foreground color for bright colors 2016-07-15 14:16:41 +02:00
Joas Schilling
2c988ecbf4
Use the themed Defaults everywhere 2016-07-15 09:17:30 +02:00
Joas Schilling
aaf2be4c3d
Use argument instead of value 2016-07-14 15:09:47 +02:00
Joas Schilling
1df65e9872
Don't need update permissions on hidden files 2016-07-14 10:25:53 +02:00
Joas Schilling
7b62a8de05
Add delete permissions to the default (new in oc9.1) 2016-07-14 10:25:24 +02:00
Joas Schilling
4656b79c8e
FIx my email 2016-07-13 18:46:27 +02:00
Joas Schilling
9ed62c3b81
Fix descriptions 2016-07-13 18:44:00 +02:00
Joas Schilling
dcacdde1ea
Add tests for set/get/delete/list 2016-07-13 18:43:57 +02:00
Joas Schilling
01899b8cf1
Add tests for checkInput() 2016-07-13 18:43:50 +02:00
Joas Schilling
db6dba9619
Allow deleting a setting 2016-07-13 18:43:46 +02:00
Joas Schilling
c3c7a5fd2c
Allow setting values 2016-07-13 18:43:43 +02:00
Joas Schilling
b96f0c99b0
Add a occ command to list/get user preferences 2016-07-13 18:43:36 +02:00
Morris Jobke
2eb48426af
Use tooltip for background jobs info tooltip 2016-07-13 13:01:17 +02:00
Nextcloud bot
67278d12e1
[tx-robot] updated from transifex 2016-07-11 00:09:22 +00:00
Nextcloud bot
c108d816ac
[tx-robot] updated from transifex 2016-07-09 00:09:16 +00: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
2791b8f00d Revert "occ web executor (#24957)"
This reverts commit 854352d9a0.
2016-07-07 12:14:45 +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
Morris Jobke
ed28885d73 Merge pull request #323 from Faldon/database_port
Added occ install option for database-port
2016-07-07 10:20:08 +02:00
Jenkins for ownCloud
38718bf89e [tx-robot] updated from transifex 2016-07-07 01:56:27 -04:00
Nextcloud bot
da2363a1dd [tx-robot] updated from transifex 2016-07-06 13:28:06 +00:00
Thomas Pulzer
0638937ada Changed the input option for database-port to required when parameter was provided.
Added casting database port to int for input sanitation in pgsql and oci connections.
2016-07-06 11:31:28 +02:00
Thomas Pulzer
d367318088 Added occ install option for database-port.
Extended the database setup to store the database port.
Changed the PostgreSQL connection error message for clarification.
2016-07-06 09:58:38 +02: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
Thomas Pulzer
90b7f74da7 Changed name of default logfile from owncloud.log to nextcloud.log. 2016-07-04 11:50:32 +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
61e604c2d9 adjusts tests to removal of svg fallback 2016-07-01 16:36:37 +02:00
Hendrik Leppelsack
c47833718f remove svg classes 2016-07-01 16:36:37 +02:00
Hendrik Leppelsack
11be3d6276 remove png references in core 2016-07-01 16:36:37 +02:00
Hendrik Leppelsack
769deaee2f remove png actions, fileicons, etc 2016-07-01 16:36:37 +02:00
Hendrik Leppelsack
bc5c89e9c0 remove javascript png fallback for svg 2016-07-01 16:36:37 +02:00
Vincent Petry
ba95297c5c Merge pull request #25262 from owncloud/fed-sharing-error
Only save federated share after remote server is notified
2016-07-01 16:20:39 +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
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
Morris Jobke
b6397ef73a Merge pull request #236 from nextcloud/master-sync-upstream
[Master] sync upstream
2016-06-28 09:02:03 +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
Christoph Wurst
b14376419d Merge pull request #25263 from owncloud/decryptall-keepencryptionenabledforsingleuser
Keep encryption enabled if decrypting for single user
2016-06-27 12:19:45 +02:00
Vincent Petry
199c8e304c Merge pull request #25250 from owncloud/linkshare-includedeletewithuploadperms
Add explicit delete permission to link shares
2016-06-27 12:14:05 +02:00
Lukas Reschke
27b699bdbc Migrate logic to dynamic controller
Also adds support for having custom login backgrounds
2016-06-27 10:26:23 +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
Jenkins for ownCloud
ee90bef50a [tx-robot] updated from transifex 2016-06-27 01:55:57 -04: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
Vincent Petry
f062b62f03 Keep encryption enabled if decrypting for single user
When decrypting all files of a single user, the admin usually does not
intend encryption to be suddenly disabled for everyone. This fix
reenables encryption after decrypting for a single user.

Decrypting for all users will still disable encryption globally.
2016-06-24 16:46:25 +02:00
Robin Appelman
ee674844f2 better detect errors in fed sharing response 2016-06-24 15:56:33 +02:00
Vincent Petry
955635c7aa Add explicit delete permission to link shares
Link shares always allowed deletion, however internally the permissions
were stored as 7 which lacked delete permissions. This created an
inconsistency in the Webdav permissions.

This fix makes sure we include delete permissions in the share
permissions, which now become 15.

In case a client is still passing 7 for legacy reasons, it gets
converted automatically to 15.
2016-06-24 09:48:48 +02:00
Vincent Petry
dc78d26f2a Merge pull request #25239 from owncloud/setupchecks-preventreload
Don't reload page in case of auth errors during setup checks
2016-06-24 09:47:55 +02:00
Hendrik Leppelsack
e5d8726859 remove ie8+9 support 2016-06-23 12:34:53 +02:00
Vincent Petry
97f1813695
Don't reload page in case of auth errors during setup checks
If an error occurs during setup checks, do not let the global ajax
error handler reload the page.
2016-06-23 11:54:49 +02:00
Joachim Sokolowski
d7d7b49647 to Nextcloud 2016-06-22 17:41:01 +02:00
Vincent Petry
4a2fb1b4cb
Init the headers in iedavclient.js 2016-06-22 16:58:06 +02:00
VicDeo
854352d9a0 occ web executor (#24957)
* Initial web executor

* Fix PHPDoc

Fix broken integration test

OccControllerTests do not require database access - moch them all!

Kill unused sprintf
2016-06-22 13:12:36 +02:00
Morris Jobke
7e186194c4
Fix translation strings 2016-06-22 10:27:24 +02:00
Morris Jobke
7ba89b1175 Merge pull request #196 from JSoko/patch-2
singleuser.user.php -> nextcloud
2016-06-22 10:25:03 +02:00
Joachim Sokolowski
a83cbee717 changed to nextcloud 2016-06-22 08:20:23 +02:00
Joachim Sokolowski
1ffd8d0d96 nextcloud server
nextcloud server
2016-06-22 08:07:45 +02:00
Jenkins for ownCloud
b85bcccc09 [tx-robot] updated from transifex 2016-06-22 01:54:55 -04:00
Joachim Sokolowski
64a9f9d77b singleuser.user.php -> nextcloud
Changed to nextcloud
2016-06-22 07:48:36 +02:00
Lukas Reschke
2b493e2f9d
Merge remote-tracking branch 'upstream/master' into master-sync-upstream 2016-06-21 11:18:22 +02:00
Jan-Christoph Borchardt
5df13ec5c4 make loading spinner thicker and color lighter 2016-06-20 11:00:42 +02:00
Jenkins for ownCloud
bd13353c4d [tx-robot] updated from transifex 2016-06-20 01:54:50 -04:00
Jenkins for ownCloud
cc532bb14a [tx-robot] updated from transifex 2016-06-17 02:00:01 -04:00
Robin Appelman
8485f5bcb1 Prevent the advanced options toggle in the setup from acting as a link 2016-06-16 15:25:56 +02:00
Jan-Christoph Borchardt
44910510f6 fix grouped input fields, make sure they take precedence 2016-06-16 11:43:57 +02:00
Marius Blüm
d9be370b86 Merge pull request #83 from nextcloud/file-drop-highlight
File drop highlight
2016-06-15 17:36:16 +02:00
Morris Jobke
3720bae3ec
fix setup page strengthify
* fixes #105
2016-06-15 15:27:30 +02:00
Morris Jobke
a1b1d6ac7d
Update strengthify to 0.5.1 2016-06-15 15:20:21 +02:00
Vincent Chan
10f8d643dc store icons in class 2016-06-15 14:42:39 +02:00
Jenkins for ownCloud
be4a29d75f [tx-robot] updated from transifex 2016-06-15 05:54:49 +00:00
Morris Jobke
5e2726c0e7
Change name of the product in update message
* also update all german translations
* fixes #96
2016-06-14 17:02:55 +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
Lukas Reschke
01f8434a75 Merge pull request #57 from nextcloud/fdrop-template
smaller files drop fixes
2016-06-13 00:14:34 +02:00
Arthur Schiwon
42c66efea5
Merge branch 'master' of https://github.com/owncloud/core into downstream-160611 2016-06-11 15:34:43 +02:00
Arthur Schiwon
ca43c49709
smaller files drop fixes
* fix infinite spinner on blacklisted files
* move HTML to template
* indentation
2016-06-11 15:15:37 +02:00
William Bargent
e90931c99b Upload progress nextcloud blue 2016-06-11 08:47:29 +01:00
William Bargent
25470e6992 Sets notification background to white 2016-06-11 08:15:56 +01:00
Lukas Reschke
842cc2a788 Merge pull request #19 from nextcloud/files-drop
add "hide file list" option
2016-06-10 18:29:09 +02:00
Jan-Christoph Borchardt
6a89518e98 invert colors of favicons to match header and log in site, white on blue 2016-06-10 18:03:29 +02:00
Jörn Friedrich Dreyer
c45b7b0bdf Allow empty host when installing on oracle via CLI (#25034) 2016-06-10 11:16:32 +02:00
William Bargent
d64f46afae Single block for PHP Mod not installed 2016-06-10 09:44:41 +01:00
Vincent Petry
6660488b73 Merge pull request #25048 from owncloud/email-login-leak
Do not leak the login name
2016-06-10 10:41: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
Lukas Reschke
0b00a06a0d
Fix indentation 2016-06-09 18:17:04 +02:00
Lukas Reschke
5fdde426eb
Add fancy layout 2016-06-09 17:55:26 +02:00
blizzz
51fd2602a7 Revert "Downstream 2016-06-08" 2016-06-09 17:41:57 +02:00
Thomas Müller
232d735893
Do not leak the login name - fixes #25047 2016-06-09 16:44:31 +02:00
Bjoern Schiessle
bb54ab0db8
add hide file list option 2016-06-09 15:15:17 +02:00
Joas Schilling
4c26abe228 Fix the FIXME (#25022) 2016-06-09 15:05:02 +02:00
Joas Schilling
7f88645eab
Allow to cancel 2FA after login 2016-06-09 14:00:02 +02:00
Sergio Bertolín
fad91e92f0
Fixed reviews 2016-06-09 14:00:00 +02:00
Joas Schilling
4f27c2c433
Allow to decrypt user '0' files only 2016-06-09 14:00:00 +02:00
Christoph Wurst
60e15e934c
do not generate device token if 2FA is enable for user 2016-06-09 14:00:00 +02:00
davitol
3b5c169869
Comments fixed 2016-06-09 13:59:59 +02:00
davitol
ad33992eb9
Fix Decrypt message via occ 2016-06-09 13:59:59 +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
Vincent Petry
7c8d2a8520 Merge pull request #25027 from owncloud/fix-22746-narrowtooltip
Added width of the tooltip
2016-06-08 17:34:30 +02:00
Jan-Christoph Borchardt
81145ee57c THIS IS NEXTCLOUD! adjusting the design 2016-06-08 17:02:18 +02:00
Sergio Bertolín
e70bd36e5d Added width of the tooltip 2016-06-08 11:38:39 +00:00
Vincent Petry
7dcc47dc94 Merge pull request #25011 from owncloud/issue-24745-allow-to-cancel-2fa
Allow to cancel 2FA after login
2016-06-08 10:27:21 +02:00
Vincent Petry
12683b786d Merge pull request #24991 from owncloud/2fa-do-not-generate-token
do not generate device token if 2FA is enable for user
2016-06-08 10:13:04 +02:00
Vincent Petry
9b6125e49b Merge pull request #24992 from owncloud/fix_decrypt_message
Fix Decrypt message via occ
2016-06-08 10:12:47 +02:00
Vincent Petry
b7935dcebd Merge pull request #24998 from owncloud/issue-24994-allow-decrypting-user-0-only
Allow to decrypt user '0' files only
2016-06-08 10:12:28 +02:00
Christoph Wurst
4bff16e52d
darker background image for better font contrast 2016-06-08 08:34:08 +02:00
Vincent Petry
fb087a0261
Use temporary htaccesstest.txt for data dir security check 2016-06-07 18:36:13 +02:00
Joas Schilling
3e3b326c85
Allow to cancel 2FA after login 2016-06-07 18:17:29 +02:00
Sergio Bertolín
67c9e598ae Fixed reviews 2016-06-07 07:55:28 +00:00
Joas Schilling
d4ba982131
Allow to decrypt user '0' files only 2016-06-07 09:13:11 +02:00
Christoph Wurst
8f7a4aaa4d
do not generate device token if 2FA is enable for user 2016-06-07 09:09:51 +02:00
William Bargent
6256bbdd20 Remove background from curved logo (#24980) 2016-06-06 17:06:28 +02:00
davitol
f9b3865093 Comments fixed 2016-06-06 16:10:49 +02:00
davitol
eaeb5d606d Fix Decrypt message via occ 2016-06-06 15:28:49 +02:00
Jenkins for ownCloud
4234892a60 [tx-robot] updated from transifex 2016-06-04 02:01:18 -04:00
Jenkins for ownCloud
63132483ca [tx-robot] updated from transifex 2016-06-03 02:19:30 -04:00
Vincent Petry
6b1422929d Merge pull request #24947 from owncloud/2fa-remember-redirect-url
remember redirect_url when solving the 2FA challenge
2016-06-02 10:40:32 +02:00
Jenkins for ownCloud
f9f8fb7bf2 [tx-robot] updated from transifex 2016-06-02 01:55:16 -04:00
Christoph Wurst
5e71d23ded
remember redirect_url when solving the 2FA challenge 2016-06-01 14:43:47 +02:00
Jenkins for ownCloud
a9f666f36e [tx-robot] updated from transifex 2016-06-01 01:56:03 -04:00
Vincent Petry
235f03da64 Merge pull request #24795 from owncloud/issue-24789-reset-password-link-new-window
Allow opening the password reset link in a new window when its a URL
2016-05-31 10:12:30 +02:00
Jenkins for ownCloud
b2e524b936 [tx-robot] updated from transifex 2016-05-31 01:54:58 -04:00