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

31188 commits

This branch
This branch
All branches
Author SHA1 Message Date
Joas Schilling
dcca20a48a Save the query when we get tags for no objects 2016-03-22 11:13:11 +01:00
Thomas Müller
9fc371e436 Merge pull request #23320 from owncloud/early-creation-of-birthday-calendar 
Create the contact birthday calendar right away as soon as the comman…
 2016-03-22 10:31:01 +01:00
Thomas Müller
7426be0937 Merge pull request #23448 from owncloud/issue-22993-soften-exception-on-enable-default-app 
Do not abort with an exception when a default app can not be enabled
 2016-03-22 10:19:59 +01:00
Thomas Müller
da8781e425 Merge pull request #23443 from owncloud/some-more-logging-information 
Log more information by default
 2016-03-22 10:06:32 +01:00
Thomas Müller
5e4f9b8627 Merge pull request #23440 from owncloud/fix_22286 
apply retry wrapper to make sure that we always read/write a complete block
 2016-03-22 09:50:05 +01:00
Thomas Müller
ac799a40e3 Merge pull request #23422 from owncloud/icon-and-you-translation-for-comments 
Add comment icon and "You commented" translations to activities
 2016-03-22 09:49:30 +01:00
Thomas Müller
c46596bef8 Merge pull request #23377 from owncloud/optimize-svgs 
Optimize SVGs
 2016-03-22 09:48:01 +01:00
Jenkins for ownCloud
aa5bb56010 [tx-robot] updated from transifex 2016-03-22 01:55:40 -04:00
Thomas Müller
2357bbf80a Merge pull request #23439 from owncloud/smb-permissions 
properly use smb permissions
 2016-03-21 18:05:45 +01:00
Thomas Müller
2db67c3308 Merge pull request #23386 from owncloud/share-keepoptioncheckboxinblocks 
Keep share checkboxes together
 2016-03-21 18:05:16 +01:00
Thomas Müller
36e1476270 Merge pull request #23388 from owncloud/issue-22887-infinite-background-job-loop-for-old-versions 
Do not create a new job when federation failed to connect but use existing job
 2016-03-21 18:04:02 +01:00
Thomas Müller
61629ad9ad Merge pull request #23424 from owncloud/fix-cachewrapper-doc-issue 
Fix doc issue of cache wrapper
 2016-03-21 18:03:35 +01:00
Thomas Müller
736b80f0cb Merge pull request #23323 from owncloud/gdrive-chunkupload 
Chunk upload for GDrive
 2016-03-21 18:02:55 +01:00
Thomas Müller
beef371398 Merge pull request #23292 from owncloud/dav-chunking-onlyfirehooksonce 
Do not fire pre/post hooks twice on chunk upload
 2016-03-21 18:02:30 +01:00
Thomas Müller
492a1ded1c Merge pull request #23083 from owncloud/generate-birthdays-on-upgrade 
Birthday events are generated on upgrade
 2016-03-21 17:48:02 +01:00
Bjoern Schiessle
f761733f17 apply retry wrapper to make sure that we always read/write a complete block 2016-03-21 17:39:43 +01:00
Vincent Petry
2309ef9167 Merge pull request #23351 from owncloud/streams-0.4 
Update icewind/streams and icewind/smb
 2016-03-21 17:37:40 +01:00
Joas Schilling
444343dc2b Do not abort with an exception when a default app can not be enabled 2016-03-21 16:31:59 +01:00
Lukas Reschke
7adae4476f Log more information by default 
This modifies the logger to add the following logging information by default:

- Request Method
- Request URL
- Current user
 2016-03-21 15:48:01 +01:00
Vincent Petry
f28f538029 Do not fire pre/post hooks twice on chunk upload 2016-03-21 15:14:58 +01:00
Robin Appelman
8ab70b1231 properly use smb permissions 2016-03-21 14:35:41 +01:00
Robin Appelman
792752772d update icewind/smb to 1.0.8 2016-03-21 14:24:00 +01:00
Robin Appelman
dfbd85d723 update icewind/streams to 0.4.0 and icewind/smb to 1.0.7 in files_external 2016-03-21 14:24:00 +01:00
Robin Appelman
90fb744e89 update icewind/streams to 0.4.0 2016-03-21 14:23:57 +01:00
Thomas Müller
86581f6626 Merge pull request #22065 from owncloud/systemtags-create-same-prefix 
Allow creating tags where another one with same prefix exists
 2016-03-21 11:15:49 +01:00
Thomas Müller
8852fdaee3 Merge pull request #22789 from owncloud/dav-sharesproperty 
Add webdav property for share info in PROPFIND response
 2016-03-21 11:15:00 +01:00
