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

4375 commits

Author SHA1 Message Date
Morris Jobke
5ff536b45a [upgrade] add verbosity check and show repair info & steps 2015-06-24 10:25:05 +02:00
Joas Schilling
dba5d5e205 Use a OutputFormatter instead of hacking into writeln() 2015-06-24 09:26:30 +02:00
Joas Schilling
d8b9f6ac23 Use logtimezone and logdateformat 2015-06-24 09:24:28 +02:00
Morris Jobke
0137a3c5e0 [upgrade] show timestamp for output during upgrade 
* added --show-timestamp option
 2015-06-24 09:24:25 +02:00
Morris Jobke
02b2b60581 Merge pull request #17095 from owncloud/proper-error-handling 
Proper error handling
 2015-06-23 17:40:55 +02:00
Morris Jobke
c86e129ce9 [updater] keep maintenance active on failure and mark failure in red 2015-06-23 14:45:53 +02:00
Jan-Christoph Borchardt
71e5bc1803 explicitly set z-index on app-content, fix overlap from navigation 2015-06-23 14:03:27 +02:00
Morris Jobke
1ba9fd3ada [upgrade] print update message before running the update code 
* otherwise you don't know during which app update something failed
 2015-06-23 13:13:44 +02:00
Morris Jobke
fe42553e8a [updater] propagate error case properly 
* add $success to the updateEnd hook
* add new return code for a update failure
* add exception class to failure hook message
 2015-06-23 10:03:27 +02:00
Jenkins for ownCloud
3cad0d4ed2 [tx-robot] updated from transifex 2015-06-23 01:56:15 -04:00
VicDeo
5cfcda3e95 Merge pull request #17068 from owncloud/fix_16878 
fix search for results only from subfolder
 2015-06-22 17:55:56 +03:00
Hendrik Leppelsack
8621d176db moved tooltip.js to vendor scripts 2015-06-22 15:38:32 +02:00
Joas Schilling
738b78f1b0 Use \OC\HintException and translate the hint 2015-06-22 15:34:06 +02:00
Jan-Christoph Borchardt
9dde482315 remove whitespace on bottom when no search results, fix laylout, fix #16878 2015-06-22 15:30:29 +02:00
Hendrik Leppelsack
68463182da deminified tooltip.js 2015-06-22 14:11:32 +02:00
Hendrik Leppelsack
f66e9af9a0 replaced tipsy with bootstrap tooltip 2015-06-22 13:32:06 +02:00
Jenkins for ownCloud
59513ac377 [tx-robot] updated from transifex 2015-06-21 01:55:06 -04:00
Jenkins for ownCloud
183bd6dd49 [tx-robot] updated from transifex 2015-06-20 01:55:10 -04:00
Jenkins for ownCloud
c4cb34da9d [tx-robot] updated from transifex 2015-06-18 01:55:14 -04:00
Lukas Reschke
3b0b1a7ceb Merge pull request #16973 from owncloud/button-close-sidebar 
Let buttons hide the sidebar
 2015-06-17 22:37:10 +02:00
Morris Jobke
9a0b0ba488 Merge pull request #16893 from owncloud/fixSlideToggle 
Fix childs of slideToggle not sliding the target
 2015-06-17 16:06:47 +02:00
Lukas Reschke
123807bff7 Correc type annotation 2015-06-17 11:55:15 +02:00
Jenkins for ownCloud
3898b8c9b8 [tx-robot] updated from transifex 2015-06-17 01:55:34 -04:00
Hendrik Leppelsack
e8507372e3 let buttons hide the sidebar 2015-06-16 19:41:20 +02:00
Jenkins for ownCloud
0a5d73b874 [tx-robot] updated from transifex 2015-06-16 01:55:41 -04:00
Lukas Reschke
34f5541088 Add no-store to AppFramework 2015-06-15 18:35:41 +02:00
Thomas Müller
4bc35286ff Merge pull request #16931 from owncloud/make-security-checks-more-stringent 
Align recommended settings
 2015-06-15 15:15:28 +02:00
