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

27876 commits

This branch
This branch
All branches
Author SHA1 Message Date
Thomas Müller
dc32bf4594 Merge pull request #19967 from owncloud/assetic_1.3.1 
3rdparty bump for assetic-1.3.1
 2015-10-22 12:21:36 +02:00
Thomas Müller
e471600834 Merge pull request #19890 from owncloud/db-keep-shared-locks 
Keep shared locks until the end of the request so we can reuse them
 2015-10-22 10:43:00 +02:00
Thomas Müller
bbea8c3545 Merge pull request #19937 from owncloud/detailsview-donotopenonrename 
Do not display details bar after rename
 2015-10-22 10:42:15 +02:00
Thomas Müller
56fdb0ac93 Merge pull request #19935 from owncloud/issue-19916-settings-menu-hide-on-file-action 
Use the normal OC.menu JS for handling the Settings menu
 2015-10-22 10:42:02 +02:00
Thomas Müller
8ed0214818 Merge pull request #19931 from owncloud/fix-webui-upload-and-conflicts 
Fix file upload, conflict dialog, also in public link
 2015-10-22 10:41:48 +02:00
Roeland Jago Douma
5436ceff0c 3rdparty bump for assetic-1.3.1 2015-10-22 10:33:25 +02:00
Thomas Müller
ad4ef8d91c Merge pull request #19791 from owncloud/provisioning_api_adding_integration_tests 
Added more tests and fixed a problem with asort which was returning f…
 2015-10-22 10:16:10 +02:00
Thomas Müller
15ef39d5b9 Merge pull request #19952 from owncloud/share-dialogue-tests 
Add JS tests for share dialog
 2015-10-22 09:23:05 +02:00
Thomas Müller
06fdd94060 Merge pull request #19960 from owncloud/bump_pimple_3.0.2 
3rdparty bump for pimple-3.0.2
 2015-10-22 09:11:44 +02:00
Jenkins for ownCloud
c50bbb8cde [tx-robot] updated from transifex 2015-10-22 01:55:47 -04:00
Roeland Jago Douma
77f3c4e08a 3rdparty bump for pimple-3.0.2 2015-10-22 00:05:51 +02:00
Thomas Müller
e1e1f4fd99 Merge pull request #19930 from owncloud/sort_usernames 
[provisioning api] fix failing testcase
 2015-10-21 22:44:00 +02:00
Thomas Müller
b1b1f5debf Merge pull request #19920 from owncloud/pear-core-minimal-1.0.1 
3rdparty bump of pear-core-minimal
 2015-10-21 21:08:44 +02:00
Thomas Müller
e0516c215c Merge pull request #19954 from owncloud/remote-unrequired-dependencies 
Use IRequest's `getScriptName` functionality instead of $_SERVER
 2015-10-21 20:51:22 +02:00
Thomas Müller
0245cfb9d2 Merge pull request #19953 from owncloud/DeepDiver1975-patch-1 
Delete indie.json
 2015-10-21 20:26:13 +02:00
Roeland Jago Douma
9b64fa7b92 [provisioning api] losen test 
Since we have no control of how backends sort their list of users and we
also don't want to sort yet another time the test now just checks if the
correct number of elements is returned and if they are from the list of
group members.
 2015-10-21 20:05:14 +02:00
Lukas Reschke
23e22c52b0 Use IRequest's getScriptName functionality instead of $_SERVER['SCRIPT_NAME'] 2015-10-21 17:33:49 +02:00
Lukas Reschke
8133d46620 Remove dependency on ICrypto + use XOR 2015-10-21 17:33:41 +02:00
Thomas Müller
06c037f096 Delete indie.json 2015-10-21 17:31:22 +02:00
Tom Needham
e3ae453ee5 Fix line lengths in share dialog unit tests 2015-10-21 13:30:42 +00:00
Thomas Müller
f7f2a160dd Merge pull request #19918 from owncloud/send-begin-message 
Update: state which step we are going to start and warn if it might b…
 2015-10-21 14:52:19 +02:00
Tom Needham
8a6d22d751 Add JS tests for share autocompletion handling 2015-10-21 12:46:08 +00:00
Thomas Müller
f3e208a5a7 Merge pull request #19934 from owncloud/doclinks-9.0 
Update doc links in README for 9.0
 2015-10-21 14:43:56 +02:00
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