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

26708 commits

This branch
This branch
All branches
Author SHA1 Message Date
Vincent Petry
0d4562c938 Merge pull request #18631 from owncloud/more_ocs_share_data 
Return permissions and expiration on create share responses
 2015-09-01 12:29:02 +02:00
Roeland Jago Douma
f12caf930e Properly return 304 
The ETag set in the IF_NONE_MODIFIED header is wraped in quotes (").
However the ETag that is set in response is not (yet). Also we need to
cast the ETag to a string.

* Added unit test
 2015-09-01 11:04:41 +02:00
Vincent Petry
85b62c7d82 Merge pull request #18635 from owncloud/stickify-files-and-sharing-notification-types 
Sticky the notification types of files and sharing
 2015-08-31 17:56:48 +02:00
Morris Jobke
e367f1bfc1 Merge pull request #18715 from owncloud/language-code-english 
add english language code translation
 2015-08-31 17:45:39 +02:00
Morris Jobke
eef707043c add english language code translation 2015-08-31 17:41:20 +02:00
Vincent Petry
f8d8de5da6 Merge pull request #17899 from owncloud/enc_make_key_storage_root_configurable 
Make root of key storage configurable
 2015-08-31 15:58:30 +02:00
Robin Appelman
3e9533ae11 Merge pull request #18702 from owncloud/ext-emptymount 
Allow an empty mount point
 2015-08-31 15:28:41 +02:00
Robin McCorkell
f6b1d3506f Allow easy XDEBUG debugging with autotest 
Debugging scripts needs the environment variable XDEBUG_CONFIG to be
set, which initiates a connection to a listening debugger. But if that
env is set and one of the PHP setup steps occurs (e.g. occ install), the
debugging session is 'completed' and the debugger no longer listens
during the actual tests. This saves the XDEBUG_CONFIG env so it only
applies during the PHPUnit execution, so only the real tests trigger the
debugging.
 2015-08-31 14:22:02 +01:00
Robin McCorkell
d64bdc0fef Unit test storages with an empty mount point 2015-08-31 14:01:05 +01:00
Morris Jobke
c34fbea197 Merge pull request #18691 from owncloud/request-no-read 
Decode request content only on getContent
 2015-08-31 14:58:48 +02:00
Robin McCorkell
1e2e5abe26 Allow an empty mount point 2015-08-31 13:23:23 +01:00
Jenkins for ownCloud
65784227d6 [tx-robot] updated from transifex 2015-08-31 01:54:45 -04:00
Robin McCorkell
e60c4bada1 Decode request content only on getContent 2015-08-31 01:05:25 +01:00
Morris Jobke
89b603a4b3 Merge pull request #18671 from owncloud/cleanup-sidebar-semantics 
Removes unecessary divs and adds max width to longer names.
 2015-08-31 00:38:18 +02:00
Raghu Nayyar
c6053daf43 Fixes failing tests 2015-08-31 00:14:07 +02:00
Raghu Nayyar
0167225686 Merge pull request #18689 from owncloud/app-navigation-line 
Introduce small line for navigation sidebar
 2015-08-30 23:24:35 +02:00
Morris Jobke
5d1fb8cb11 Introduce small line for navigation sidebar 2015-08-30 20:47:22 +02:00
Morris Jobke
b50ac6ff2f Merge pull request #10149 from owncloud/storage-wrapper-check 
Check result of storage wrappers
 2015-08-30 19:48:37 +02:00
Bjoern Schiessle
37513f9411 don't read certificates if ownCloud is not installed 2015-08-30 19:00:03 +02:00
Bjoern Schiessle
289e9130f3 make system root of key storage configurable 2015-08-30 19:00:03 +02:00
Raghu Nayyar
3eee9a2e48 Merge pull request #18681 from owncloud/apps-unit-test 
Add apps JS unit test
 2015-08-30 17:48:19 +02:00
Vincent Petry
a808837ec9 Add apps unit test 2015-08-30 17:14:57 +02:00
Björn Schießle
4d7c352077 Merge pull request #18556 from owncloud/fix_password_reset 
[encryption] fix password reset for ldap users
 2015-08-30 15:57:24 +02:00
Roeland Jago Douma
d54b497ade Return permissions and expiration on create share responses 
Updated and added unit tests
 2015-08-30 15:42:19 +02:00
Bjoern Schiessle
166e57cf61 return false if private key is not valid 2015-08-30 15:31:19 +02:00
Bjoern Schiessle
f893de4136 use login name for password reset 2015-08-30 15:31:19 +02:00
Raghu Nayyar
468bde67ff Removes unecessary divs and adds max width to longer names. 2015-08-30 14:17:18 +02:00
Vincent Petry
045f8cc971 Merge pull request #18651 from owncloud/ocs_share_create_with_expire 
Allow to directly set the expireDate on a new (link)share
 2015-08-30 10:50:12 +02:00
Roeland Jago Douma
2aff11c80b Actually validate the expire date on share 
* Added more intergration tests
 2015-08-30 10:31:43 +02:00
Robin Appelman
4cb8ca1860 Check result of storage wrappers 2015-08-30 10:02:42 +02:00
Jenkins for ownCloud
114d1acd2c [tx-robot] updated from transifex 2015-08-30 01:54:51 -04:00
Morris Jobke
90dfa981c5 Merge pull request #14856 from rullzer/remote_avatars 
Allow Remote avatars
 2015-08-29 18:05:32 +02:00
Vincent Petry
723f8c8f1b Merge pull request #18620 from owncloud/add-public-interface-for-factory 
Add a public interface for the language factory so apps can use it
 2015-08-29 16:44:08 +02:00
Roeland Jago Douma
ae62537adf Allow remote avatars 2015-08-29 15:22:13 +02:00
Roeland Jago Douma
fc64ea670d Allow to directly set the expireDate on a new (link)share 
Since this extends the API we now properly parse the date. We only
accept valid ISO 8601 Dates (YYYY-MM-DD).

Currently this only works for link shares (it is just ignored for other
shares). Since we do not have user/group/federated expiring shares yet.

* Tests added
 2015-08-29 12:39:47 +02:00
Lukas Reschke
faa62d1799 Merge pull request #18393 from owncloud/objectstore-check-class 
make sure we actually have an object store
 2015-08-29 10:11:39 +02:00
Jenkins for ownCloud
64652b3000 [tx-robot] updated from transifex 2015-08-29 01:55:05 -04:00
Joas Schilling
0ddcc7da44 Merge pull request #18511 from owncloud/downgrad-sharing-error-logs-to-debug 
Change log level of debugging logs to debug
 2015-08-28 21:05:02 +02:00
Björn Schießle
6e210d960c Merge pull request #18423 from owncloud/occ_encrypt_all 
occ command line tool to encrypt all files
 2015-08-28 20:44:55 +02:00
Jan-Christoph Borchardt
dc04b618bc Merge pull request #18638 from owncloud/issue-18141-sort-languages-with-names-before-code-only 
Sort languages with a name before those with language code only
 2015-08-28 20:06:31 +02:00
Morris Jobke
84bb9be4b7 Merge pull request #18636 from owncloud/fix-filepicker-filetype-icons 
fix size of filetype icons in filepicker
 2015-08-28 19:44:53 +02:00
Joas Schilling
dc7a4e1b9d Merge pull request #18598 from owncloud/proper-language-l10n 
Add comment for language name and remove unneeded fallbacks
 2015-08-28 19:23:31 +02:00
Joas Schilling
503abb36a2 Sort languages with a name before those with language code only 2015-08-28 19:10:47 +02:00
Jan-Christoph Borchardt
4adc002428 fix size of filetype icons in filepicker 2015-08-28 18:53:43 +02:00
Joas Schilling
42f0651b83 Sticky the notification types of files and sharing 2015-08-28 18:40:50 +02:00
Vincent Petry
59273a8863 Combine upload action into the "New" menu 
Refactored the new menu to be encapsulated in the NewFileMenu JS class
 2015-08-28 17:27:48 +02:00
Robin Appelman
d14252d9c7 make sure we actually have an object store 2015-08-28 16:13:19 +02:00
Joas Schilling
37b00b7443 Add since tag 2015-08-28 15:46:55 +02:00
Vincent Petry
efeef958a3 Merge pull request #18610 from owncloud/use-certificates-that-expire-in10-years 
[master] Use certificates that expire in 10 years
 2015-08-28 15:28:16 +02:00
Vincent Petry
b4f04755d0 Merge pull request #18624 from owncloud/navigation-icons 
compress icons in navigation, move to monochrome again
 2015-08-28 14:19:17 +02:00