Thomas Müller
5eb0dace8c Merge pull request #16802 from Brewal/master 
Fixed "p" element containing a "div"
 2015-06-15 14:10:00 +02:00
Lukas Reschke
eec8d776b7 Align recommended settings 
This aligns the recommended setting with the max-age of `15768000` as described in our documentation. Furthermore it fixes some logical problems with the code, unit tests has been added as well.

Fixes https://github.com/owncloud/core/issues/16673
 2015-06-15 10:39:25 +02:00
Jenkins for ownCloud
2806c9476c [tx-robot] updated from transifex 2015-06-15 01:54:58 -04:00
Jenkins for ownCloud
fe9b28a800 [tx-robot] updated from transifex 2015-06-14 01:54:49 -04:00
Jenkins for ownCloud
51d181f331 [tx-robot] updated from transifex 2015-06-13 01:55:04 -04:00
Jenkins for ownCloud
abd70932c6 [tx-robot] updated from transifex 2015-06-12 01:55:11 -04:00
Hendrik Leppelsack
58afa465f9 fix childs of slideToggle not sliding the target 2015-06-11 18:26:14 +02:00
Jens-Christian Fischer
0013c4115e Fix error message and add 'user' to it 2015-06-11 13:02:47 +02:00
Jenkins for ownCloud
88d3c9ad40 [tx-robot] updated from transifex 2015-06-11 01:55:05 -04:00
Morris Jobke
5ccacb9b38 Merge pull request #16860 from owncloud/fix-appmenu 
fix app menu not showing on mobile, fix #16844
 2015-06-10 16:18:31 +02:00
Jan-Christoph Borchardt
a8b51fdcbd fix app menu not showing on mobile, fix #16844 2015-06-10 13:43:12 +02:00
Jenkins for ownCloud
4d88302b3a [tx-robot] updated from transifex 2015-06-10 01:54:55 -04:00
Thomas Müller
5f4f7e69cf Merge pull request #16810 from owncloud/disable-search-if-not-implemented 
Disable search field in case there is no search available to the curr…
 2015-06-09 23:49:25 +02:00
Thomas Müller
e882f5e930 Bring back filtering on apps management page 2015-06-09 15:46:15 +02:00
Thomas Müller
0fde0e6569 Search results have to explicitly be added to the content area of the app 2015-06-09 12:39:40 +02:00
Morris Jobke
7b7b21d328 Upgrade jquery-migrate to 1.2.1 2015-06-09 09:14:42 +02:00
Jenkins for ownCloud
75bd040f1c [tx-robot] updated from transifex 2015-06-09 01:55:06 -04:00
Thomas Müller
0dd990839e Disable search field in case there is no search available to the current selected app - fixes #14544 2015-06-08 20:18:41 +02:00
Brewal
eac117fc8f Changed a p element by a div 
A p element cannot contain a div element (here `<div style="clear: both;"></div>`). It should be change by a div element to fits standards.
 2015-06-08 15:22:52 +02:00
Jenkins for ownCloud
2fb1b0864a [tx-robot] updated from transifex 2015-06-08 01:55:01 -04:00
Jenkins for ownCloud
3542148761 [tx-robot] updated from transifex 2015-06-07 01:55:03 -04:00
Jenkins for ownCloud
16708ae187 [tx-robot] updated from transifex 2015-06-06 01:55:26 -04:00
Jenkins for ownCloud
e544d5b2c6 [tx-robot] updated from transifex 2015-06-05 01:55:04 -04:00
Jenkins for ownCloud
66a24ff479 [tx-robot] updated from transifex 2015-06-04 01:56:24 -04:00
Morris Jobke
5b52670a95 Merge pull request #16703 from owncloud/fix-ie8-ie9 
Fix IE8 & IE9 - setup page
 2015-06-03 16:15:03 +02:00
Thomas Müller
739c3f01aa Merge pull request #16434 from owncloud/persist-maintenance-state 
Persist the state of the maintenance after an upgrade
 2015-06-03 13:56:17 +02:00
