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

27959 commits

This branch
This branch
All branches
Author SHA1 Message Date
Thomas Müller
1060be0886 Merge pull request #19927 from owncloud/install-shipped-apps-on-upgrade 
Install new shipped apps on upgrade
 2015-10-21 14:43:27 +02:00
Thomas Müller
33144a5d80 Merge pull request #19827 from owncloud/subadmin_non_static 
Make OC_SubAdmin non static
 2015-10-21 14:43:09 +02:00
Roeland Jago Douma
a1ef0bc28b 3rdparty bump of pear-core-minimal 2015-10-21 14:34:37 +02:00
Joas Schilling
a0437591db Use the normal OC.menu JS for handling the Settings menu 2015-10-21 13:59:30 +02:00
Thomas Müller
036c8a2e56 Merge pull request #19936 from owncloud/DeepDiver1975-patch-1 
Remove the core version from shipped.json
 2015-10-21 13:53:33 +02:00
Vincent Petry
e36c85178f Do not display details bar after rename 2015-10-21 13:43:39 +02:00
Thomas Müller
ae0f20471a Merge pull request #19923 from owncloud/apps-donotdisplaybrokenappiconininternetexplorer 
Disable app icon preview in apps page for IE
 2015-10-21 13:42:48 +02:00
Thomas Müller
c27531fe0f Remove the core version from shipped.json 2015-10-21 13:40:05 +02:00
Vincent Petry
1c3b50b763 Update doc links in README for 9.0 2015-10-21 13:13:12 +02:00
Thomas Müller
ab8616b2f8 Merge pull request #19924 from owncloud/issue-19891-update-lists-disabled-apps-twice 
Update - Only add one section for disabled apps
 2015-10-21 12:48:40 +02:00
Sergio Bertolin
5703483e99 using canonize in assertEquals for arrays 2015-10-21 10:19:20 +00:00
Vincent Petry
abd0ba1f25 Fix file upload, conflict dialog, also in public link 
- Use "FileList" instead of "OCA.Files.App.fileList" that doesn't exist in public
link page.
- Fix public link upload by properly adding the form data using a new
  utility function "addFormData". That one is needed because IE8 upload
  and regular upload use a different format...
 2015-10-21 12:18:06 +02:00
Tom Needham
2ca5b1aa1f Add test for remote share info tooltop 2015-10-21 10:00:29 +00:00
Roeland Jago Douma
02af4269f2 Fix unit test 
Now that OC_SubAdmin is just a wrapper around OC\SubAdmin some unit
tests had to be fixed because they expected different behaviour.

Eventually they should move to properly mocked instances of OC\SubAdmin
of course
 2015-10-21 11:41:25 +02:00
Morris Jobke
ee42e9d489 increase core version and add dav version number 2015-10-21 11:36:44 +02:00
Roeland Jago Douma
c515628ebe Legacy OC_SubAdmin is now just a wrapper 2015-10-21 11:32:38 +02:00
Roeland Jago Douma
0e9ab13943 New \OC\SubAdmin class 
* DI
* Tests
* moved OC_SubAdmin to legacy
* Added to private OC\GroupManager
 2015-10-21 11:32:38 +02:00
Thomas Müller
d8276af301 Install new shipped apps on upgrade -fixes #19925 2015-10-21 11:14:12 +02:00
Vincent Petry
89e3860e1a Disable app icon preview in apps page for IE 
All IE versions are not able to properly upscale SVG icons unless the
said SVG files contain a "viewBox" attribute, which is not always the
case. Also we cannot guarantee that all third party apps will have this
attribute in their icons.

So for now, app icons will not be displayed in IE instead of broken
ones.
 2015-10-21 10:50:06 +02:00
Thomas Müller
d0aeb268d6 Merge pull request #19883 from owncloud/provide-iappcontainer 
Provide IAppContainer as dependency injection
 2015-10-21 10:49:26 +02:00
Joas Schilling
e66e67567f Update - Only add one section for disabled apps 2015-10-21 10:39:56 +02:00
Thomas Müller
cf9b8fc182 Merge pull request #18184 from owncloud/ocs-merge-headers 
Merge headers of ocs results
 2015-10-21 10:36:37 +02:00
