Commit Graph

27892 Commits

Author SHA1 Message Date
Robin McCorkell 4ac33ab26b Remove status indicator on modification 2015-10-23 15:25:07 +02:00
Thomas Müller 7afbf0f8c1 Merge pull request #19977 from owncloud/provisioning_api_integration_tests_apps_new_getusers
Provisioning api integration tests added app tests and getusers by a subadmin
2015-10-23 15:11:27 +02:00
Thomas Müller 3d08964b64 Merge pull request #19957 from owncloud/volter-master
Expose syslog tag in the configuration
2015-10-23 14:35:28 +02:00
Steffen Lindner 7bbf586b9b Add syslog_tag docu to sample config 2015-10-23 13:43:41 +02:00
Thomas Müller e8b12a3c2c Merge pull request #19970 from owncloud/encryption-getuidonboolean
Fix "Call to a member function getUID() on boolean" in Crypt
2015-10-23 12:56:14 +02:00
Thomas Müller db48a937cf Merge pull request #19990 from owncloud/stay-logged-in-wording
change wording from 'remember' to more understandable 'Stay logged in'
2015-10-23 10:49:51 +02:00
Jenkins for ownCloud a341e786dd [tx-robot] updated from transifex 2015-10-23 01:55:06 -04:00
Jan-Christoph Borchardt aed9b2a626 change wording from 'remember' to more understandable 'Stay logged in' 2015-10-23 10:44:41 +13:00
Thomas Müller 7b5db9085d Merge pull request #19980 from owncloud/fix-deleted-ldap-user-sharing
handle NoUserException in sharing code
2015-10-22 17:53:15 +02:00
Volker Fröhlich 711e1235ea Expose syslog tag in the configuration 2015-10-22 17:42:55 +02:00
Thomas Müller 844c607a9a Merge pull request #19973 from owncloud/pear_archive_tar-1.4.1
Bump 3rdparty for pear/archive_tar-1.4.1
2015-10-22 17:42:02 +02:00
Morris Jobke db25f41da8 handle NoUserException in sharing code
* setup LDAP users
* share from an LDAP user
* delete that LDAP user
* log in as share recipient
* before: unhandled NoUserException
* after: NoUserEception is logged and share is not shown anymore
2015-10-22 17:04:36 +02:00
Sergio Bertolin 64ea35af05 added tests for apps 2015-10-22 13:28:48 +00:00
Sergio Bertolin 5e9dc381b4 added test for getting users of a group being subadmin 2015-10-22 12:15:51 +00:00
Roeland Jago Douma ac41d3d74d Bump 3rdparty for pear/archive_tar-1.4.1 2015-10-22 12:54:07 +02:00
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
Joas Schilling e0a56317fa Fix "Call to a member function getUID() on boolean" in Crypt 2015-10-22 11:46:37 +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