Morris Jobke
49d6186714 Add min-height to login page for IE8 and IE9 2015-06-03 10:22:57 +02:00
Morris Jobke
99c6f96c69 Revert "fix theme in IE8 and IE9" 
This reverts commit a4c9688711.
 2015-06-03 10:20:29 +02:00
Jenkins for ownCloud
410a836702 [tx-robot] updated from transifex 2015-06-03 01:55:29 -04:00
Morris Jobke
d2f3710ede Merge pull request #16623 from owncloud/oparoz-fix-file-conflict-preview 
Get a 96x96 preview for file conflict resolution
 2015-06-02 09:36:51 +02:00
Jenkins for ownCloud
baca5c60c0 [tx-robot] updated from transifex 2015-06-02 01:56:23 -04:00
Tom Needham
2bf9219be3 Fix grammar of search results phrase 2015-06-01 12:29:12 +01:00
Thomas Müller
b522baaaa6 Merge pull request #16650 from owncloud/fix-sqlite-only-setup 
[setup] Disable buttons only in the case they are present
 2015-06-01 12:11:49 +02:00
Morris Jobke
b521109881 [setup] Disable buttons only in the case they are present 
* fixes #16648
 2015-06-01 11:01:42 +02:00
Jenkins for ownCloud
8d23b34402 [tx-robot] updated from transifex 2015-05-31 01:54:44 -04:00
Olivier Paroz
f05ac47eb6 Escape single quotes 2015-05-29 18:34:38 +02:00
Olivier Paroz
6aeaa6954b Fix for parenthesis 2015-05-29 17:49:26 +02:00
Olivier Paroz
4e364311f1 Get a 96x96 preview for file conflict resolution 2015-05-29 13:49:51 +02:00
Thomas Müller
c700f42b68 Merge pull request #16517 from owncloud/remove-logo-wide 
replace logo-wide on share page as well with better icon + text
 2015-05-29 12:15:02 +02:00
Jenkins for ownCloud
fff0fb66d6 [tx-robot] updated from transifex 2015-05-29 01:56:13 -04:00
Morris Jobke
7b50eb05f3 Merge pull request #16380 from rullzer/fix_16281 
Properly format recipients
 2015-05-28 20:34:04 +02:00
Jenkins for ownCloud
1726d84e73 [tx-robot] updated from transifex 2015-05-28 01:55:22 -04:00
Morris Jobke
7385b5dad9 Merge pull request #16417 from owncloud/master-16415 
fix theme in IE8 and IE9
 2015-05-27 16:41:13 +02:00
Roeland Jago Douma
bf491183c1 Properly format remote recipients 
* A list of recipients can now be properly formatted with remote shares.
Before the shares where simply shown in full in the "Shared with others"
section.
* Unit tests updated and added
 2015-05-27 16:22:34 +02:00
Jenkins for ownCloud
fda0995e4c [tx-robot] updated from transifex 2015-05-27 01:55:34 -04:00
Björn Schießle
9366dde875 Merge pull request #15985 from owncloud/hotfix/fix-encryption-references 
[enc2] fix references to legacy encryption app name
 2015-05-26 17:28:27 +02:00
Thomas Müller
07c6e523b1 Merge pull request #16565 from owncloud/add-urandom-check 
Add check for availability of /dev/urandom
 2015-05-26 16:53:11 +02:00
Lukas Reschke
bc6d17ed74 Add check for availability of /dev/urandom 
Without /dev/urandom being available to read the medium RNG will rely only on the following components on a Linux system:

1. MicroTime: microtime() . memory_get_usage() as seed and then a garbage collected microtime for loop
2. MTRand: chr((mt_rand() ^ mt_rand()) % 256)
3. Rand: chr((rand() ^ rand()) % 256)
4. UniqId: Plain uniqid()

An adversary with the possibility to predict the seed used by the PHP process may thus be able to predict future tokens which is an unwanted behaviour.

One should note that this behaviour is documented in our documentation to ensure that users get aware of this even without reading our documentation this will add a post setup check to the administrative interface.

