Commit Graph

21780 Commits

Author SHA1 Message Date
Morris Jobke bf9d4d425d update 3rdparty submodule 2014-12-10 22:36:20 +01:00
Morris Jobke 44aa94be3d Merge pull request #12742 from owncloud/fix-pear.php
Update 3rdparty to add PEAR.php back
2014-12-10 22:35:04 +01:00
Lukas Reschke 39b4888109 Merge pull request #12761 from owncloud/error-details2
improve update error page: remove box, make link visible, insert missing space, remove line break
2014-12-10 19:52:22 +01:00
Morris Jobke e2c51308df Merge pull request #12758 from owncloud/fix-config-doc-block
Add type of the variables to the docs
2014-12-10 17:22:36 +01:00
Thomas Müller 6143232da6 Merge pull request #12746 from owncloud/skip-longpath-test-again
skip testLongPath()
2014-12-10 17:22:04 +01:00
Thomas Müller 80ae311329 Merge pull request #11892 from owncloud/remove_triggerupdate
Remove triggerupdate.php & add quiet option for CLI scanner
2014-12-10 16:17:29 +01:00
Joas Schilling bef7392c4c Add type of the variables to the docs 2014-12-10 15:18:06 +01:00
Robin Appelman 3898fbc0d2 Merge pull request #12750 from owncloud/cache-numericstorageidfix
Fix numeric storage id for cache wrapper
2014-12-10 15:03:41 +01:00
Joas Schilling fd2599cfc2 Merge pull request #12485 from owncloud/jenkins-12383
New DateTimeFormatter class for dates in other timezones and languages
2014-12-10 14:48:59 +01:00
Jan-Christoph Borchardt 880e653aef improve update error page: adjust line height of h2 2014-12-10 13:39:30 +01:00
Jan-Christoph Borchardt 5c36b0bf5d improve update error page: remove box, make link visible, insert missing space, remove line break 2014-12-10 13:30:28 +01:00
Vincent Petry ebba54d490 Fix numeric storage id for cache wrapper 2014-12-10 13:05:31 +01:00
Lukas Reschke 269ae49c1c Merge pull request #12611 from owncloud/use-uid-instead-of-loginname
Use UID instead of login name
2014-12-10 12:26:22 +01:00
Thomas Müller d648b548eb skip testLongPath() 2014-12-10 12:20:30 +01:00
Joas Schilling 67335ccddf Require the interface and return a string instead of private classes 2014-12-10 11:58:56 +01:00
Joas Schilling 4d232e536e Deprecate Util::formatDate()
Make DateTimeFormatter a service and adjust tests that have been inaccurate
2014-12-10 11:58:56 +01:00
Lukas Reschke 5398bbdc00 Merge pull request #12711 from owncloud/add-backend-to-rest-index
Expose backend type via REST API
2014-12-10 11:56:45 +01:00
Thomas Müller dd4ef58297 Merge pull request #12737 from owncloud/fix-missing-nl-phpstorm
Add newline that was removed by 15be763d46
2014-12-10 11:54:29 +01:00
Thomas Müller dbb50ce9e5 Update 3rdparty to add PEAR.php back 2014-12-10 11:29:44 +01:00
Jörn Friedrich Dreyer 0f17486c1d make path absolute 2014-12-10 11:04:17 +01:00
Joas Schilling 2accc24fa9 Add newline that was removed by 15be763d46 2014-12-10 09:38:32 +01:00
Morris Jobke e3de51078d Merge pull request #12090 from AdamWill/google-rename-delete
google: delete original after successful rename
2014-12-10 09:10:17 +01:00
Morris Jobke 3026cdbc80 Merge pull request #12549 from owncloud/shared-cache-non-existing
Dont return cached date in shared cache when the file doesn't exist
2014-12-10 08:49:40 +01:00
Jenkins for ownCloud ea95bb0189 [tx-robot] updated from transifex 2014-12-10 01:55:34 -05:00
Thomas Müller 7028c7150d Merge pull request #12664 from owncloud/fix-12164
Use httphelper and cache response even when it is empty
2014-12-10 05:42:08 +01:00
Victor Dubiniuk adab0ca98a Remove leftover 2014-12-10 02:21:10 +03:00
Victor Dubiniuk c9fd3c9d29 Inject config 2014-12-10 01:13:38 +03:00
Morris Jobke 263e008d7b Merge pull request #12695 from owncloud/db-drop-table
Add dropTable to IDBConnection
2014-12-09 18:40:56 +01:00
Robin Appelman 6984fa8a19 Quote identifiers for oracle 2014-12-09 17:26:53 +01:00
Robin Appelman b66c0a1631 add unit tests for tableExists and dropTable 2014-12-09 17:26:53 +01:00
Robin Appelman 778d8dbafd Add tableExists to public db api 2014-12-09 17:26:53 +01:00
Robin Appelman 8af3991d0c Add dropTable to IDBConnection 2014-12-09 17:26:53 +01:00
Thomas Müller d4b3c50f7d Merge pull request #12724 from owncloud/fix-autotest-no-file
Fix autotest no file
2014-12-09 17:01:00 +01:00
Joas Schilling 0242c5c2d1 Correctly run all tests again when no file is specified 2014-12-09 16:36:41 +01:00
Joas Schilling 681caf882a Add sometests and copy tests from Util::formatDate to new class 2014-12-09 16:10:24 +01:00
Joas Schilling d69ea30097 Add a DateTimeFormatter class which allows overwriting the language and timezone
Fix #12227
2014-12-09 16:10:24 +01:00
Morris Jobke bfcd5a3802 Merge pull request #11214 from owncloud/issue/10836
Add an option to disallow sending sharing emails to non-owncloud users
2014-12-09 14:05:52 +01:00
Joas Schilling f53f25eafe Merge pull request #12409 from owncloud/tags-getTagsForObjectIds
Add getTagsForObjects in ITags
2014-12-09 13:27:38 +01:00
Thomas Müller 1a16238d5d Merge pull request #12722 from owncloud/autocomplete-for-autotest-jenkins
Allow autocomplete for test file in autotest.sh
2014-12-09 13:11:00 +01:00
Joas Schilling 26861a98c5 Merge pull request #12568 from owncloud/autoload-encryption-classes
Fix namespaces of encryption classes and encryption tests
2014-12-09 12:56:57 +01:00
Lukas Reschke 7a290a3d6b Make class compatible 2014-12-09 12:25:22 +01:00
Lukas Reschke 4c13918bd8 Expose backend type via REST API
This change will expose the user backend via the REST API which is a pre-requisite for https://github.com/owncloud/core/issues/12620.

