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

5416 commits

Author SHA1 Message Date
Thomas Müller
0bccdbc959 Merge pull request #21849 from owncloud/add-custom-marker-into-htaccess 
Add custom marker into htaccess and execute integrity check after installation
 2016-01-22 13:13:59 +01:00
Thomas Müller
e3013a99ef Merge pull request #21816 from owncloud/require-a-specific-path-instead-of-autoguessing 
Use path instead of app id for occ app signing
 2016-01-22 13:13:41 +01:00
Lukas Reschke
a0b383c5e8 Run on installer 2016-01-22 11:52:53 +01:00
Joas Schilling
3038006e8e Add a default app icon for apps that don't have one 2016-01-22 11:38:11 +01:00
Jenkins for ownCloud
b74cdb7da3 [tx-robot] updated from transifex 2016-01-22 01:55:28 -05:00
Joas Schilling
f108dbfa6a Move getDescriptiveTag to core 2016-01-21 15:56:25 +01:00
Thomas Müller
2b4532c6b9 Merge pull request #21797 from owncloud/proper-controller-in-core 
Move controller in core/ to a common subfolder
 2016-01-21 15:20:10 +01:00
Thomas Müller
ec8022d241 Merge pull request #20847 from owncloud/systemtags-ui 
System tags sidebar section
 2016-01-21 12:12:40 +01:00
Lukas Reschke
ea367b598a Use path instead of app id 
This change requires the usage of a path instead of the App ID when signing code. This has the advantage that developers can also sign code under a different location to make it easier. (e.g. remove `.git`, …)

Also it adds an example command usage as well as a link to the documentation
 2016-01-20 20:38:18 +01:00
Morris Jobke
b188de242e Show default placeholder if avatar image can't be fetched 
* fixes owncloud/documents#601
* ref #14564
 2016-01-20 15:18:57 +01:00
Morris Jobke
d6a63016ae move lost controller to core/controller 
* lostpassword.css is unneeded since #11696 is merged - 1b50d4f7ce
* js is already in core/js
* css is moved to core/css/lostpassword
* template is moved to core/templates/lostpassword
 2016-01-20 10:42:19 +01:00
Morris Jobke
c2a1a02fe4 move user controller to core/controller 2016-01-20 10:23:57 +01:00
Morris Jobke
06fe4cabfc move setup controller to core/controller 2016-01-20 10:23:57 +01:00
Morris Jobke
b97fe97875 move avatar controller to core/controller 2016-01-20 10:23:52 +01:00
Jenkins for ownCloud
f076bfac32 [tx-robot] updated from transifex 2016-01-20 01:54:54 -05:00
Vincent Petry
ffba6d0a7e Added system tags GUI in sidebar 
Added files details sidebar panel to assign/unassign/rename/delete
system tags.
 2016-01-19 16:24:26 +01:00
Vincent Petry
8d41cbb97a Implement toggleselect extension for select2 
To make it possible to toggle selected values inside the dropdown
 2016-01-19 16:24:26 +01:00
Joas Schilling
56184f799e Make it possible to enable apps for groups only via occ 2016-01-19 14:29:12 +01:00
Joas Schilling
78a02d1b2f Make it possible to disable apps via the console, which are not enabled for the current user 2016-01-19 14:29:01 +01:00
Joas Schilling
d2285113a8 Make sure to list "group enabled" apps as enabled 
also when they are not enabled for the current user
 2016-01-19 14:29:01 +01:00
Morris Jobke
6e096936e5 update JS humanFileSize to use KB instead of kB 2016-01-19 10:51:57 +01:00
Joas Schilling
50557b19b6 Run the command once again 2016-01-18 11:13:25 +01:00
Joas Schilling
fc08f71c12 Sort the list before saving 2016-01-18 11:13:09 +01:00
Jenkins for ownCloud
2095a31000 [tx-robot] updated from transifex 2016-01-17 01:54:53 -05:00
Vincent Petry
857c316bda Backbone transport for Webdav 2016-01-16 11:28:04 +01:00
Jenkins for ownCloud
7a239b2642 [tx-robot] updated from transifex 2016-01-16 01:55:18 -05:00
Thomas Müller
4cbed04273 Merge pull request #21370 from owncloud/system-certs-occ 
Add occ commands to manager trusted certificates
 2016-01-15 14:18:01 +01:00
Jenkins for ownCloud
cd840f01ae [tx-robot] updated from transifex 2016-01-15 01:54:57 -05:00
Joas Schilling
f2cb03e155 Allow array recursion in get 2016-01-14 15:02:55 +01:00
Joas Schilling
a06f0256a9 Allow deleting a nested system config value 2016-01-14 15:02:54 +01:00
Joas Schilling
00ab50defc Retain backwards compatibility 2016-01-14 15:02:54 +01:00
Robin McCorkell
b9d384d837 occ config:system:set can now set other value types 
Integers, doubles, booleans and even arrays can now be set, with the
--type=... option. Array setting can be specified by passing multiple
name arguments, e.g. `./occ config:system:set redis port --value=123
--type=integer`
 2016-01-14 15:02:54 +01:00
Jenkins for ownCloud
205fbcbfa3 [tx-robot] updated from transifex 2016-01-14 01:55:43 -05:00
Hendrik Leppelsack
99b9ec41c1 support print stylesheets 2016-01-13 15:12:11 +01:00
Robin Appelman
c67a09112b Add occ commands to manager trusted certificates 2016-01-13 14:35:37 +01:00
Thomas Müller
cc4e4ecf0f Merge pull request #21676 from owncloud/fix-setup-login-input-shadows 
fix login/setup page input shadows
 2016-01-13 14:19:57 +01:00
Thomas Müller
3d4ec16a5f Merge pull request #21659 from ErikPel/cssfix 
Fixed #21542
 2016-01-13 10:53:56 +01:00
Thomas Müller
b1ee51f255 Merge pull request #21630 from owncloud/add-some-security-headers-as-hardening 
Add X-Download-Options and X-Permitted-Cross-Domain-Policies
 2016-01-13 10:33:58 +01:00
Erik Pellikka
af57fe59b9 Fixed #21542 
Changed to 5 pixel
 2016-01-13 11:18:59 +02:00
Christoph Wurst
ee35cba7f1 fix login/setup page input shadows 
fixes #21658
 2016-01-13 10:06:21 +01:00
Thomas Müller
c5a200c419 Merge pull request #21653 from owncloud/update-license-headers-2016 
Update license headers 2016
 2016-01-13 08:29:42 +01:00
Jenkins for ownCloud
eb90fa78ad [tx-robot] updated from transifex 2016-01-13 01:55:56 -05:00
Thomas Müller
682821c71e Happy new year! 2016-01-12 15:02:18 +01:00
Thomas Müller
2493cfede9 Merge pull request #21640 from owncloud/add-config-to-disable-wellknown-check 
Add config switch to disable the .well-known URL check
 2016-01-12 14:46:09 +01:00
Lukas Reschke
4d0dcd3c53 Add X-Download-Options and X-Permitted-Cross-Domain-Policies 
Two small security hardenings for our IE users and those with Adobe products. Aligns it more with https://github.com/twitter/secureheaders#secureheaders---
 2016-01-12 10:37:16 +01:00
Morris Jobke
8b6b042ffd Add config switch to disable the .well-known URL check 2016-01-12 09:53:23 +01:00
Morris Jobke
a6c7cdd75e Show the well-known URL check as info instead of error 
* ref https://github.com/owncloud/core/pull/21562#issuecomment-170344549
 2016-01-12 09:18:20 +01:00
Thomas Müller
3ec8789c77 Merge pull request #21628 from owncloud/deprecated_secure_random_funcions 
Replace deprecated function calls to SecureRandom
 2016-01-12 09:12:13 +01:00
Jenkins for ownCloud
44e91bb90a [tx-robot] updated from transifex 2016-01-12 01:56:33 -05:00
Roeland Jago Douma
876fb83ddc getMediumStrengthGenerator is deprecated and does not do anything anymore 2016-01-11 20:06:30 +01:00
Jenkins for ownCloud
77a8085f84 [tx-robot] updated from transifex 2016-01-11 01:55:34 -05:00
Jenkins for ownCloud
580deb09f8 [tx-robot] updated from transifex 2016-01-10 01:55:57 -05:00
Thomas Müller
c5b2b3a124 Merge pull request #21562 from owncloud/properly-check-for-well-known-redirect 
Add check for .well-known URL in the root of the webservers URL
 2016-01-09 17:42:11 +01:00
Jenkins for ownCloud
72b34575df [tx-robot] updated from transifex 2016-01-09 01:55:50 -05:00
Morris Jobke
0161928fc3 Add check for .well-known URL in the root of the webservers URL 
* fixes #20012
 2016-01-08 23:27:29 +01:00
Thomas Müller
dfbb24aa92 Merge pull request #21458 from owncloud/login-gradient 
add back gradient for log in page in Firefox, fix accidental removal
 2016-01-08 18:20:54 +01:00
Thomas Müller
756876b5dc Merge pull request #21548 from owncloud/issue-21511-correctly-display-notify-option-for-shares 
Check the correct config for displaying the "notify by email" option
 2016-01-08 18:19:09 +01:00
Joas Schilling
334a6d57a3 Check the correct config for displaying the "notify by email" option 2016-01-08 14:15:06 +01:00
Roeland Jago Douma
186e35d954 Verify the path is a file on avatar update 
Fixes #21533

Before we just assumed that the passed path was a file. This does not
have to be the case. Thus check if it actually is a file before doing
any more tests.
 2016-01-08 10:03:49 +01:00