Thanks to David Black from d1b.org for bringing this again to our attention.
 2015-05-26 14:16:07 +02:00
Vincent Petry
d7c18b04bd Merge pull request #16521 from owncloud/unbold-placeholder-image 
use normal font weight instead of bold for image placeholders
 2015-05-26 12:55:05 +02:00
Vincent Petry
7b10e7b747 Merge pull request #16520 from owncloud/fix-float-spinner-position 
fix float spinner position
 2015-05-26 12:13:15 +02:00
Jenkins for ownCloud
6198fb20cb [tx-robot] updated from transifex 2015-05-26 01:54:57 -04:00
Jenkins for ownCloud
fe610a65d3 [tx-robot] updated from transifex 2015-05-25 01:55:06 -04:00
Jenkins for ownCloud
06934e7c00 [tx-robot] updated from transifex 2015-05-24 01:55:03 -04:00
Roeland Jago Douma
914c74ea9b Unit tests for #16511 
Make sure that password is updated on focusout of the password field or
on pressing enter in the password field.
 2015-05-22 15:09:21 +02:00
Jan-Christoph Borchardt
79c5790a72 use normal font weight instead of bold for image placeholders 2015-05-22 03:26:30 +02:00
Jan-Christoph Borchardt
6bba345f34 fix float spinner position 2015-05-22 02:30:55 +02:00
Jan-Christoph Borchardt
2fccfbe278 also replace logo-mail with new look 2015-05-22 00:35:12 +02:00
Jan-Christoph Borchardt
78a0464354 replace logo-wide on share page as well with better icon + text 2015-05-22 00:04:47 +02:00
Joas Schilling
896130b68d Merge pull request #16473 from owncloud/occ_16221 
occ option to update all third party apps without disable
 2015-05-21 09:47:54 +02:00
Jenkins for ownCloud
42dd40ad80 [tx-robot] updated from transifex 2015-05-21 01:55:57 -04:00
Steffen Lindner
48040c46cb Skip disable3rdParty Apps 2015-05-20 17:06:00 +02:00
Jenkins for ownCloud
c49a06a684 [tx-robot] updated from transifex 2015-05-20 01:56:19 -04:00
Scrutinizer Auto-Fixer
fdbc21fc6c Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2015-05-19 11:23:06 +00:00
Thomas Müller
54a6ba47c0 Merge pull request #12401 from owncloud/add-limit-parameter-to-getSharewith 
Remove hard coded limit of 15 from getShareWith
 2015-05-19 12:40:37 +02:00
Morris Jobke
064f5204cc Persist the state of the maintenance after an upgrade 
* if maintenance mode was enabled before an upgrade
  it will be enabled afterwards too
* fixes #16429
 2015-05-19 10:56:04 +02:00
Morris Jobke
176b9674d2 Add hint about additional PHP database modules 
* fixes #16391
 2015-05-18 22:59:35 +02:00
Morris Jobke
a4c9688711 fix theme in IE8 and IE9 2015-05-18 16:04:33 +02:00
Clark Tomlinson
a0c6c01137 fix references to legacy encryption app name 2015-05-18 09:45:41 -04:00
Vincent Petry
d15471abd4 Merge pull request #15738 from rullzer/fix_15611 
Fix to make sure expiration date is properly set
 2015-05-18 11:26:12 +02:00
Roeland Jago Douma
b090a32d23 Reset share dialog values so we start out clean 
* Unit test
 2015-05-18 10:08:09 +02:00
Roeland Jago Douma
efd6fec57d Fix to make sure expiration date is properly set 
This did not happen correctly when the password was enforced since a
different code path was taken.

* moved generation of the default date string to separate function
* added unit test
 2015-05-18 09:35:47 +02:00
Thomas Müller
2cafbc803a Merge pull request #16242 from owncloud/use-oc-webroot 
Use OC.webroot instead of calculating the URL
 2015-05-15 18:10:18 +02:00
