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
Roeland Jago Douma
5c381ea532 Move calls to Files.getMimeIcon to OC.MimeType.getIconUrl 2015-07-09 13:40:13 +02:00
Jenkins for ownCloud
6d9bb17360 [tx-robot] updated from transifex 2015-07-09 01:54:53 -04:00
Hendrik Leppelsack
4d289dc590 fix browser compatibility issue for element.closest 2015-07-08 22:58:08 +02:00
Hendrik Leppelsack
6f547a9960 fix tipsy not updating on reinitialization 2015-07-08 10:53:17 +02:00
Jenkins for ownCloud
2fd84607ee [tx-robot] updated from transifex 2015-07-08 01:55:28 -04:00
Morris Jobke
4d75db0e54 Merge pull request #17439 from owncloud/update-3rdpartytext 
Remove 3rd party text for disabled apps on update
 2015-07-07 16:26:30 +02:00
Morris Jobke
10ea3f610d Merge pull request #17436 from owncloud/update-keeppageifwarnings 
Keep update page when there are warnings
 2015-07-07 16:25:30 +02:00
Morris Jobke
3f5aa27d49 refactoring into proper methods 2015-07-07 15:16:37 +02:00
Vincent Petry
a64652e12a Remove 3rd party text for disabled apps on update 2015-07-07 15:00:19 +02:00
Vincent Petry
993e7eeec7 Keep update page when there are warnings 
Whenever there were warnings during an update, the page will not be
redirected any more.
 2015-07-07 13:38:24 +02:00
Joas Schilling
85f012512e Invert the "public" to a "private" method 2015-07-07 11:30:21 +02:00
Joas Schilling
e5bc9d0619 Make it possible to import exportet app/system configs 2015-07-07 11:25:29 +02:00
Joas Schilling
971060862e Fix typo in command description 2015-07-07 11:20:53 +02:00
Joas Schilling
2b86eb0b29 Add commands to get, set and delete app config values 2015-07-07 11:18:25 +02:00
Joas Schilling
130b5d8587 Allow reading from stdin 2015-07-07 11:18:25 +02:00
Joas Schilling
86952f88cb Add a command to import an json array into the config 2015-07-07 11:18:25 +02:00
Joas Schilling
bc084c40a6 Add a command to delete a system config 2015-07-07 11:18:25 +02:00
Joas Schilling
3608c1007e Add a command to get a config value 2015-07-07 11:18:25 +02:00
Joas Schilling
a83eac3762 Add a command to set a system config value 2015-07-07 11:18:25 +02:00
Joas Schilling
5370bba0b6 Split the system from the app config 2015-07-07 11:18:24 +02:00
Joas Schilling
371a4d014a Fix no value 2015-07-07 11:18:24 +02:00
Joas Schilling
5d84876ecd Missing doc 2015-07-07 11:18:24 +02:00
Joas Schilling
2f65332014 Add an option to exclude sensitive values (e.g. for reports) 2015-07-07 11:18:24 +02:00
Joas Schilling
6763637773 Add a command to list existing configs 2015-07-07 11:18:24 +02:00
Joas Schilling
6ed8ba0ce9 Fix nested array lists 2015-07-07 11:18:24 +02:00
Joas Schilling
6d4cb1b480 Sort registration of commands alphabetically 2015-07-07 11:18:21 +02:00
Roeland Jago Douma
c8145cdbd6 Javascript mimetype icon resolver 
This makes it possible to retrieve the icon for mimetypes in javascript.
It makes no additional queries to the server to retrieve the mimetype.

* config/mimetypealiases.json added
* mimetype.js: this is where the logic resides to convert from mimetype
  to icon url
* mimetypelist.js: generated file with a list of mimetype mapping (aliases)
  and the list of icon files
* ./occ maintenance:mimetypesjs : new command for occ to gernerate
  mimetypes.js
* unit tests updated and still work
* javascript tests added
* theming support
* folder of the theme is now present in javascript (OC.theme.folder)
 2015-07-06 16:32:10 +02:00
Hendrik Leppelsack
00b97dfbb1 remove debug messages 2015-07-06 13:27:24 +02:00
Jenkins for ownCloud
5734edfe20 [tx-robot] updated from transifex 2015-07-06 01:54:38 -04:00
Jenkins for ownCloud
55f4d0eea1 [tx-robot] updated from transifex 2015-07-05 01:54:50 -04:00
Thomas Müller
d3ac73c0c9 Remove OC_Log 2015-07-03 18:00:16 +02:00
Jenkins for ownCloud
b8f5b2c47a [tx-robot] updated from transifex 2015-07-03 01:54:57 -04:00
Morris Jobke
61a60ffd47 Merge pull request #17293 from owncloud/revert-z-index 
Revert z-index changes
 2015-07-02 08:21:54 +02:00
Jenkins for ownCloud
d2e1cae331 [tx-robot] updated from transifex 2015-07-02 01:59:26 -04:00
Jan-Christoph Borchardt
b80b1fbd24 Revert "fix z-index of share-autocomplete" 
This reverts commit 4edf388a38.
 2015-07-01 16:12:55 +02:00
Jan-Christoph Borchardt
75451927b5 Revert "explicitly set z-index on app-content, fix overlap from navigation" 
This reverts commit 71e5bc1803.
 2015-07-01 16:12:36 +02:00
Morris Jobke
b5c9196ffc Merge pull request #17088 from owncloud/add-verbosity-to-upgrade 
[upgrade] add verbosity check and show repair info & steps
 2015-07-01 08:56:06 +02:00
Morris Jobke
4e44cc49d9 Merge pull request #17093 from owncloud/upgrade-timestamp 
[upgrade] show timestamp for output during upgrade
 2015-07-01 08:55:32 +02:00
Jenkins for ownCloud
733d59ed44 [tx-robot] updated from transifex 2015-06-29 01:54:44 -04:00
Jenkins for ownCloud
4d565a8447 [tx-robot] updated from transifex 2015-06-28 01:55:19 -04:00
Lukas Reschke
d1f0ff372e Merge pull request #17163 from owncloud/update-licenses 
Update license headers
 2015-06-27 20:22:23 +02:00
Jan-Christoph Borchardt
4edf388a38 fix z-index of share-autocomplete 2015-06-26 17:48:35 +02:00
Björn Schießle
b318b9cf17 Merge pull request #17008 from owncloud/fix-17006 
Improve splitting of username and remote adress when username contains an `@`
 2015-06-26 16:01:16 +02:00
Thomas Müller
6c3a4282e5 Merge pull request #17165 from owncloud/federated_cloud_sharing_search_address_book 
Search address book for federated cloud id
 2015-06-26 10:53:02 +02:00
Roeland Jago Douma
27d5838fb7 Fix for #17178 
If no array of arrays is submitted make sure we still keep $sharedUsers
and $sharedGroups as arrays so the rest of the code keeps functioning as
it should.
 2015-06-25 21:16:18 +02:00
Morris Jobke
f63915d0c8 update license headers and authors 2015-06-25 14:13:49 +02:00
Bjoern Schiessle
f9dcb559e9 search address book for federated cloud id 2015-06-25 11:57:03 +02:00
Jenkins for ownCloud
dddbfb903f [tx-robot] updated from transifex 2015-06-25 01:55:15 -04:00
Morris Jobke
6be0f833d0 Merge pull request #17105 from owncloud/app-content-z-index 
explicitly set z-index on app-content, fix overlap from navigation
 2015-06-24 12:27:29 +02:00
Joas Schilling
e5bc50d156 Use non-zero exit code when app is not compliant (so CIs can detect the status) 2015-06-24 11:59:43 +02:00
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