Jenkins for ownCloud
88c4cba1f5 [tx-robot] updated from transifex 2016-01-08 01:56:39 -05:00
Thomas Müller
1cc6fddead Merge pull request #21498 from owncloud/cleanup-OC_DB 
Cleanup OC_DB methods
 2016-01-07 20:13:16 +01:00
Joas Schilling
c55da1fc8d Add a warning to the app:check-code if the version is missing 2016-01-07 15:04:36 +01:00
Morris Jobke
190cc2bb67 Remove OC_DB::getConnection 2016-01-07 14:54:55 +01:00
Jenkins for ownCloud
27dfa74d89 [tx-robot] updated from transifex 2016-01-07 01:55:48 -05:00
Thomas Müller
d3922510d0 Merge pull request #20994 from owncloud/personal-page 
improve layout of personal settings page
 2016-01-06 17:25:12 +01:00
Thomas Müller
b8ecf19650 Merge pull request #21349 from owncloud/web_use_sharee 
Webinterface use sharee API
 2016-01-06 17:24:52 +01:00
Jenkins for ownCloud
c77917f48c [tx-robot] updated from transifex 2016-01-06 01:55:16 -05:00
Jörn Friedrich Dreyer
d988685496 Merge pull request #21377 from owncloud/login-submit-button-border-2 
Remove unnecessary border from login button
 2016-01-05 15:13:06 +01:00
Jan-Christoph Borchardt
8f7ee523fe add back gradient for log in page in Firefox, fix accidental removal 2016-01-05 10:44:10 +01:00
Jenkins for ownCloud
d4034ffca0 [tx-robot] updated from transifex 2016-01-05 01:57:14 -05:00
Björn Schießle
58b1221ad3 don't show previous log level in upgrade message 2016-01-04 11:50:07 +01:00
Jenkins for ownCloud
157bb50a39 [tx-robot] updated from transifex 2016-01-04 01:55:05 -05:00
jowi
05e6dd9c1a fixed fallbacks and code style 2016-01-02 19:43:09 +01:00
Jenkins for ownCloud
970495a067 [tx-robot] updated from transifex 2015-12-31 01:55:16 -05:00
Roeland Jago Douma
6bd15856b2 Added js tests for the Sharee API usage 2015-12-30 10:46:19 +01:00
Roeland Jago Douma
49031e0744 Fix unit tests 2015-12-30 08:58:04 +01:00
Roeland Jago Douma
f99fcd5dd6 Filter out share owner in sharee suggestion list 2015-12-30 08:58:04 +01:00
Roeland Jago Douma
fa7996aa8a Web sharing uses sharee endpoint 2015-12-30 08:58:04 +01:00
Christoph Wurst
598883ffa0 Remove unnecessary border from login button 2015-12-29 09:32:40 +01:00
Jan-Christoph Borchardt
640adde3b9 improve layout of personal settings page 2015-12-28 18:50:50 +01:00
Thomas Müller
9c4ab51735 Merge pull request #21364 from owncloud/bring_back_icons_filepicker 
Get the icon in javascript for the filepicker
 2015-12-28 10:21:58 +01:00
Thomas Müller
245dac7e81 Merge pull request #20992 from owncloud/log-in-noselect 
prevent selecting on log in page to solve ugliness on accidental selection
 2015-12-28 10:18:30 +01:00
Jenkins for ownCloud
89584716f8 [tx-robot] updated from transifex 2015-12-28 01:55:10 -05:00
Jenkins for ownCloud
6fe60569f5 [tx-robot] updated from transifex 2015-12-27 01:54:38 -05:00
Jenkins for ownCloud
33a83a0926 [tx-robot] updated from transifex 2015-12-25 01:55:16 -05:00
Jan-Christoph Borchardt
1622589ac5 prevent selecting on log in page to solve ugliness on accidental selection 2015-12-24 11:01:31 +01:00
Roeland Jago Douma
2fc458479e [Avatars] Calculate 'sane' hue precissions 
We used to get the numeric value of the entrire md5 string which is a
128bit integer. We would then devide this by the maxval of a 128bit int.

There is no need for such huge computations. As we just require a value
between 0 and 255. Thus using two 16 bit values is more than enough to
get the precision we need. By just taking the MSB we get nearly
identical results.
 2015-12-24 10:50:12 +01:00
Roeland Jago Douma
9be43e10af Since the server no longer calculates the icon 
The server no longer calculates the icon. So we have the js side do it
for us.
 2015-12-24 08:59:32 +01:00
Jenkins for ownCloud
9cdc3f0558 [tx-robot] updated from transifex 2015-12-24 01:55:14 -05:00
Lukas Reschke
cebeb0e052 Fix unit tests 
Fixes https://github.com/owncloud/core/issues/21345
 2015-12-23 09:11:22 +01:00
Jenkins for ownCloud
726f7e5fa8 [tx-robot] updated from transifex 2015-12-23 02:02:31 -05:00
Renaud Fortier
83899a5fa1 add _blank to href 2015-12-21 13:28:32 -05:00
Jenkins for ownCloud
d0cb4c9ab3 [tx-robot] updated from transifex 2015-12-19 01:55:14 -05:00
Morris Jobke
ed98cdf532 Use OCP\Util::getVersion instead of the internal private implementation 2015-12-18 15:26:54 +01:00
Thomas Müller
551e553bf4 Merge pull request #21264 from owncloud/deprecated_oc_user_methods 
Cleanup OC_User deprecated methods
 2015-12-18 10:15:18 +01:00
Roeland Jago Douma
c64e827f00 Since avatar.js is now essentially empty remove it 2015-12-17 16:32:18 +01:00
Roeland Jago Douma
6248bad0f7 Add a default size to the avatar placeholders 
This removed the need to do an avatar request on the "empty" row in the
user settings.
 2015-12-17 16:30:23 +01:00
Roeland Jago Douma
7e44ea5da0 Remove deprecated function OC_User::getManager 
Private deprecated function => removed
Replaced all instances with suggested replacement
 2015-12-17 16:18:34 +01:00
Thomas Müller
3bcaaa6c3a Merge pull request #21259 from owncloud/load_big_avatar_only_personal 
Only load the big (128x128) avatar on the perosnal page
 2015-12-17 16:07:50 +01:00
Thomas Müller
1285b78086 Merge pull request #21200 from owncloud/files-authorizationheader 
Use Authorization headers for public webdav in web UI
 2015-12-17 15:30:13 +01:00
Thomas Müller
e3ed42135d Merge pull request #21240 from owncloud/avatar_speedup 
Avatar speedup
 2015-12-17 14:43:21 +01:00
Thomas Müller
358b84c21d Merge pull request #21253 from owncloud/deprecated_oc_helper_linkTo 
Remove deprecated OC_Helper::linkTo
 2015-12-17 14:43:02 +01:00
Roeland Jago Douma
a81836a42f Only load the big (128x128) avatar on the perosnal page 
Before the code was executed on every page if a user was logged in. Now
only on the personal page. Thus saving a request on all other pages.
 2015-12-17 13:55:22 +01:00
Roeland Jago Douma
19eeb23b91 OC_Helper::linkTo is deprecated 
Replaced with suggested (and calling body of)
 2015-12-17 10:53:21 +01:00
Thomas Müller
fa983caeaa Merge pull request #21238 from owncloud/files-fixparsewebdavmtime 
Fix files UI mtime parsing from webdav
 2015-12-17 10:24:36 +01:00
Jenkins for ownCloud
a7cd8103b5 [tx-robot] updated from transifex 2015-12-17 01:55:09 -05:00
Roeland Jago Douma
3e80f14269 [Avatar] Make the avatar controller use the avatar node 2015-12-16 21:41:58 +01:00
Vincent Petry
181ba7b4e1 Fix files UI mtime parsing from webdav 2015-12-16 17:44:16 +01:00
Vincent Petry
595fd9de6e Add davidchambers/base64 JS library 2015-12-14 17:48:30 +01:00
Vincent Petry
ab9849e72f Use Authorization headers for public webdav instead of URL 
Instead of prepending the token as username in the URL, use the
Authorization header instead. This is because IE9 considers this a
cross-domain call and refuses to do it in the first place.
 2015-12-14 17:42:13 +01:00
Thomas Müller
583e696c9e Merge pull request #21163 from owncloud/fix_20839 
Files can't have create permissions
 2015-12-14 10:25:27 +01:00
Jenkins for ownCloud
74de12c698 [tx-robot] updated from transifex 2015-12-13 01:54:51 -05:00
Jenkins for ownCloud
f2ac1a80d8 [tx-robot] updated from transifex 2015-12-12 01:55:39 -05:00
Roeland Jago Douma
e8d5eb65c6 Files can't have create permissions 
Fixes #20839
 2015-12-11 22:28:26 +01:00
Jenkins for ownCloud
078ca149b5 [tx-robot] updated from transifex 2015-12-10 01:55:17 -05:00
Victor Dubiniuk
b59285d0d0 Add occ command to get app path 2015-12-09 11:22:13 +01:00
Morris Jobke
d39b018893 Allow occ install on OS X - same behaviour as web setup 2015-12-09 10:49:54 +01:00
Jenkins for ownCloud
dda9525c4b [tx-robot] updated from transifex 2015-12-09 01:55:14 -05:00
Lukas Reschke
4b293dffe5 Use \OCP\Util::sanitizeHTML instead of \OC_Util::sanitizeHTML 2015-12-08 08:56:47 +01:00
Thomas Müller
d6276faff6 Merge pull request #21014 from owncloud/share-unsharelinkpapercut 
Fix unshare link click element
 2015-12-08 08:39:33 +01:00
Jenkins for ownCloud
736e133c04 [tx-robot] updated from transifex 2015-12-08 01:56:19 -05:00
Thomas Müller
b15d77c934 Merge pull request #21015 from owncloud/update-redirecttocorrectpage 
Redirect to correct URL after updating
 2015-12-07 19:55:45 +01:00