Craig Morrissey
ca341a8d59 add support for limit request parameter to getShareWith 2015-05-15 18:03:18 +02:00
Jenkins for ownCloud
49c4ee98b4 [tx-robot] updated from transifex 2015-05-15 01:54:49 -04:00
Jenkins for ownCloud
1596a1fd32 [tx-robot] updated from transifex 2015-05-14 01:54:47 -04:00
Lukas Reschke
e753e8cc37 Merge pull request #16290 from owncloud/upgrade-info-for-3rdparty-apps 
Add info message for upgrade of an 3rdparty app
 2015-05-13 08:32:42 +02:00
Jenkins for ownCloud
504586aec6 [tx-robot] updated from transifex 2015-05-13 01:55:14 -04:00
Morris Jobke
cb909cda97 Add info message for upgrade of an 3rdparty app 2015-05-12 18:02:31 +02:00
Morris Jobke
895a1a5efa Merge pull request #16282 from owncloud/fix-multiselect-ellipsize 
ellipsize first item in multiselect, fix #16174
 2015-05-12 16:08:13 +02:00
Jan-Christoph Borchardt
21a1995ad6 Merge pull request #16104 from owncloud/resize-filepicker 
Resize filepicker on window size change
 2015-05-12 15:57:23 +02:00
Jan-Christoph Borchardt
58bce49037 ellipsize first item in multiselect, fix #16174 2015-05-12 15:39:18 +02:00
Lukas Reschke
baa9503442 Use OC.webroot instead of calculating the URL 
Calculating the URL is error-prone as it doesn't work when for example `public.php` is requested and might even be harmful as it could leak sensitive information.

Since `oc.js` is even available when maintenance mode is available it is better to use the global `OC.webroot` that is not controlled by any user.
 2015-05-11 17:01:57 +02:00
Jenkins for ownCloud
a331f6b83e [tx-robot] updated from transifex 2015-05-11 01:54:43 -04:00
Jenkins for ownCloud
52fc45e6e3 [tx-robot] updated from transifex 2015-05-10 01:56:13 -04:00
Jenkins for ownCloud
6f5854a8de [tx-robot] updated from transifex 2015-05-09 01:55:35 -04:00
Jenkins for ownCloud
ff0faacf0b [tx-robot] updated from transifex 2015-05-08 01:54:52 -04:00
Thomas Müller
2344298954 Merge pull request #16035 from owncloud/issue-15975-occ-encryption-enable-warning-no-module 
Display a message when there is a problem with the default module
 2015-05-07 12:03:30 +02:00
Morris Jobke
12b24ee567 Merge pull request #16034 from owncloud/issue-15987-encryption-module-admin-page 
Display the module settings in the list of the encryption modules
 2015-05-07 10:44:03 +02:00
Jenkins for ownCloud
3dee907b70 [tx-robot] updated from transifex 2015-05-07 01:56:44 -04:00
Lukas Reschke
9a159372cb Merge pull request #16067 from owncloud/verbosity-in-app-code-check 
Add verbosity option to app:check-code
 2015-05-06 11:21:23 +02:00
Morris Jobke
de04501c97 add max-width of 600px to filepicker 2015-05-06 11:15:48 +02:00
Morris Jobke
e0640a0232 Resize filepicker on window size change 
* add 20 px space to each direction -> 10px padding to left, right, top and bottom
* fixes #16100
 2015-05-06 11:00:23 +02:00
Morris Jobke
c3fb021acf Merge pull request #16017 from owncloud/proper-update-notification 
Use OC.Notification for update notifications
 2015-05-06 09:28:42 +02:00
Jan-Christoph Borchardt
952a90f2e3 Merge pull request #16037 from owncloud/enc_dont_disable_encryption 
don't let the the user disable encryption once it was activated
 2015-05-05 18:53:01 +02:00
Morris Jobke
56b1c93a79 Add verbosity option to app:check-code 
* by default only lists files with errors
* option -v lists all files even if there are no errors
 2015-05-05 13:57:23 +02:00