For example:
````json
[{"name":"9707A09E-CA9A-4ABE-A66A-3F632F16C409","displayname":"Document Conversion User Account","groups":[],"subadmin":[],"quota":"default","storageLocation":"\/Users\/lreschke\/Programming\/core\/data\/9707A09E-CA9A-4ABE-A66A-3F632F16C409","lastLogin":0,"backend":"OCA\\user_ldap\\USER_LDAP"},{"name":"ED86733E-745C-4E4D-90CB-278A9737DB3C","displayname":"Hacker","groups":[],"subadmin":[],"quota":"default","storageLocation":"\/Users\/lreschke\/Programming\/core\/data\/ED86733E-745C-4E4D-90CB-278A9737DB3C","lastLogin":0,"backend":"OCA\\user_ldap\\USER_LDAP"},{"name":"71CDF45B-E125-450D-983C-D9192F36EC88","displayname":"admin","groups":[],"subadmin":[],"quota":"default","storageLocation":"\/Users\/lreschke\/Programming\/core\/data\/71CDF45B-E125-450D-983C-D9192F36EC88","lastLogin":0,"backend":"OCA\\user_ldap\\USER_LDAP"},{"name":"admin","displayname":"admin","groups":["admin"],"subadmin":[],"quota":"default","storageLocation":"\/Users\/lreschke\/Programming\/core\/data\/admin","lastLogin":"1418057287","backend":"OC_User_Database"},{"name":"test","displayname":"test","groups":[],"subadmin":[],"quota":"default","storageLocation":"\/Users\/lreschke\/Programming\/core\/data\/test","lastLogin":0,"backend":"OC_User_Database"}]
```
2014-12-09 12:04:19 +01:00
Joas Schilling 532bcf40b3 Allow autocomplete for test file in autotest.sh 2014-12-09 11:36:35 +01:00
Joas Schilling 539c0aeb04 Add an option to disallow sending sharing emails to non-owncloud users
Fix #10836
2014-12-09 11:32:39 +01:00
Thomas Müller e61f24f2aa Merge pull request #12651 from owncloud/add-requesttoken-to-base-template
Add requesttoken to base template
2014-12-09 11:03:46 +01:00
Thomas Müller 5609d421cd Merge pull request #12672 from LEDfan/cm-per-unit
Fix Contactsmanager permission + unit test
2014-12-09 10:57:22 +01:00
Thomas Müller 9ca8b864e2 Merge pull request #12708 from owncloud/l10nsaved
translated saved message in files external
2014-12-09 10:46:35 +01:00
Lukas Reschke 17f85ec5a9 Merge pull request #12688 from owncloud/rename-alt
introduce alt text for rename icon - fixes #12067
2014-12-09 10:37:33 +01:00
Lukas Reschke 3566edbcec Merge pull request #12715 from owncloud/fix-broken-personal-page
remove duplicate loaded personal.js - fixes #12674
2014-12-09 10:35:08 +01:00
Morris Jobke 4d2573bff7 Merge pull request #12709 from owncloud/fix-11955
Skip headers that can not be split
2014-12-09 09:52:59 +01:00