Thomas Müller
26836d4c17 Merge pull request #19909 from owncloud/fix-memcached-warning 
Fix memcached/memcache module check
 2015-10-21 09:50:28 +02:00
Thomas Müller
645d27a849 Merge pull request #19892 from owncloud/bump_password_compat_1.0.4 
Bump 3rdparty for password_compat
 2015-10-21 09:46:16 +02:00
Robin Appelman
f39c73c79c add phpdoc 2015-10-21 09:43:30 +02:00
Robin Appelman
cc7bd53d17 Keep shared locks until the end of the request so we can reuse them 2015-10-21 09:43:30 +02:00
Joas Schilling
9200bbeaba Update: state which step we are going to start and warn if it might be slow 2015-10-21 09:17:38 +02:00
Jenkins for ownCloud
74f41349b7 [tx-robot] updated from transifex 2015-10-21 01:56:16 -04:00
Morris Jobke
afafd2f69e Merge pull request #19907 from owncloud/scrutinizer_provisioning_api 
Fix scrutinizer issues in provisioning API
 2015-10-21 00:03:40 +02:00
Robin McCorkell
03dd1386da Fix memcached/memcache module check 2015-10-20 21:45:27 +01:00
Roeland Jago Douma
aeffd51145 Fix scrutinizer issues 
* PHPDoc
* Proper array initialization
 2015-10-20 21:47:37 +02:00
Morris Jobke
a0e479342c Merge pull request #19895 from owncloud/fix-public-pagination 
Fix pagination on public file list
 2015-10-20 17:50:21 +02:00
Robin Appelman
021ed8b2bd adjust tests for new dav classes 2015-10-20 16:22:45 +02:00
Roeland Jago Douma
1e7af887ac Bump 3rdparty for password_compat 2015-10-20 16:18:36 +02:00
Hendrik Leppelsack
480a005b47 fix pagination on public file list 2015-10-20 16:11:10 +02:00
Thomas Müller
122f8d831b Merge pull request #19863 from owncloud/external-storage-wording 
fix wording on external storage checkbox, ref #19858
 2015-10-20 15:21:26 +02:00
Thomas Müller
257ccfa698 Merge pull request #19877 from owncloud/dropbox-fixmetadatacachepaths 
Fix Dropbox metadata cache with trimmed paths
 2015-10-20 15:17:28 +02:00
Thomas Müller
ad08cfbc5f Merge pull request #19748 from owncloud/update-preventclose 
Prevent leaving the DB update page while in progress
 2015-10-20 14:29:31 +02:00
Thomas Müller
60abc2738b Merge pull request #18399 from owncloud/api-getusers-for-subadmins 
enable api getUsers for subadmins
 2015-10-20 14:28:31 +02:00
Thomas Müller
474f34eb6b Merge pull request #19636 from owncloud/share_expire_backgroun 
Add backgroundjob to expire link shares
 2015-10-20 14:27:15 +02:00
Thomas Müller
899165113c Merge pull request #19742 from owncloud/shareinfo_performance 
Do not calculate non essential info
 2015-10-20 14:25:36 +02:00
Robin Appelman
283798a220 remove locking for chunks 2015-10-20 14:15:59 +02:00
Robin Appelman
760335c57d fix locking in tests 2015-10-20 14:15:59 +02:00
Robin Appelman
ddc8749814 Adjust for wide locking 2015-10-20 14:14:56 +02:00
Robin Appelman
21d02673be Add tests for uploading to locked files 2015-10-20 14:14:56 +02:00
Robin Appelman
23eaf27a5b locking for chunked dav upload 2015-10-20 14:14:56 +02:00
Thomas Müller
1a84c8e9d2 Merge pull request #19884 from owncloud/locking_exception 
catch all exception if table doesn't exists
 2015-10-20 13:44:00 +02:00
Vincent Petry
1e64968ff7 Allow leaving update page when errors occurred 2015-10-20 13:29:44 +02:00
Vincent Petry
06ddd40886 Prevent leaving the DB update page while in progress 2015-10-20 13:28:48 +02:00
Sergio Bertolin
488728a0fa Added more tests and fixed a problem with asort which was returning false positives 2015-10-20 12:49:51 +02:00