Morris Jobke
a1b9444643 Don't highlight disabled labels on hover 2015-05-05 11:17:48 +02:00
Joas Schilling
87787a3af4 Fix the "app-id" parameter description of app:check-code 2015-05-05 08:23:59 +02:00
Jenkins for ownCloud
b60dcd91bb [tx-robot] updated from transifex 2015-05-05 01:55:36 -04:00
Joas Schilling
5180c2398d Add an occ command to get the status of encryption 2015-05-04 15:31:19 +02:00
Joas Schilling
59c657da53 Merge pull request #15772 from owncloud/issue-15771-dont-restrict-permissions-for-share-owner 
Do not restrict permissions for the original owner
 2015-05-04 15:07:37 +02:00
Joas Schilling
eadc2c330c Display the module settings in the list of the encryption modules 2015-05-04 15:04:03 +02:00
Joas Schilling
10144bd7f5 Display a message when there is a problem with the default module 2015-05-04 12:36:50 +02:00
Thomas Müller
4de45b5e61 Merge pull request #15958 from owncloud/usage-of-public-log-interface 
Use internally \OCP\ILogger instead of \OC\Log
 2015-05-04 09:13:26 +02:00
Jenkins for ownCloud
7fa308977b [tx-robot] updated from transifex 2015-05-04 01:54:47 -04:00
Morris Jobke
cd516eedcd Use OC.Notification for update notifications 
* instead of a static rendering inside PHP use the
  JS OC.Notification.showTemporary to hide the
  notification after 7 seconds automatically
* fixes #14811
 2015-05-03 17:26:03 +02:00
Morris Jobke
6bd861910b Merge pull request #16009 from owncloud/fix-searchresults 
fix search results from other places, account for margin-bottom in files list
 2015-05-03 11:48:00 +02:00
Morris Jobke
182304591d Merge pull request #16001 from owncloud/add-multiselect-new-title 
also add title to multiselect create new element, force multiselect wider width, fix #15954
 2015-05-02 21:46:28 +02:00
Jan-Christoph Borchardt
954968e9d8 fix search results from other places, account for margin-bottom in files list 2015-05-02 09:07:42 -04:00
Jenkins for ownCloud
aa0d439ed9 [tx-robot] updated from transifex 2015-05-02 01:54:49 -04:00
Jan-Christoph Borchardt
8ccf1c85d9 force minimum multiselect width to properly show longer groups 2015-05-01 13:51:01 -04:00
Jan-Christoph Borchardt
4dd8a22e51 also add title to multiselect create new element, fix #15954 2015-05-01 13:47:37 -04:00
Jenkins for ownCloud
eda4d45836 [tx-robot] updated from transifex 2015-05-01 01:54:43 -04:00
Morris Jobke
fbba7a61cb Use internally \OCP\ILogger instead of \OC\Log 
* this is the preparation for some upcoming logger related changes
* also fixes an issue in the public interface where we request
  an internal class as parameter
 2015-04-30 11:52:30 +02:00
Morris Jobke
b9c1bf26ee Merge pull request #15951 from owncloud/fix-install-again 
Make command optional
 2015-04-30 10:45:23 +02:00
Morris Jobke
8bc9c56dcf Merge pull request #15947 from owncloud/add-title-to-multiselect 
add title to multiselect list items so longer group names are visible
 2015-04-30 10:04:43 +02:00
Jenkins for ownCloud
ae853445ef [tx-robot] updated from transifex 2015-04-30 03:27:57 -04:00
Joas Schilling
9205a9b52e Merge pull request #15942 from owncloud/revert-15875-multiline-buttons 
Revert "fix layout for multiline buttons which are <a class='button'>"
 2015-04-30 08:25:43 +02:00
Bernhard Posselt
7c0dc06c10 make command optional 2015-04-29 22:53:16 +02:00
Jan-Christoph Borchardt
3dfa05c0d0 add title to multiselect list items so longer group names are visible, fix #15819 2015-04-29 13:53:29 -04:00
Jan-Christoph Borchardt
9ecfc7c237 Revert "fix layout for multiline buttons which are <a class='button'>" 2015-04-29 11:53:46 -04:00
Bernhard Posselt
b0d1d61db2 default to an empty string for database password if ommited 
fix null passwords