Thomas Müller
4100263bd6 Merge pull request #20996 from owncloud/issue-12215-remove-password-reset-when-not-possible 
Issue 12215 remove password reset when not possible
 2015-12-07 19:55:26 +01:00
Vincent Petry
69ab047f89 Redirect to correct URL after updating 
Now requires a trailing slash to make sure we don't land on the
forbidden page.
 2015-12-07 18:08:00 +01:00
Vincent Petry
5567b6cee2 Fix unshare link click element 
When clicking on the unshare link (trash icon), the correct link element
needs to be used instead of whatever child was clicked. Then, that
element might contain a visible loading icon.

This fixes the spinner detection and also prevents a full page reload in
case the spinner was visible.
 2015-12-07 17:58:17 +01:00
Thomas Müller
77958bb601 Merge pull request #21009 from owncloud/share-forbidlinkshare-duplicatefield 
Fix duplicate bogus share field when link sharing is not allowed
 2015-12-07 17:49:24 +01:00
Thomas Müller
939ba745ee Merge pull request #20991 from owncloud/disabled-checked-checkbox-css-rules 
Disabled checked checkbox css rules
 2015-12-07 17:11:26 +01:00
Vincent Petry
6735005be0 Fix duplicate bogus share field when link sharing is not allowed 
Whenever link share is not allowed, it was outputting a bogus sharing
field which name would conflict with the regular sharing field.

This fix makes sure that the bogus sharing field with "Resharing not
allowed" message only appears when triggered by removed share
permissions.
 2015-12-07 16:53:56 +01:00
Joas Schilling
87bc02c6cd Allow specifying a custom reset-password-url 2015-12-07 15:41:40 +01:00
Joas Schilling
f8f3c9ecf9 Remove password reset when the user can not change the password 2015-12-07 15:14:19 +01:00
Joas Schilling
57cd5209ca Add rules for checked+disabled and disabled checkbox style 2015-12-07 14:57:03 +01:00
Thomas Müller
9c550a07ed OC.FilePath has still a valid use case when generating paths to static files what for generateUrl cannot be used for - closes #15604 2015-12-07 12:23:42 +01:00
Thomas Müller
cd6bc79c40 Merge pull request #20530 from owncloud/icons-more 
add icons for disabled checkbox, radio button, error and colored checkmark
 2015-12-07 10:22:49 +01:00
Thomas Müller
30bd915c0e Merge pull request #20480 from owncloud/css-prefixes 
CSS prefixes
 2015-12-07 10:21:35 +01:00
Thomas Müller
f3d49a89fe Merge pull request #11131 from owncloud/use-phpini-wrapper 
Replacing ini_get instances with inigetwrapper usages
 2015-12-07 10:20:59 +01:00
Jenkins for ownCloud
884946276e [tx-robot] updated from transifex 2015-12-07 01:54:35 -05:00
Jenkins for ownCloud
f0b1ba713d [tx-robot] updated from transifex 2015-12-05 01:55:14 -05:00
Roeland Jago Douma
50d862e5d1 [Avatars] JS should not load same avatar twice 
Old code first dit an ajax request to the avatar. Then a new image
object with the same src was created and since we do not cache avatars
yet :(  this resulted in 2 sequential requests to the exact same URL

Now if you set the displayname it will first set the placeholder and
then load the avatar in the background. Only once this time!
 2015-12-04 10:42:11 +01:00
Jenkins for ownCloud
a2848af625 [tx-robot] updated from transifex 2015-12-04 01:56:31 -05:00
Thomas Müller
7fefd4f4d9 Merge pull request #20860 from owncloud/use-user-getEMailAddress-all-over-the-place 
User IUser::getEMailAddress() all over the place
 2015-12-03 09:21:53 +01:00
Jenkins for ownCloud
5c178a2719 [tx-robot] updated from transifex 2015-12-03 01:55:12 -05:00
Thomas Müller
eebe2b9c23 User IUser::getEMailAddress() all over the place 2015-12-02 21:25:05 +01:00
Lukas Reschke
2515cb17be Support pretty URLs 
This changeset allows ownCloud to run with pretty URLs, they will be used if mod_rewrite and mod_env are available. This means basically that the `index.php` in the URL is not shown to the user anymore.

Also the not deprecated functions to generate URLs have been modified to support this behaviour, old functions such as `filePath` will still behave as before for compatibility reasons.

Examples:
http://localhost/owncloud/index.php/s/AIDyKbxiRZWAAjP => http://localhost/owncloud/s/AIDyKbxiRZWAAjP
http://localhost/owncloud/index.php/apps/files/ => http://localhost/owncloud/apps/files/

Due to the way our CSS and JS is structured the .htaccess uses some hacks for the final result but could be worse... And I was just annoyed by all that users crying for the removal of `index.php` ;-)
 2015-12-01 16:46:07 +01:00
Lukas Reschke
4971015544 Add code integrity check 
This PR implements the base foundation of the code signing and integrity check. In this PR implemented is the signing and verification logic, as well as commands to sign single apps or the core repository.

Furthermore, there is a basic implementation to display problems with the code integrity on the update screen.

Code signing basically happens the following way:

- There is a ownCloud Root Certificate authority stored `resources/codesigning/root.crt` (in this PR I also ship the private key which we obviously need to change before a release 😉). This certificate is not intended to be used for signing directly and only is used to sign new certificates.
- Using the `integrity:sign-core` and `integrity:sign-app` commands developers can sign either the core release or a single app. The core release needs to be signed with a certificate that has a CN of `core`,  apps need to be signed with a certificate that either has a CN of `core` (shipped apps!)  or the AppID.
- The command generates a signature.json file of the following format:
```json
{
    "hashes": {
        "/filename.php": "2401fed2eea6f2c1027c482a633e8e25cd46701f811e2d2c10dc213fd95fa60e350bccbbebdccc73a042b1a2799f673fbabadc783284cc288e4f1a1eacb74e3d",
        "/lib/base.php": "55548cc16b457cd74241990cc9d3b72b6335f2e5f45eee95171da024087d114fcbc2effc3d5818a6d5d55f2ae960ab39fd0414d0c542b72a3b9e08eb21206dd9"
    },
    "certificate": "-----BEGIN CERTIFICATE-----MIIBvTCCASagAwIBAgIUPvawyqJwCwYazcv7iz16TWxfeUMwDQYJKoZIhvcNAQEF\nBQAwIzEhMB8GA1UECgwYb3duQ2xvdWQgQ29kZSBTaWduaW5nIENBMB4XDTE1MTAx\nNDEzMTcxMFoXDTE2MTAxNDEzMTcxMFowEzERMA8GA1UEAwwIY29udGFjdHMwgZ8w\nDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBANoQesGdCW0L2L+a2xITYipixkScrIpB\nkX5Snu3fs45MscDb61xByjBSlFgR4QI6McoCipPw4SUr28EaExVvgPSvqUjYLGps\nfiv0Cvgquzbx/X3mUcdk9LcFo1uWGtrTfkuXSKX41PnJGTr6RQWGIBd1V52q1qbC\nJKkfzyeMeuQfAgMBAAEwDQYJKoZIhvcNAQEFBQADgYEAvF/KIhRMQ3tYTmgHWsiM\nwDMgIDb7iaHF0fS+/Nvo4PzoTO/trev6tMyjLbJ7hgdCpz/1sNzE11Cibf6V6dsz\njCE9invP368Xv0bTRObRqeSNsGogGl5ceAvR0c9BG+NRIKHcly3At3gLkS2791bC\niG+UxI/MNcWV0uJg9S63LF8=\n-----END CERTIFICATE-----",
    "signature": "U29tZVNpZ25lZERhdGFFeGFtcGxl"
}
```
`hashes` is an array of all files in the folder with their corresponding SHA512 hashes (this is actually quite cheap to calculate), the `certificate` is the  certificate used for signing. It has to be issued by the ownCloud Root Authority and it's CN needs to be permitted to perform the required action. The `signature` is then a signature of the `hashes` which can be verified using the `certificate`.

Steps to do in other PRs, this is already a quite huge one:
- Add nag screen in case the code check fails to ensure that administrators are aware of this.
- Add code verification also to OCC upgrade and unify display code more.
- Add enforced code verification to apps shipped from the appstore with a level of "official"
- Add enfocrced code verification to apps shipped from the appstore that were already signed in a previous release
- Add some developer documentation on how devs can request their own certificate
- Check when installing ownCloud
- Add support for CRLs to allow revoking certificates

**Note:** The upgrade checks are only run when the instance has a defined release channel of `stable` (defined in `version.php`). If you want to test this, you need to change the channel thus and then generate the core signature:

```
➜  master git:(add-integrity-checker) ✗ ./occ integrity:sign-core --privateKey=resources/codesigning/core.key --certificate=resources/codesigning/core.crt
Successfully signed "core"
```

Then increase the version and you should see something like the following:

![2015-11-04_12-02-57](https://cloud.githubusercontent.com/assets/878997/10936336/6adb1d14-82ec-11e5-8f06-9a74801c9abf.png)

As you can see a failed code check will not prevent the further update. It will instead just be a notice to the admin. In a next step we will add some nag screen.

For packaging stable releases this requires the following additional steps as a last action before zipping:
1. Run `./occ integrity:sign-core` once
2. Run `./occ integrity:sign-app` _for each_ app. However, this can be simply automated using a simple foreach on the apps folder.
 2015-12-01 11:55:20 +01:00
Jenkins for ownCloud
8421a43df1 [tx-robot] updated from transifex 2015-12-01 01:55:07 -05:00
Morris Jobke
42272de3a6 update bootstrap from 3.3.5 to 3.3.6 2015-11-30 14:12:57 +01:00
Morris Jobke
d8aa44d458 update backbone.js from 1.2.1 to 1.2.3 2015-11-30 14:12:48 +01:00
Lukas Reschke
f3e9106864 Don't trust update server 
In case the update server may deliver malicious content this would allow an adversary to inject arbitrary HTML into the response. So very bad stuff.

While signing the response would be better and something we can also do in the future (considering the code signing work), this is already a good first start.
 2015-11-28 12:21:53 +01:00
Jenkins for ownCloud
d305412a35 [tx-robot] updated from transifex 2015-11-28 01:55:16 -05:00
Joas Schilling
67a83d8fd6 Add Workflow app to shipped list 2015-11-27 14:26:39 +01:00
Jenkins for ownCloud
39fb320bae [tx-robot] updated from transifex 2015-11-27 01:55:14 -05:00
Jenkins for ownCloud
dd18ea611b [tx-robot] updated from transifex 2015-11-26 01:55:22 -05:00
Thomas Müller
906aea4252 Merge pull request #19212 from owncloud/search-shortcut 
Add Ctrl+F shortcut for the search bar
 2015-11-25 20:02:13 +01:00
Jan-Christoph Borchardt
cd88854369 update page: fix heading whitespace and unbold less important sections 2015-11-25 13:16:00 +01:00
Jan-Christoph Borchardt
50780e451b fix error page button text when label too long 2015-11-25 13:08:05 +01:00
Vincent Petry
b1ca431852 Fix for parsing pretty printed Webdav responses 
Update davclient.js + adjust IE workaround for this
 2015-11-24 15:26:53 +01:00
Hendrik Leppelsack
f1b0bf0696 add search fallback to browser 2015-11-24 15:01:20 +01:00
Jenkins for ownCloud
cb69e6c201 [tx-robot] updated from transifex 2015-11-24 01:56:32 -05:00
Clark Tomlinson
9caf4ffbfc Replacing ini_get instances with inigetwrapper usages 2015-11-23 14:12:31 +01:00
Thomas Müller
bf672d7e51 Merge pull request #20222 from owncloud/federated_sharing_auto_complete 
federated sharing auto-complete, first step
 2015-11-23 10:42:14 +01:00
Thomas Müller
43391f8f47 Merge pull request #20623 from owncloud/app-list-enhancements 
Add cmdline key to show shipped/non-shipped apps only
 2015-11-23 10:07:52 +01:00
Thomas Müller
79bbda994b Merge pull request #16902 from owncloud/jsocclient 
Web UI uses Webdav instead of ajax/* calls
 2015-11-23 09:38:01 +01:00
Victor Dubiniuk
8d9353a640 Add cmdline key to show shipped/non-shipped apps only 2015-11-23 09:06:35 +01:00
Hendrik Leppelsack
b2d2b52eea remove unneeded css prefixes 2015-11-23 09:03:54 +01:00
Jenkins for ownCloud
56e05a90af [tx-robot] updated from transifex 2015-11-23 01:54:53 -05:00
Vincent Petry
a05e40932c Now using IE8 workaround of davclient.js for all IE versions 2015-11-22 16:05:52 +01:00
Vincent Petry
fd40b06639 Patch for davclient.js for Firefox 2015-11-22 16:05:51 +01:00
Vincent Petry
7ec83fc9fb Fix OC.FileInfo to copy all properties 
This makes it possible to also store custom properties passed through
the data object like tags or shareOwner.
 2015-11-22 16:05:50 +01:00
Vincent Petry
e8661a6b56 Update davclient.js 2015-11-22 16:05:52 +01:00
Vincent Petry
a1d0682ef8 Use oc:fileid property instead of oc:id 2015-11-22 16:05:51 +01:00
Thomas Müller
ab1d786d87 Fix port issue - options.host already has the port attached 2015-11-22 16:05:51 +01:00
Vincent Petry
dc8ce87a26 Query tags/favorite through Webdav in file list 2015-11-22 16:05:50 +01:00
Vincent Petry
fa2be0750c Make files app use Webdav for most operations 2015-11-22 16:05:50 +01:00
Vincent Petry
f120846e29 Added OC.Files.Client Webdav-based files client 2015-11-22 16:05:49 +01:00
Vincent Petry
fb3d5c7856 Add evert's davclient.js + es6-promise + IE8 workaround 
- Add davclient.js lib
- Add es6-promise required by that lib
- Wrote IE8 workaround lib/shim for davclient.js
 2015-11-22 16:05:49 +01:00
Jenkins for ownCloud
2321cc4854 [tx-robot] updated from transifex 2015-11-22 01:54:53 -05:00
Jenkins for ownCloud
eb42340fa3 [tx-robot] updated from transifex 2015-11-21 01:54:59 -05:00
Jan-Christoph Borchardt
68a3a3ed6a add new icon rules to icons.css 2015-11-20 14:43:23 +01:00
Jan-Christoph Borchardt
c4a100f535 add icons for checked+disabled checkbox and radio 2015-11-20 14:43:23 +01:00
Jan-Christoph Borchardt
cebf0037ea compress action icons 2015-11-20 14:43:23 +01:00
Jan-Christoph Borchardt
b6e8a6e64f add icons for disabled checkbox, radio button, error and colored checkmark 2015-11-20 14:43:23 +01:00
Björn Schießle
c5e41450f6 add federation to shipped.json 2015-11-19 18:07:03 +01:00
Jenkins for ownCloud
c10be07c1b [tx-robot] updated from transifex 2015-11-19 01:55:13 -05:00
Jenkins for ownCloud
cd4380c322 [tx-robot] updated from transifex 2015-11-18 01:55:08 -05:00
Jenkins for ownCloud
56f44a457c [tx-robot] updated from transifex 2015-11-17 01:55:08 -05:00
Thomas Müller
2784907782 password_policy is a shipped app 2015-11-16 16:36:12 +01:00
Thomas Müller
8169e4fdc8 Merge pull request #20465 from owncloud/forms.css 
Move form styles from styles.css to inputs.css
 2015-11-16 15:29:02 +01:00
Thomas Müller
9ea81b71f5 Merge pull request #20532 from owncloud/ocs-allow-v2 
Allow creating OCS v2 links in JS
 2015-11-16 15:15:53 +01:00
Jan-Christoph Borchardt
5b72d9026f standardize sizes for headings 2015-11-16 14:42:10 +01:00
Joas Schilling
78c456b895 Allow creating OCS v2 links in JS 2015-11-16 14:23:43 +01:00
Thomas Müller
a03b1f1ee9 Merge pull request #20522 from owncloud/update-strengthify 
Update strengthify to 0.4.2
 2015-11-16 13:51:11 +01:00
Morris Jobke
b1abef77e4 Update strengthify to 0.4.2 
* includes local changes (ported them to upstream - see #10625)
* tipsy -> tooltip
* re-renders the element on scroll of a parent - fixes #20454
 2015-11-16 11:16:38 +01:00
Jenkins for ownCloud
19d0884b56 [tx-robot] updated from transifex 2015-11-15 01:55:08 -05:00
Jenkins for ownCloud
1b409228ab [tx-robot] updated from transifex 2015-11-14 01:55:13 -05:00
Jenkins for ownCloud
1e9203cdef [tx-robot] updated from transifex 2015-11-13 01:57:12 -05:00
Hendrik Leppelsack
7ab56de58b move form styles from styles.css to inputs.css 2015-11-13 00:19:57 +01:00
Jürgen Weigert
b167eb743f Update untrustedDomain.php 2015-11-12 14:33:59 +01:00
Hendrik Leppelsack
089cd56e00 add Ctrl+F shortcut for the search bar 2015-11-12 12:37:31 +01:00
Thomas Müller
2479363492 Merge pull request #20148 from owncloud/checkbox-accessibility 
Make new checkbox style accessible for screenreaders
 2015-11-11 17:12:38 +01:00
Jenkins for ownCloud
5dd59b4bd2 [tx-robot] updated from transifex 2015-11-11 01:55:47 -05:00
Thomas Müller
dd153a5625 Merge pull request #20176 from owncloud/font-style 
move font back from Light to Regular for body text, fix #18954
 2015-11-10 17:52:09 +01:00
Vincent Petry
a2cd9708f6 Set "ie" CSS class for IE10, IE11 
Fixed border in file action menu
 2015-11-10 17:04:52 +01:00
Jan-Christoph Borchardt
83c177fc1b move font back from Light to Regular for body text on normal-res screens, fix #18954 2015-11-10 16:12:42 +01:00
Thomas Müller
f8e020ff87 Merge pull request #20390 from owncloud/appcheckcode-no-duplicate-requirement 
Do not allow two different version requirements
 2015-11-10 00:27:05 +01:00
Thomas Müller
2e8d8bf4ef Merge pull request #20236 from maprambo/safari-pinned-tab-icon 
added Safari tabbed pin icon
 2015-11-09 11:12:38 +01:00
Joas Schilling
fe04451cb1 Do not allow two different version requirements 2015-11-09 11:10:37 +01:00
Jenkins for ownCloud
f8637b6082 [tx-robot] updated from transifex 2015-11-08 01:55:13 -05:00
Jenkins for ownCloud
49122e66dd [tx-robot] updated from transifex 2015-11-07 01:55:11 -05:00
Thomas Müller
164f4d7d37 Merge pull request #18039 from owncloud/favicon-up-to-ie10 
Add favicon for IE8-10
 2015-11-06 14:51:24 +01:00
Lukas Reschke
d50924c59b Mark files_drop as shipped 
Fixes https://github.com/owncloud/enterprise/issues/895
 2015-11-06 12:36:01 +01:00
Jan-Christoph Borchardt
93f9577258 do not bold header of update screen 2015-11-05 16:36:37 +01:00
Jenkins for ownCloud
2f4fa5b49c [tx-robot] updated from transifex 2015-11-05 01:55:14 -05:00
maprambo
edb1fee610 Added Safari tabbed pin icon 
Added the necessary code and a black and inverted version of the favicon/ touch icon in svg format
 2015-11-04 19:31:17 +01:00
Thomas Müller
c59ca9203d Merge pull request #18821 from owncloud/global-classes 
Global classes in core CSS
 2015-11-04 10:30:10 +01:00
Jenkins for ownCloud
7fe047425f [tx-robot] updated from transifex 2015-11-04 01:55:44 -05:00
Morris Jobke
069ed71dbe Add favicon for IE 8+ 2015-11-03 14:24:20 +01:00
Hendrik Leppelsack
cf0ebfc7aa don't validate searchbox 2015-11-03 10:10:52 +01:00
Jenkins for ownCloud
82f3590fd0 [tx-robot] updated from transifex 2015-11-03 01:58:43 -05:00
Thomas Müller
0559b2092c Merge pull request #20232 from owncloud/error-button-color 
fix button text color
 2015-11-02 21:48:50 +01:00
Jan-Christoph Borchardt
0a8cefaeb1 fix button text color 2015-11-02 17:58:37 +01:00
Raghu Nayyar
56b537271e Global Classes for Core. 
Move up the global styles up the hierarchy.

Adds Clear Left, Right and both.

New CSS file for Global Styles.
 2015-11-02 20:54:02 +05:30
Thomas Müller
053effaa51 Merge pull request #20220 from owncloud/keep-search-open 
Keep searchbox open if it is in action
 2015-11-02 13:58:10 +01:00
Hendrik Leppelsack
9669a2be78 keep searchbox open if it is in action 2015-11-02 12:14:54 +01:00
Joas Schilling
f04151f69b Close the user menu when clicking it again 2015-11-02 10:09:13 +01:00
Jenkins for ownCloud
2afc14e195 [tx-robot] updated from transifex 2015-11-02 01:55:05 -05:00
Jenkins for ownCloud
2374a0df5d [tx-robot] updated from transifex 2015-11-01 01:54:58 -04:00
Jenkins for ownCloud
d7ed353814 [tx-robot] updated from transifex 2015-10-31 01:55:07 -04:00
Thomas Müller
6911d8f0a4 Merge pull request #20175 from owncloud/login-arrow 
remove unneeded icons from input fields to not distract from submit button, fix #18940
 2015-10-30 15:56:13 +01:00
Thomas Müller
2d9d59def7 Merge pull request #20171 from owncloud/tags.js-remove-unneeded-vars 
[tags] remove unneeded variables
 2015-10-30 15:30:25 +01:00
Jan-Christoph Borchardt
a05ea0fb1e remove unneeded icons from input fields to not distract from submit button, fix #18940 2015-10-30 11:11:37 +01:00
Morris Jobke
b32e6fbb62 [tags] remove unneeded variables 2015-10-30 10:02:15 +01:00
Morris Jobke
f46d531a4f Replace some OC_Config calls with ILogger methods 2015-10-30 09:51:16 +01:00
Jenkins for ownCloud
91b2cdc62b [tx-robot] updated from transifex 2015-10-30 01:55:52 -04:00
Thomas Müller
d7efb6d8b5 Merge pull request #20152 from owncloud/LukasReschke-patch-1 
Remove invalid type-cast
 2015-10-29 16:44:31 +01:00
Thomas Müller
774d069ff0 Merge pull request #20122 from owncloud/files-consolidateiconupdate 
Fix icon update to be more consistent
 2015-10-29 15:40:15 +01:00
Lukas Reschke
a6f180f24e Remove invalid type-cast 
This is an `is_array` operation and not a `in_array` one. Thus this typecast is not required.

Fixes https://github.com/owncloud/core/issues/20095
 2015-10-29 15:19:02 +01:00
Hendrik Leppelsack
9234b8c194 make new checkbox style accessible for screenreaders 2015-10-29 13:23:57 +01:00
Vincent Petry
9c9158e6b7 Fix icon update to be more consistent 
Makes the details bar show the same icon as in the list.
 2015-10-29 12:59:51 +01:00
Thomas Müller
9ab44f1f00 Merge pull request #11509 from owncloud/internal_email_template 
Allow separate templates for internal and external share notifications
 2015-10-29 11:27:05 +01:00
Thomas Müller
f000edb636 Merge pull request #19871 from owncloud/issue-19583-invalid-shares 
Issue 19583 invalid shares
 2015-10-29 10:43:50 +01:00
Stephen Colebrook
6feb31bf96 Allow separate templates for internal and external share notifications 2015-10-29 10:24:24 +01:00
Joas Schilling
e5a7e3124a Add a repair step that checks for group membership on shares 2015-10-29 09:26:26 +01:00
Tom Needham
628e4a9daf Add sharee list view js tests 2015-10-29 09:01:47 +01:00
Jenkins for ownCloud
527ef76dd6 [tx-robot] updated from transifex 2015-10-29 01:55:45 -04:00
Thomas Müller
f8012fd734 Merge pull request #20097 from owncloud/revert-19508 
Revert "setting to skip migration tests by default"
 2015-10-28 09:19:53 +01:00
Jenkins for ownCloud
d74811fcc8 [tx-robot] updated from transifex 2015-10-28 01:55:29 -04:00
Morris Jobke
3b249f1967 Revert "setting to skip migration tests by default" 
This reverts commit 7cbdd9b90b.
 2015-10-27 21:25:11 +01:00
Thomas Müller
588a668455 Merge pull request #20082 from owncloud/phil-davis-sharedialogviewspec-typos 
sharedialogviewSpec.js couple of text typos
 2015-10-27 20:04:05 +01:00
Thomas Müller
c15b2094e5 Merge pull request #20078 from owncloud/tipsy-body 
Append tipsys to body
 2015-10-27 15:08:25 +01:00
Phil Davis
89ab505c7b sharedialogviewSpec.js couple of text typos 
I noticed a new typo in 15ef39d5b9 and looked for others while I am here.
 2015-10-27 17:11:49 +05:45
Hendrik Leppelsack
5a01dc44d6 append tipsys to body 2015-10-27 11:22:41 +01:00
Thomas Müller
8c33c5260a Merge pull request #19824 from owncloud/ie9-share-donotsendplaceholderaspassword 
[IE9] Don't send link share password placeholder
 2015-10-27 09:57:39 +01:00
Jenkins for ownCloud
0875a4a18f [tx-robot] updated from transifex 2015-10-27 01:55:44 -04:00
Vincent Petry
0d98e5e456 [IE9] Don't send link share password placeholder 
When exiting the password field in the share dialog, IE9 would
mistakenly think that the password has changed and would send the
placeholder.

This fix prevents changing the password whenever the placeholder is set
as value.
 2015-10-26 17:45:21 +01:00
Thomas Müller
40ba8d267f Merge pull request #19837 from owncloud/always-enabled-apps 
Store list of apps which cannot be disabled in shipped.json
 2015-10-26 17:14:29 +01:00
Thomas Müller
23e51c37cf Merge pull request #20049 from owncloud/make-author-file-complete 
Generate author file by license.php build script
 2015-10-26 17:14:06 +01:00
Lukas Reschke
8f09d5b67c Update license headers 2015-10-26 14:04:01 +01:00
Vincent Petry
c64fb46fbf Fix share link focus on click 
Clicking on the link share must focus and select it
 2015-10-26 12:49:52 +01:00
Thomas Müller
d4d954b2d9 Merge pull request #19982 from owncloud/fix-link-sharing-regression-master 
Ensure the password is only hashed in case it's changed on the client…
 2015-10-26 10:57:31 +01:00
Thomas Müller
6fc59f85b6 Store list of apps which cannot be disabled in shipped.json 2015-10-26 09:53:04 +01:00
Jenkins for ownCloud
eb10e3abc2 [tx-robot] updated from transifex 2015-10-25 01:55:04 -04:00
Jenkins for ownCloud
ba010a5aa4 [tx-robot] updated from transifex 2015-10-24 01:55:42 -04:00
Thomas Müller
db48a937cf Merge pull request #19990 from owncloud/stay-logged-in-wording 
change wording from 'remember' to more understandable 'Stay logged in'
 2015-10-23 10:49:51 +02:00
Roeland Jago Douma
9071e756a1 Fix for broken ajax/share.php endpoint 
Even more code mess :(
All tests pass again. But I'm really not happy with this endpoint.
 2015-10-23 09:24:03 +02:00
Jenkins for ownCloud
a341e786dd [tx-robot] updated from transifex 2015-10-23 01:55:06 -04:00
Jan-Christoph Borchardt
aed9b2a626 change wording from 'remember' to more understandable 'Stay logged in' 2015-10-23 10:44:41 +13:00
Thomas Müller
4f5ff9c105 Ensure the password is only hashed in case it's changed on the client - fixes #19950 2015-10-22 17:32:40 +02:00
Thomas Müller
56fdb0ac93 Merge pull request #19935 from owncloud/issue-19916-settings-menu-hide-on-file-action 
Use the normal OC.menu JS for handling the Settings menu
 2015-10-22 10:42:02 +02:00
Thomas Müller
15ef39d5b9 Merge pull request #19952 from owncloud/share-dialogue-tests 
Add JS tests for share dialog
 2015-10-22 09:23:05 +02:00
Jenkins for ownCloud
c50bbb8cde [tx-robot] updated from transifex 2015-10-22 01:55:47 -04:00
Tom Needham
e3ae453ee5 Fix line lengths in share dialog unit tests 2015-10-21 13:30:42 +00:00
Thomas Müller
f7f2a160dd Merge pull request #19918 from owncloud/send-begin-message 
Update: state which step we are going to start and warn if it might b…
 2015-10-21 14:52:19 +02:00
Tom Needham
8a6d22d751 Add JS tests for share autocompletion handling 2015-10-21 12:46:08 +00:00
Joas Schilling
a0437591db Use the normal OC.menu JS for handling the Settings menu 2015-10-21 13:59:30 +02:00
Thomas Müller
036c8a2e56 Merge pull request #19936 from owncloud/DeepDiver1975-patch-1 
Remove the core version from shipped.json
 2015-10-21 13:53:33 +02:00
Thomas Müller
ae0f20471a Merge pull request #19923 from owncloud/apps-donotdisplaybrokenappiconininternetexplorer 
Disable app icon preview in apps page for IE
 2015-10-21 13:42:48 +02:00
Thomas Müller
c27531fe0f Remove the core version from shipped.json 2015-10-21 13:40:05 +02:00
Tom Needham
2ca5b1aa1f Add test for remote share info tooltop 2015-10-21 10:00:29 +00:00
Vincent Petry
89e3860e1a Disable app icon preview in apps page for IE 
All IE versions are not able to properly upscale SVG icons unless the
said SVG files contain a "viewBox" attribute, which is not always the
case. Also we cannot guarantee that all third party apps will have this
attribute in their icons.

So for now, app icons will not be displayed in IE instead of broken
ones.
 2015-10-21 10:50:06 +02:00
Joas Schilling
e66e67567f Update - Only add one section for disabled apps 2015-10-21 10:39:56 +02:00
Joas Schilling
9200bbeaba Update: state which step we are going to start and warn if it might be slow 2015-10-21 09:17:38 +02:00
Jenkins for ownCloud
74f41349b7 [tx-robot] updated from transifex 2015-10-21 01:56:16 -04:00
Vincent Petry
1e64968ff7 Allow leaving update page when errors occurred 2015-10-20 13:29:44 +02:00
Vincent Petry
06ddd40886 Prevent leaving the DB update page while in progress 2015-10-20 13:28:48 +02:00
Thomas Müller
5d9a9e8f3d Merge pull request #19878 from owncloud/fix-filepicker-loading-spinner 
fix filepicker loading spinner
 2015-10-20 11:04:12 +02:00
Jenkins for ownCloud
dfd44942c6 [tx-robot] updated from transifex 2015-10-20 01:55:03 -04:00
Christoph Wurst
9778094a25 fix filepicker loading spinner 2015-10-19 23:43:12 +02:00
Jenkins for ownCloud
008082ebad [tx-robot] updated from transifex 2015-10-19 01:55:02 -04:00
Jenkins for ownCloud
8d25528c49 [tx-robot] updated from transifex 2015-10-18 01:55:07 -04:00
Jenkins for ownCloud
c378456137 [tx-robot] updated from transifex 2015-10-17 01:55:34 -04:00
Thomas Müller
9d910deef0 Merge pull request #19836 from owncloud/share-fix-spinner-position 
Fix spinner positions in share tab
 2015-10-16 17:17:01 +02:00
Vincent Petry
90e34e26bd Fix spinner positions in share tab 
Also fix missing spinner when removing link share
 2015-10-16 15:54:27 +02:00
Thomas Müller
f2889dc6e4 Consolidate webdav code - move all to one app 2015-10-16 13:17:12 +02:00
Vincent Petry
3af2ad0cd9 Fix DOM element ids in share dialog 
- Rely on class names instead of global ids
- When global ids are needed for label+checkbox, append the view id
  (cid) to the element's id

This fixes the checkboxes when multiple sidebars exist in the DOM.
 2015-10-16 10:54:45 +02:00
Jenkins for ownCloud
7224e99ccd [tx-robot] updated from transifex 2015-10-16 01:55:03 -04:00
Jenkins for ownCloud
5bee7007dd [tx-robot] updated from transifex 2015-10-15 01:55:32 -04:00
Thomas Müller
df1313d025 Merge pull request #19625 from owncloud/passwordchange-hidestrengthify 
Properly hide strengthify after password change
 2015-10-14 12:52:07 +02:00
Thomas Müller
3aeda33a99 Merge pull request #19630 from owncloud/fix-ie-pain 
Fix more IE issues
 2015-10-14 12:51:43 +02:00
Thomas Müller
8d5aff9db5 Merge pull request #19631 from owncloud/share-emailsenterror 
Fix share email sending feedback
 2015-10-14 12:51:32 +02:00
Thomas Müller
156108dcdb Merge pull request #19714 from owncloud/trash-deletesectionposition-2 
Revert "Revert "Move trashbin specific CSS that modifies sidebar""
 2015-10-14 12:49:56 +02:00
Thomas Müller
a83e003ae3 Merge pull request #19645 from owncloud/file-conflict-disablecontinue 
Disable "Continue" button in conflict dialog when no selection
 2015-10-14 12:39:37 +02:00
Thomas Müller
f34b97bc98 Merge pull request #19699 from owncloud/hutchic-issue-18241-reload-page-link 
refs #18241 Make the 'please reload this page' a clickable link
 2015-10-14 12:39:19 +02:00
Morris Jobke
2f9f963616 [update] show default error message if empty message 2015-10-14 09:41:47 +02:00
Jenkins for ownCloud
f9dd750ed7 [tx-robot] updated from transifex 2015-10-14 01:55:36 -04:00
Lukas Reschke
abdbf10ebc Do not print exception message 
In case of an error the error message often contains sensitive data such as the full path which potentially leads to a full path disclosure.

Thus the error message should not directly get displayed to the user and instead be logged.
 2015-10-13 14:12:10 +02:00
Thomas Müller
3891cd9068 Merge pull request #19677 from owncloud/silently-fail-app-upgrade-exceptions-master 
Silently fail app upgrade exceptions
 2015-10-13 11:04:02 +02:00
Jenkins for ownCloud
1f146d678c [tx-robot] updated from transifex 2015-10-13 01:55:06 -04:00
Jan-Christoph Borchardt
81cd823c2a add specific edit icon 2015-10-13 09:42:32 +13:00
Thomas Müller
3444d62063 Revert "Revert "Move trashbin specific CSS that modifies sidebar"" 
This reverts commit 0738ddfb76.
 2015-10-12 16:21:27 +02:00
Thomas Müller
0738ddfb76 Revert "Move trashbin specific CSS that modifies sidebar" 2015-10-12 13:59:29 +02:00
Vincent Petry
783971422c Move trashbin specific CSS that modifies sidebar 
Only when trashbin is enabled, its sidebar nav element must be fixed at
the bottom.
 2015-10-12 11:39:04 +02:00
Jenkins for ownCloud
e16ac12f5a [tx-robot] updated from transifex 2015-10-12 01:54:59 -04:00
Jenkins for ownCloud
d29d018cc7 [tx-robot] updated from transifex 2015-10-11 01:54:58 -04:00
Colin Hutchinson
f49c1039c4 refs #18241 Make the 'please reload this page' a clickable link 2015-10-10 14:14:01 -04:00
Jenkins for ownCloud
188acd5e4e [tx-robot] updated from transifex 2015-10-10 01:55:32 -04:00
Thomas Müller
4cb5970947 Always pass in ILogger 2015-10-09 14:08:22 +02:00
Vincent Petry
14591d9df7 Use injected request 2015-10-09 11:19:06 +02:00
Morris Jobke
bf579a153f fix IE8 user agent detection 2015-10-09 11:19:06 +02:00
Vincent Petry
c7aef6c368 Fix uploading avatar and root certs in IE8 2015-10-09 11:19:05 +02:00
Jenkins for ownCloud
5cb83937fa [tx-robot] updated from transifex 2015-10-09 01:55:02 -04:00
Morris Jobke
3c005bc020 Check .conflicts for checkboxes 2015-10-08 17:13:28 +02:00
Roeland Jago Douma
08600a7ed5 Add unit tests for sending e-mail for link shares 2015-10-08 16:39:25 +02:00
Vincent Petry
4bf19d4472 Fix share email sending feedback 
Redisplay email address after failure
 2015-10-08 16:39:12 +02:00
Thomas Müller
e5bbec79a6 Merge pull request #19611 from owncloud/fix-public-scroll 
Fix scrollbars in public template
 2015-10-08 13:01:01 +02:00
Vincent Petry
cba1aae073 Disable "Continue" button in conflict dialog when no selection 2015-10-08 12:27:33 +02:00
Jenkins for ownCloud
c5649a634f [tx-robot] updated from transifex 2015-10-08 01:54:58 -04:00
Vincent Petry
14dc36efe6 Properly hide strengthify after password change 2015-10-07 17:56:28 +02:00
Vincent Petry
69a9888a81 [IE8] Fix button background color 
IE8 doesn't support rgba...
 2015-10-07 17:34:55 +02:00
Vincent Petry
b7a5d487f8 [IE9] Set explicit height to file actions menu icon 
IE9 flattened the icons, so give it an explicit height.
 2015-10-07 17:18:01 +02:00
Vincent Petry
97b2a3964a [IE] Add border to dropdown menus 
As a fallback because box-shadow doesn't give the same effect and drop
shadow doesn't work with IE.
 2015-10-07 17:17:29 +02:00
Jenkins for ownCloud
cd818e7419 [tx-robot] updated from transifex 2015-10-07 01:55:56 -04:00
Hendrik Leppelsack
e1286a4151 fix footer in public gallery 2015-10-07 00:22:02 +02:00
Hendrik Leppelsack
e7b2da79ec fix public empty message 2015-10-06 23:59:58 +02:00
Hendrik Leppelsack
c1a5e96435 fix scrollbars in public template 2015-10-06 16:52:05 +02:00
Thomas Müller
0385a62363 Merge pull request #19597 from owncloud/update-license-headers 
update licence headers via script
 2015-10-06 11:18:35 +02:00
Morris Jobke
8366ce2767 deduplicate @xenopathic 2015-10-06 09:52:19 +02:00
Morris Jobke
b519965408 [admin] check for correct PHP memcached module 2015-10-06 08:51:47 +02:00
Jenkins for ownCloud
3ff60cc2e3 [tx-robot] updated from transifex 2015-10-06 01:55:00 -04:00
Thomas Müller
ea72d90617 Merge pull request #19553 from owncloud/properly_format_date_shareview 
Use DD-MM-YYYY consistently in share sidebar
 2015-10-05 22:02:12 +02:00
Thomas Müller
94c0cc1bb3 Merge pull request #19590 from owncloud/compactmode-sidebarfullscreen 
Make sidebar properly fullscreen in mobile/compact mode
 2015-10-05 22:01:41 +02:00
Morris Jobke
b945d71384 update licence headers via script 2015-10-05 21:15:52 +02:00
Roeland Jago Douma
8c459a895d Do not remove linkshare if there is none 
If the password is enforced we can't create a link share right away but
just show the password field. Untoggling the link sharing should not try
to remove the share.

* Added unit test
 2015-10-05 21:12:27 +02:00
Vincent Petry
bc727d67ca Make sidebar properly fullscreen in mobile/compact mode 2015-10-05 17:34:28 +02:00
Thomas Müller
681ab05e4d Merge pull request #19539 from owncloud/fix-multiselect-overlap-shorter 
Fix filelist size issues, breadcrumb, multiselect
 2015-10-05 09:48:31 +02:00
Roeland Jago Douma
96deeca34d Use DD-MM-YYYY consistently in share sidebar 
We used to display the response from the server. Which is in non ISO8601
format. Now this is weird since the datepickers shows us 'DD-MM-YYYY'
once a date is chosen.

Now use momentJS to properly format the date.

* Unit tests updated
 2015-10-04 11:38:29 +02:00
Jenkins for ownCloud
2ffb1c2135 [tx-robot] updated from transifex 2015-10-04 01:55:02 -04:00
Jenkins for ownCloud
e0084059b9 [tx-robot] updated from transifex 2015-10-03 01:56:20 -04:00
Vincent Petry
f135128664 Fix filelist size issues, breadcrumb, multiselect 
- calculate multiselect header width to exclude scrollbar
- call FileList._onResize() when sidebar is toggled ("appresized"), this
  also updates the breadcrumb width
- moved global getScrollBarWidth() to OC.Util namespace
 2015-10-02 18:03:48 +02:00
Thomas Müller
ff89824135 Merge pull request #19272 from owncloud/mimetypes-enhanced 
Introduce a few new mimetypes for code, fix recursive mimetype aliases
 2015-10-02 17:50:34 +02:00
Vincent Petry
1562da3691 Focus on share field after first display 2015-10-02 16:39:27 +02:00
Roeland Jago Douma
57ceee13a9 Updated some mimetypes 
* c++ and cpp now both map to code
 2015-10-02 15:28:23 +02:00
Robin McCorkell
aeb20675dd Allow recursive mimetype aliases 
application/xml -> text/html -> text/code
 2015-10-02 15:28:23 +02:00
Robin McCorkell
cd7aff47e1 Introduce a few new mimetypes for code 2015-10-02 15:28:23 +02:00
Thomas Müller
594a3e4e22 Merge pull request #19523 from owncloud/fix-seconds-ago 
Fix moment.js "a few seconds ago" with "seconds ago"
 2015-10-02 14:11:46 +02:00
Thomas Müller
3564a837d8 Merge pull request #19521 from owncloud/files-conflictdialog-loadpromise 
Make sure the conflict dialog is loaded before adding conflicts
 2015-10-02 12:15:44 +02:00
Thomas Müller
d0f6bfe7b6 Merge pull request #19508 from owncloud/setting-to-skip-migration-tests 
setting to skip migration tests by default
 2015-10-02 12:15:23 +02:00
Morris Jobke
4b3a5a257f Fix moment.js "a few seconds ago" with "seconds ago" 
* fixes #18627
 2015-10-02 10:51:51 +02:00
Vincent Petry
5dff9d88cb Make sure the conflict dialog is loaded before adding conflicts 2015-10-02 09:55:43 +02:00
Jörn Friedrich Dreyer
3dec30d0e0 Merge pull request #19484 from owncloud/ie8-checkbox-rage 
[IE8] Fix checkboxes in login page and file list
 2015-10-02 08:58:16 +02:00
Jörn Friedrich Dreyer
bf4c3ce134 Merge pull request #19496 from owncloud/ie8-filenamewidth-sickness 
[IE8] Remove non-working ellipsis support
 2015-10-02 08:57:51 +02:00
Jenkins for ownCloud
3b4592718a [tx-robot] updated from transifex 2015-10-02 01:54:51 -04:00
Hendrik Leppelsack
d4ce713749 display checkboxes properly after file restore 2015-10-01 22:54:36 +02:00
Morris Jobke
7cbdd9b90b setting to skip migration tests by default 
* if you install owncloud via package it is not
  possible to skip migration tests
* this also allows to disable migration tests for
  an instance by default
 2015-10-01 14:23:25 +02:00
Vincent Petry
9e66653fb3 [IE8] Remove non-working ellipsis support 
This prevents the name element to be too wide, which would cause users
to mistakenly click on it instead of the empty space when wanting to
focus on a file for the sidebar.

Also fixed the close button on the sidebar (make it appear)
 2015-10-01 13:23:56 +02:00
Robin Appelman
f4d180ee5c allow passing the fileinfo to the preview manager 2015-10-01 13:14:47 +02:00
Jenkins for ownCloud
50874de1ca [tx-robot] updated from transifex 2015-10-01 01:54:55 -04:00
Vincent Petry
509096ca15 [IE8] Make checkbox on login page look less out of place 2015-09-30 17:31:37 +02:00
Thomas Müller
1d8c10cf63 Merge pull request #19468 from owncloud/fix-36-vs-32-previews 
Change small thumbnails to 32 px
 2015-09-30 15:47:34 +02:00
Thomas Müller
eeac6e2ab1 Merge pull request #19454 from owncloud/ie8-madness-returns 
[IE8] Fix file type sizes and popover menus in file list
 2015-09-30 15:15:38 +02:00
Thomas Müller
7db9690096 Merge pull request #19451 from owncloud/ie8-madness 
Fix login page logo + login arrow
 2015-09-30 15:14:28 +02:00
Vincent Petry
42eb2149ad Optipng IE8 logo 2015-09-30 14:51:51 +02:00
Thomas Müller
67609699bc Merge pull request #19443 from owncloud/sharedialog-passworderror 
Fix share link password error
 2015-09-30 11:08:04 +02:00
Morris Jobke
1051a3c6f5 Change small thumbnails to 32 px 
* fixes #16913
* fixes issues in IE8 where the thumbnail is too big
 2015-09-30 10:49:48 +02:00
Jörn Friedrich Dreyer
db79ba547a Merge pull request #19449 from owncloud/get-rid-of-ugly-previews-in-file-comparator 
Let's get rid of the ugly previews on the left side of the file comparator
 2015-09-30 10:06:12 +02:00
Morris Jobke
1ec2499a0a move IE8 fixes to fixes.css 2015-09-30 09:59:23 +02:00
Jenkins for ownCloud
41129aff80 [tx-robot] updated from transifex 2015-09-30 01:55:43 -04:00
Vincent Petry
97bfc20ac8 [IE8] Fix popover menu borders for IE8 
- fixes "New" menu
- fixes file actions menu
 2015-09-29 18:28:34 +02:00
Vincent Petry
dbb6692468 [IE8] Fix filetype icon sizes 
Added hack that uses a "filter" CSS with explicit URL to fix the "New"
menu by scaling down icons and also fix the folder/filetype icon in the sidebar
by scaling it up.
 2015-09-29 18:28:31 +02:00
Vincent Petry
00623b1c73 [IE8] Rescale PNG icons to 32x32 2015-09-29 18:28:28 +02:00
Vincent Petry
bf2a876094 Fix login arrow in login page 2015-09-29 17:13:10 +02:00
Vincent Petry
e826108b6c Fix IE8 login logo 
Added 175px logo to make it have the same size.
It's only used for IE8.
 2015-09-29 16:57:14 +02:00
Olivier Paroz
a1c419dc71 Use Hermite resampling for comparator canvas previews 2015-09-29 16:35:24 +02:00
Vincent Petry
8def1383c8 Fix share link password error 
- only allow submitting the password once, single request
- display error in tooltip
 2015-09-29 15:30:01 +02:00
Morris Jobke
5acb38b5b3 [upgrade] switch to debug logging on upgrade 
* resets afterwards
* adds output about the previous log level
 2015-09-29 14:35:32 +02:00
Thomas Müller
037cce7f05 Merge pull request #19418 from owncloud/fix-parsehashquery 
Consider both hash params and query when parsing URL
 2015-09-29 13:21:34 +02:00
Thomas Müller
3cd82b8918 Merge pull request #19411 from owncloud/files-sidebar-shareloadspinner 
Show loading spinner for first fetch of shares
 2015-09-29 13:18:04 +02:00
Jenkins for ownCloud
aa3596a410 [tx-robot] updated from transifex 2015-09-29 01:55:02 -04:00
Vincent Petry
71dabc6c13 Consider both hash params and query when parsing URL 2015-09-28 18:37:40 +02:00
Vincent Petry
a823a79f12 Show loading spinner for first fetch of shares 
Whenever the sidebar first loads shares, show a spinner instead of an
empty content
 2015-09-28 15:57:57 +02:00
Jenkins for ownCloud
60f123193b [tx-robot] updated from transifex 2015-09-28 05:07:18 -04:00
Thomas Müller
4d8be8822c Merge pull request #19363 from owncloud/checkboxes-sidebar 
Restyle checkboxes in sidebar
 2015-09-28 10:54:55 +02:00
Thomas Müller
465063e386 Merge pull request #19395 from owncloud/15037-universal-shebang 
Use a universal shebang
 2015-09-28 09:45:34 +02:00
Thomas Müller
77a874ba38 Merge pull request #19378 from owncloud/fix-sharing-autocomplete 
fix name autocomplete not showing on mobile, fix #18551
 2015-09-28 08:48:44 +02:00
Olivier Paroz
ff4227bbfc Use a universal shebang 
Fixes #15037
 2015-09-27 13:03:31 +02:00
Thomas Müller
fe54d76e3d Merge pull request #19380 from owncloud/gallery-icon-visibility 
increase visibility of slideshow controls, fix owncloud/gallery#51
 2015-09-25 23:37:49 +02:00
Thomas Müller
44592ab584 Merge pull request #19383 from owncloud/simplify-upload-icon 
simplify upload icon
 2015-09-25 23:37:19 +02:00
Hendrik Leppelsack
0ae931ed57 fix sidebar spinner 2015-09-25 20:48:47 +02:00
Thomas Müller
787c668b39 Merge pull request #19360 from owncloud/move-filter-method-into-config-object 
Move the filtering of sensitive data to the config class
 2015-09-25 14:05:04 +02:00
Thomas Müller
2c37d5f7d8 Merge pull request #13145 from owncloud/issue/11951-activity-sharing-email 
Publish an activity when sending a share link via email
 2015-09-25 13:48:33 +02:00
Hendrik Leppelsack
2ee36dc4de restyle checkboxes in sidebar 2015-09-25 11:54:26 +02:00
Joas Schilling
faba02564a Move the filtering of sensitive data to the config class 2015-09-25 11:08:33 +02:00
Jan-Christoph Borchardt
0c32eab904 fix name autocomplete not showing on mobile, fix #18551 2015-09-25 18:09:43 +12:00
Hendrik Leppelsack
604f5783fd fix multiselect 2015-09-25 00:51:39 +02:00
Hendrik Leppelsack
c23cac3322 fix login 2015-09-25 00:51:39 +02:00
Hendrik Leppelsack
ec005fc5d0 add .checkbox class for new checkbox style 2015-09-25 00:51:39 +02:00
Jan-Christoph Borchardt
0566af3a12 increase visibility of slideshow controls, fix @owncloud/gallery#51 2015-09-25 09:58:02 +12:00
Jan-Christoph Borchardt
a5e9301ec0 simplify upload icon 2015-09-25 09:13:23 +12:00
Jan-Christoph Borchardt
43eeb290c1 Revert "Update apps.css (Scroll more smoothly for Webkit browser)" 2015-09-24 18:42:23 +02:00
Thomas Müller
ebdd6d96ce Merge pull request #19306 from owncloud/app-code-check-version 
[App Code Check] add check for version and mandatory fields
 2015-09-24 17:38:48 +02:00
Thomas Müller
846b826867 Merge pull request #18517 from owncloud/17753_to_master 
Fix preview of old file on public upload conflicts
 2015-09-24 15:20:00 +02:00
Thomas Müller
d7a923671f Merge pull request #19305 from owncloud/share-hasusershares 
Fix ShareItemModel.hasUserShares to only check shares of current item
 2015-09-24 14:57:23 +02:00
Morris Jobke
5a3e57c2f5 encode arrays as string 2015-09-24 12:48:44 +02:00
Vincent Petry
76e30d0df7 Expiration date was always a string 2015-09-24 12:21:19 +02:00
Morris Jobke
9b652ed5d5 [App Code Check] add check for version and mandatory fields 
* ref #17598
* including unit tests for mandatory fields/versions
 2015-09-24 11:58:12 +02:00
Thomas Müller
3903ba7ffa Merge pull request #19328 from owncloud/update-shipped-apps-list 
Update the list of shipped apps
 2015-09-24 11:18:11 +02:00
Joas Schilling
2d557b065f Remove user_webdavauth which is now part of user_external 2015-09-24 09:59:14 +02:00
Thomas Müller
13cca93929 Merge pull request #19292 from owncloud/close-icon 
add slight shadow to close icon to make it visible on top of dark images
 2015-09-24 09:44:13 +02:00
Thomas Müller
8c0cf07d2f Merge pull request #18352 from owncloud/ocs_api_sharees_autocomplete_blocker 
Implement the autocomplete blocker from #18341 into the OCS endpoint
 2015-09-24 09:43:37 +02:00
Joas Schilling
82c33aa422 Update the list of shipped apps 2015-09-24 09:28:11 +02:00
Jan-Christoph Borchardt
dada7d0c34 add slight shadow to close icon to make it visible on top of dark images, fix #19291 2015-09-23 21:31:40 +02:00
Jan-Christoph Borchardt
9162cc153e fix wording of other search results to 'in other folders' 2015-09-23 21:31:00 +02:00
Hendrik Leppelsack
7a8cc97831 display checkboxes in ie8 2015-09-23 17:14:02 +02:00
Morris Jobke
6636605ea6 Add option to disable autocomplete in share dialog 2015-09-23 15:06:28 +02:00
Vincent Petry
0db9b28f3f Fix ShareItemModel.hasUserShares to only check shares of current item 
The shares array is based on what the server returns and can contain
share info for parent folders.

hasUserShares is now fixed to ignore parent folders and only checks for
shares on the current item.
 2015-09-23 14:41:13 +02:00
Vincent Petry
6ea27e2b03 Fix parsing int attributes from share.php response 
Sometimes the attributes returned by share.php are integers but packaged
as strings.

This fix makes sure that such attributes are parsed as integers
 2015-09-23 12:16:47 +02:00
Thomas Müller
0c283dc020 Merge pull request #19220 from individual-it/fix_19164 
re initialize OC.Share.currentShares OC.Share.itemShares
 2015-09-23 11:41:20 +02:00
Thomas Müller
53a167eae9 Merge pull request #19279 from owncloud/share-fixbogusentry 
Fix bogus entry that appears when switching with arrow keys
 2015-09-23 11:30:50 +02:00
Hendrik Leppelsack
3f0a870908 implement builder pattern in tipsy shim 2015-09-23 09:27:44 +02:00
Hendrik Leppelsack
7b19b99e82 add style for disabled checkboxes 2015-09-22 19:13:43 +02:00
Hendrik Leppelsack
bea164274a left align checkboxes in group dropdown 2015-09-22 17:41:32 +02:00
Vincent Petry
03ca76f54f Fix bogus entry that appears when switching with arrow keys 2015-09-22 17:16:20 +02:00
Lukas Reschke
4201f59402 Update mimetypes 2015-09-22 16:43:29 +02:00
Joas Schilling
2e1cfe03e9 Publish an activity when sending a share link via email 2015-09-22 13:09:21 +02:00
Bjoern Schiessle
03e05d5dbc improve description and help output for the encrypt-all and decrypt-all command 2015-09-21 16:48:14 +02:00
Thomas Müller
ac8da41ccd Merge pull request #18709 from owncloud/cleanup-login-semantics 
Pushes input inside the bottom group - login.
 2015-09-21 16:08:48 +02:00
Individual IT Services
976942bb61 re initialize OC.Share.currentShares OC.Share.itemShares 
otherwise old values are kept.
fix for #19164
 2015-09-21 17:01:50 +05:45
Hendrik Leppelsack
964cfc8e08 fix missing checkboxes in file comparator 2015-09-21 12:57:34 +02:00
Thomas Müller
8a07cb4a74 Merge pull request #19183 from owncloud/oparoz-sharejs-typo 
Typo
 2015-09-21 10:30:59 +02:00
Thomas Müller
d2e701d74f Merge pull request #19148 from owncloud/issue-19113-stop-setting-single-user-in-constructor 
Do not set single user in constructor of encryption occ commands
 2015-09-21 09:58:38 +02:00
Olivier Paroz
04b14df35c Fix preview of old file on public upload conflicts 2015-09-20 12:38:21 +02:00
Jenkins for ownCloud
bbd1e99605 [tx-robot] updated from transifex 2015-09-20 01:54:48 -04:00
Olivier Paroz
9776d60b57 Typo 2015-09-19 10:34:19 +02:00
Jenkins for ownCloud
c433d48d8e [tx-robot] updated from transifex 2015-09-19 01:55:22 -04:00
Thomas Müller
08ae1e8183 Merge pull request #19008 from owncloud/jquery_avatar_tests 
JS tests for jquery.avatar
 2015-09-18 17:31:18 +02:00
Joas Schilling
5472a5f455 Also catch exceptions on encryptAll and reset trashbin and singleUser mode 2015-09-18 15:05:18 +02:00
Joas Schilling
2f102c1f0d Do not set single user in constructor 2015-09-18 08:55:59 +02:00
Thomas Müller
a6ab106b9a Merge pull request #19126 from owncloud/fix-19117 
Fix missing checkboxes in share dialog
 2015-09-18 08:17:19 +02:00
Jenkins for ownCloud
2b21c80335 [tx-robot] updated from transifex 2015-09-18 01:54:55 -04:00
Thomas Müller
c18156a4fe Merge pull request #19121 from owncloud/sidebar-design-details 
fix Files sidebar layout of Versions and Sharing
 2015-09-17 18:03:56 +02:00
Hendrik Leppelsack
7c80c8e484 fix missing checkboxes in share dialog 2015-09-17 16:25:10 +02:00