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

27856 commits

This branch
This branch
All branches
Author SHA1 Message Date
Thomas Müller
5108f48c97 Merge pull request #19703 from owncloud/revert-19702-trash-deletesectionposition 
Revert "Move trashbin specific CSS that modifies sidebar"
 2015-10-12 14:55:51 +02:00
Björn Schießle
8a35034b4c Merge pull request #19704 from owncloud/fix_17997 
also detect files in a .part folder as part file
 2015-10-12 14:34:57 +02:00
Thomas Müller
0738ddfb76 Revert "Move trashbin specific CSS that modifies sidebar" 2015-10-12 13:59:29 +02:00
Bjoern Schiessle
8185eaa6dd also detect files in a .part folder as part file 2015-10-12 13:59:16 +02:00
Thomas Müller
0036c637fc Merge pull request #19657 from owncloud/setup-transport 
Setup sendmail transport
 2015-10-12 13:44:26 +02:00
Raghu Nayyar
4b1f2eb37e Merge pull request #19702 from owncloud/trash-deletesectionposition 
Move trashbin specific CSS that modifies sidebar
 2015-10-12 16:18:06 +05:30
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
Thomas Müller
aedb7a7e70 Revert "Debounce cancel upload message" 2015-10-12 11:30:15 +02:00
Vincent Petry
6b71efb2b1 Make trashbin's "Restore" an inline action 2015-10-12 11:27:23 +02:00
Robin Appelman
179c0be158 Merge pull request #19628 from owncloud/files-canceluploaddebounce 
Debounce cancel upload message
 2015-10-12 10:54:58 +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
Arthur Schiwon
e3a148584a adjust fetchList with a single requested attribute accordingly 2015-10-09 20:07:35 +02:00
Vincent Petry
8098c06e70 Do not update mime types for folders with extension 
Some folders might have an extension like "test.conf".
This fix prevents to overwrite the folder's mime type with another mime
type while running the mimetype repair step.
 2015-10-09 18:16:36 +02:00
Jörn Friedrich Dreyer
5b1706e8d8 Merge pull request #19585 from owncloud/enc_improve_introduction 
improved initial explanation/warning if the admin enabled encryptrion
 2015-10-09 15:57:44 +02:00
Jörn Friedrich Dreyer
a587a667b9 Merge pull request #19670 from owncloud/objectstore_filesystem_tests 
adjust filesystem tests to objectstore
 2015-10-09 15:41:09 +02:00
Arthur Schiwon
d127b3f0d2 adjust tests 2015-10-09 14:30:49 +02:00
Arthur Schiwon
2fddb1367a fix primary group retrieval 2015-10-09 14:12:59 +02:00
Thomas Müller
8cbf76755e Merge pull request #19643 from owncloud/public-download-spinner 
Set download cookie on public download
 2015-10-09 14:10:29 +02:00
Thomas Müller
4cb5970947 Always pass in ILogger 2015-10-09 14:08:22 +02:00
Thomas Müller
bd21e5925c Clean code 2015-10-09 13:46:59 +02:00
Thomas Müller
38143d670b Catch exceptions during app upgrade - fixes #16240 2015-10-09 13:44:30 +02:00
Robin Appelman
a42dd117e2 Merge pull request #19654 from owncloud/db-locking-no-scan-transaction 
Dont use a transaction in the scanner while using db based locking
 2015-10-09 12:38:54 +02:00
Jörn Friedrich Dreyer
c8640cdcb0 adjust filesystem tests to objectstore 2015-10-09 12:35:37 +02:00
Thomas Müller
18ad60380c Merge pull request #18586 from owncloud/ie8-uploadavatar 
Fix uploading avatar and root certs in IE8
 2015-10-09 11:30:53 +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
Thomas Müller
020bb33150 Merge pull request #19034 from owncloud/http-request-warning 
Prevent warning decoding content
 2015-10-08 21:51:47 +02:00
Thomas Müller
3130438fcc Merge pull request #19651 from owncloud/recursive_mkdir_for_objectstores 
make mkdir recursive, add phpdoc to api
 2015-10-08 21:28:53 +02:00
Arthur Schiwon
a876efda50 treat dn as any other attribute when building the search() return array 2015-10-08 21:18:34 +02:00
Thomas Müller
ef4278cfa9 Merge pull request #19664 from owncloud/check-only-if-s2s-or-appstore-is-enabled 
Don't perform checks for outdated TLS libs when no internet connection
 2015-10-08 21:09:30 +02:00
Arthur Schiwon
dd2e887a8d adjust handling changed return array structure from search() and fetchList() 2015-10-08 20:32:15 +02:00
Lukas Reschke
12181aa6de Don't perform checks for outdated TLS libs when no internet connection 
This change makes the check return a positive result when:

- The instance has been configured to not use the internet
AND/OR
- S2S AND the appstore is disabled
 2015-10-08 18:26:03 +02:00
Lukas Reschke
9b220d0576 Fix comment syntax 2015-10-08 17:35:31 +02:00
Thomas Müller
49d140444d Merge pull request #19655 from owncloud/integration-whitespace-fixes 
Fix whitespace issues in integration tests
 2015-10-08 17:30:33 +02:00
Morris Jobke
3c005bc020 Check .conflicts for checkboxes 2015-10-08 17:13:28 +02:00
Lukas Reschke
18394205c2 Setup sendmail transport 
Replaces https://github.com/owncloud/core/pull/19047 and fixes https://github.com/owncloud/enterprise/issues/854  and https://github.com/owncloud/core/issues/19110
 2015-10-08 16:48:18 +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
Morris Jobke
d78f6852c7 Fix whitespace issues in integration tests 2015-10-08 16:21:31 +02:00
Thomas Müller
adeab41e2a Merge pull request #19616 from owncloud/ocs_provisioning_api_checking_lists 
Ocs provisioning api checking lists
 2015-10-08 16:17:30 +02:00
Thomas Müller
1227786930 Merge pull request #19650 from owncloud/disable-appstore-for-ee 
Disable app store for EE by default
 2015-10-08 16:00:41 +02:00
Robin Appelman
7ff5a6ccf4 Dont use a transaction in the scanner while using db based locking 2015-10-08 15:29:04 +02:00
Jörn Friedrich Dreyer
89a63ec74b make mkdir recursive, add phpdoc to api 2015-10-08 14:54:21 +02:00
Lukas Reschke
9866037d0c Disable app store for EE by default 
This disables the app store for EE versions by default to address some problems caused by the wrong assumption that "Official" means supported by ownCloud Inc.

Administrators can still enable the app store by setting `appstoreenabled` to true in the config file.
 2015-10-08 14:52:52 +02:00
Thomas Müller
17ffa4a244 Merge pull request #19414 from owncloud/swift_primary_storage_tests 
Swift primary storage tests
 2015-10-08 14:08:56 +02:00