remove password trimming
 2015-04-29 15:39:51 +02:00
Vincent Petry
93cf51389a Added unit test for reshare by share owner 2015-04-29 10:34:37 +02:00
Joas Schilling
4d53706d4c Do not restrict permissions for the original owner 2015-04-29 10:34:36 +02:00
Lukas Reschke
1b84a1cd48 Fix routes 
Fixes public sharing as reported on https://github.com/owncloud/core/issues/15913
 2015-04-28 14:41:14 +02:00
Thomas Müller
aa2bd28a6a fix typo 2015-04-27 16:34:58 +02:00
Thomas Müller
66f9811151 handle case where the given language is unknown - refs #15794 2015-04-27 15:40:16 +02:00
Morris Jobke
6a7b7caa81 Merge pull request #15681 from owncloud/issue/15667-occ-encryption 
OCC commands to manage encryption
 2015-04-27 13:28:59 +02:00
Joas Schilling
e4c24a6b5c Undefined index: default 2015-04-27 12:21:48 +02:00
Joas Schilling
25b5adfe87 Fix scrutinizer complain 2015-04-27 11:46:00 +02:00
Joas Schilling
a4c314622a Use interface 2015-04-27 11:03:51 +02:00
Joas Schilling
e4977841b4 Add unit tests for the commands 2015-04-27 11:03:51 +02:00
Joas Schilling
d600955a51 Make getDefaultModuleId public and get module protected 2015-04-27 11:03:51 +02:00
Joas Schilling
f6d4bdb1fd Add occ commands to manage the encryption modules 2015-04-27 11:03:50 +02:00
Joas Schilling
802f818c27 Merge pull request #15875 from owncloud/multiline-buttons 
fix layout for multiline buttons which are <a class='button'>
 2015-04-27 10:04:51 +02:00
Jenkins for ownCloud
e58029f8ad [tx-robot] updated from transifex 2015-04-27 01:54:46 -04:00
Jan-Christoph Borchardt
84b41b3a4b fix layout for multiline buttons which are <a class='button'> 2015-04-26 11:05:51 +02:00
Jan-Christoph Borchardt
5b998e13d7 Merge pull request #15835 from owncloud/delete-permission-icon 
Show hint if there is no delete permission
 2015-04-24 11:57:47 +02:00
Morris Jobke
f4bc852db3 Show hint if there is no delete permission 
* add class .no-permission which shows the default delete icon
* fixes #15172
* add unit test for no permission and for delete permission
 2015-04-23 21:49:59 +02:00
Joas Schilling
eec92a16d6 Unify the output of the user commands and use DI 2015-04-23 12:40:13 +02:00
Joas Schilling
07627084e4 Check if the user exists before trying to delete him 2015-04-23 12:32:46 +02:00
Jenkins for ownCloud
f8f354b351 [tx-robot] updated from transifex 2015-04-23 01:54:51 -04:00
Morris Jobke
37a5b62abb Merge pull request #15639 from rullzer/fix_15368 
Reset sharedialog values
 2015-04-23 00:18:23 +02:00
Roeland Jago Douma
b971029652 Added unit tests 2015-04-17 09:38:09 +02:00
Roeland Jago Douma
595adfd193 moved from html to $('html') to fix unit tests 2015-04-17 09:38:09 +02:00
Roeland Jago Douma
c456f5dee1 Reset sharedialog values 2015-04-17 09:38:09 +02:00
Jenkins for ownCloud
da44df2cfa [tx-robot] updated from transifex 2015-04-17 01:55:37 -04:00
Thomas Müller
b6f79567aa files_encryption -> encryption 2015-04-16 10:46:34 +02:00
Jenkins for ownCloud
8606b7ca66 [tx-robot] updated from transifex 2015-04-16 01:54:43 -04:00
Jenkins for ownCloud
d7bdf60559 [tx-robot] updated from transifex 2015-04-22 01:55:38 -04:00
Joas Schilling
2c396a7080 Remove the app version from disabled app list 2015-04-20 17:03:19 +02:00
Jenkins for ownCloud
fd3c1484ad [tx-robot] updated from transifex 2015-04-19 01:54:41 -04:00
Jenkins for ownCloud
37a871127b [tx-robot] updated from transifex 2015-04-18 01:55:19 -04:00
Morris Jobke
9e46b7175d Merge pull request #15638 from owncloud/primary-button-disabled 
add disabled state to primary action button
 2015-04-15 16:43:40 +02:00