Joas Schilling
e86fd945dd Fix doc issue of cache wrapper 2016-03-21 10:45:53 +01:00
Joas Schilling
b7f7fc7241 Do not create a new job when it failed to connect atm 2016-03-21 10:29:53 +01:00
Thomas Müller
e983bd7db0 Merge pull request #23368 from owncloud/use-dav-sabre-plugin-for-browser 
In debugging mode we enable Sabre's browser plugin since it helps a l…
 2016-03-21 10:13:27 +01:00
Thomas Müller
c77412b1ac Merge pull request #22792 from owncloud/no-recovery-key-if-the-master-key-is-enabled 
disable the recovery key if the master key is enabled
 2016-03-21 09:49:15 +01:00
Thomas Müller
8442516e10 Merge pull request #23329 from owncloud/fix-21555 
Avatar must be saved after login is done and external storages set up…
 2016-03-21 09:47:50 +01:00
Thomas Müller
16782484b9 Merge pull request #23349 from owncloud/hardenings 
Hardenings
 2016-03-21 09:45:05 +01:00
Thomas Müller
ef4dc22a6a Merge pull request #23369 from owncloud/use-raw-path 
Use raw PATH_INFO
 2016-03-21 09:44:27 +01:00
Thomas Müller
b9da594bd9 Merge pull request #23374 from owncloud/fix-htaccess-issues 
Write .htaccess update only if not already written
 2016-03-21 09:43:18 +01:00
Joas Schilling
b2f4e4559f Add comment icons and "You commented" translations 2016-03-21 09:41:13 +01:00
Jenkins for ownCloud
35bc315f59 [tx-robot] updated from transifex 2016-03-21 01:55:40 -04:00
Jenkins for ownCloud
1f1d87d413 [tx-robot] updated from transifex 2016-03-20 01:55:09 -04:00
Jenkins for ownCloud
9c053ed465 [tx-robot] updated from transifex 2016-03-19 01:55:39 -04:00
Vincent Petry
9ef24b9a0f Keep share checkboxes together 
- removed leading spaces before markup which can affect rendering in
  some cases
- added shareOption CSS class to group and keep share option checkbox +
  label
- moved ".showCruds" arrow into the matching shareOption to keep the
  arrow together with the checkbox
 2016-03-18 11:59:57 +01:00
Morris Jobke
249253cf14 Optimize SVGs 2016-03-18 08:44:45 +01:00
Jenkins for ownCloud
a6c921267e [tx-robot] updated from transifex 2016-03-18 01:59:00 -04:00
Thomas Müller
0bc51b9118 Merge pull request #23272 from owncloud/dropbox-downloadnotthefullfileinmemory 
Fix dropbox storage to not store the whole file in memory
 2016-03-17 20:52:41 +01:00
Thomas Müller
31ee463690 Merge pull request #23282 from owncloud/fix-caching-unavailable-ldap 
fix writing to cache when fallback server should be used immediately
 2016-03-17 20:52:22 +01:00
Thomas Müller
d6d59fe227 Merge pull request #23346 from owncloud/fix_23325 
Set proper public webdav permissions when public upload disabled
 2016-03-17 20:51:54 +01:00
Thomas Müller
876e032d09 Merge pull request #23370 from owncloud/fix-username-change 
Update avatar on username change if avatar is set
 2016-03-17 19:50:12 +01:00
Thomas Müller
f957ca405f Merge pull request #23371 from owncloud/paurisa-Fixed_21588 
Rating icons changed to .svg
 2016-03-17 19:49:11 +01:00
Roeland Jago Douma
6e6e002280 Remove duplicated copyright 2016-03-17 19:24:25 +01:00
Thomas Müller
d6ee1798cc Merge pull request #23255 from owncloud/update-sabre3.0.8-fseek 
Update 3rdparty commit for sabre update 3.0.8
 2016-03-17 18:33:34 +01:00
Thomas Müller
520724d757 Necessary code changes to make browser plugin properly work 2016-03-17 18:00:06 +01:00
Lukas Reschke
e867a7d54d Write .htaccess update only if not already written 
The ownCloud update routine also runs the "updateHtaccess" code in case only an application gets updated. This leads to having entries multiple time in the .htaccess file leading to unpredictable behaviour.

With 9.0 we added the "#### DO NOT CHANGE ANYTHING ABOVE THIS LINE ####" entry to the .htaccess file, this change uses it to ensure that only to the .htaccess gets written if the file has not been modified already. Since the .htaccess modifications are optional this is not a big deal.

Without this change updates of applications can break the rewrite rules (ending in endless redirects) as well as breaking the code integrity checker.
 2016-03-17 17:59:28 +01:00