Jan-Christoph Borchardt
14b92c3ce6 Merge pull request #15632 from owncloud/remove-tooltip-fade 
remove slow fade animation for remaining tipsy tooltips
 2015-04-15 14:42:45 +02:00
Jan-Christoph Borchardt
008e3376c6 add disabled state to primary action button 2015-04-15 14:23:54 +02:00
Jan-Christoph Borchardt
04ca5b8160 remove slow fade animation for remaining tipsy tooltips 2015-04-15 12:25:10 +02:00
Vincent Petry
75268860fc Merge pull request #15626 from owncloud/remove-tooltip-fade 
remove slow fade animation for tipsy tooltip
 2015-04-15 12:14:54 +02:00
Jan-Christoph Borchardt
9332c8c266 remove slow fade animation for tipsy tooltip 2015-04-15 09:10:21 +02:00
Jenkins for ownCloud
1a894bd0d8 [tx-robot] updated from transifex 2015-04-15 01:54:38 -04:00
Jenkins for ownCloud
843290a0fb [tx-robot] updated from transifex 2015-04-14 18:22:17 -04:00
Jenkins for ownCloud
7f3f191ee9 [tx-robot] updated from transifex 2015-04-14 18:19:31 -04:00
Morris Jobke
59efcb63a3 fix filepicker 
* add ability to filter for mimetype
* fixes #15526
* fixes #11563
 2015-04-13 10:38:08 +02:00
Lukas Reschke
84041a4fa2 Merge pull request #15541 from owncloud/add-reply-to-support 
Add "Reply-To" support for sharing mails as well as refactor code and add unit-tests
 2015-04-12 22:30:35 +02:00
Jan-Christoph Borchardt
573c57402f fix wrong typeface being used for some buttons 2015-04-11 13:29:55 +02:00
Lukas Reschke
e3ad99d252 Add "Reply-To" support to sharing mails and refactor code 2015-04-10 17:30:07 +02:00
Thomas Müller
7b2d53603c Merge pull request #15489 from owncloud/dont_hide_exceptions_master 
Dont hide exceptions master
 2015-04-10 15:49:45 +02:00
Jan-Christoph Borchardt
9c76bcd479 fix share input loading spinner, fix #15522 2015-04-10 11:32:02 +02:00
Morris Jobke
473d3e14c8 more robust share dialog 2015-04-10 09:12:37 +02:00
Jörn Friedrich Dreyer
8964c5068c do not disclose information, show generic error on login page 
Conflicts:
	core/templates/login.php
	lib/base.php
 2015-04-10 09:12:37 +02:00
Thomas Müller
13178db465 Merge pull request #15404 from Crote/occ-password-from-env 
Add password input from env variable for occ user:{add, resetpassword}
 2015-04-10 00:08:40 +02:00
Thomas Müller
20eaadd72b Merge pull request #15182 from rullzer/fix-8231 
ajax/share.php should return correct list of suggestions
 2015-04-10 00:05:11 +02:00
Vincent Petry
10ffa3b770 Merge pull request #15512 from owncloud/autoclose-settings-menu 
Don't stop event execution for menu item click
 2015-04-09 19:53:43 +02:00
Morris Jobke
51e4633187 Don't stop event execution for menu item click 
* fixes #12326 - the settings menu is closed now, because the event is executed
 2015-04-09 18:32:33 +02:00