Commit Graph

25909 Commits

Author SHA1 Message Date
Jenkins for ownCloud b757f9c893 [tx-robot] updated from transifex 2015-07-24 01:54:54 -04:00
Bernhard Posselt 582f07950f Merge pull request #17075 from owncloud/bootstrap-tooltip
Replace jQuery tipsy with bootstrap tooltip
2015-07-23 19:25:09 +02:00
Thomas Müller 01b7e306c4 Merge pull request #17827 from owncloud/dont-set-share-password-twice-master-2
Adding error handling in case setting the password fails
2015-07-23 16:34:13 +02:00
Roeland Douma 0e6c4e1902 Merge pull request #17818 from owncloud/fix-password-change-error-always-shows-default-error
assign password change error message to correct object
2015-07-23 16:15:19 +02:00
Thomas Müller d93535b5cb Adding error handling in case setting the password fails 2015-07-23 09:39:26 +02:00
Jenkins for ownCloud 9ccf94ca06 [tx-robot] updated from transifex 2015-07-23 01:55:22 -04:00
Thomas Müller 2d1f7705e1 Merge pull request #17815 from owncloud/update-blueimp-md5
Update blueimp-md5 to 1.1.0
2015-07-22 22:49:45 +02:00
michag86 3841bb1c07 assign error message to correct object
fix for  #17817
2015-07-22 18:42:46 +02:00
Björn Schießle f137f1a049 Merge pull request #17807 from owncloud/improve_apps_template
make sure that there is a space between user- and admin-documentation
2015-07-22 18:38:11 +02:00
Morris Jobke 296ed4c276 Merge pull request #17413 from owncloud/public-api-querybuilder
Add public api for Doctrine QueryBuilder and ExpressionBuilder
2015-07-22 17:29:08 +02:00
Morris Jobke 640d55cc2a Update blueimp-md5 to 1.1.0
Yes this is pretty empty, but it's the truth:

https://github.com/blueimp/JavaScript-MD5/compare/1.0.3...1.1.0
2015-07-22 16:17:56 +02:00
Robin McCorkell 145ab3a28d Merge pull request #17806 from owncloud/enc_improved_app_description
improved app description for the default encryption module
2015-07-22 15:06:08 +01:00
Jan-Christoph Borchardt 780a2ed093 use arrow to indicate external link, use correct quotes and capitalization 2015-07-22 14:20:55 +02:00
Bjoern Schiessle 50cbb57065 make sure that there is a space between user- and admin-documentation 2015-07-22 14:02:43 +02:00
Bjoern Schiessle e97c1db728 improved app description and adjust it to the way the new encryption module works 2015-07-22 13:43:46 +02:00
Robin McCorkell 5768b3fe2c Merge pull request #17792 from szepeviktor/master
Fixing line comments and indentation, closes #17781
2015-07-22 10:21:41 +01:00
Roeland Douma d37b8969f4 Merge pull request #17342 from rullzer/test_preview_conditions
Only run some preview unit tets if imagemagick is available
2015-07-22 09:34:31 +02:00
Viktor Szépe 4699a29a70 Fixing line comments and indentation 2015-07-21 22:19:53 +02:00
Joas Schilling 20cd0ae55b Add a log message when the Doctrine Query Builder is retrieved 2015-07-21 15:53:28 +02:00
Joas Schilling f9071ed5b7 Comment out LIMIT 0 case because of the mixed results 2015-07-21 15:25:48 +02:00
Joas Schilling c9564503c2 Fix tests for setFirstResult and setMaxResults on oracle 2015-07-21 15:25:48 +02:00
Joas Schilling 22849238fb Set a limit until doctrine released a version that fixes Sqlite
See https://github.com/doctrine/dbal/pull/782 for more info
2015-07-21 15:25:48 +02:00
Joas Schilling 32cb30cb84 Correctly count the number of items (rowCount is Update/Insert/Delete only) 2015-07-21 15:25:47 +02:00
Joas Schilling 577a7c92e1 Can not test the string, thanks oracle.... 2015-07-21 15:25:47 +02:00
Joas Schilling f77e5f411d Fix existing usages by removing the quotes 2015-07-21 15:25:47 +02:00
Joas Schilling 516f7e8299 Add unit tests and automatic quoting 2015-07-21 15:25:47 +02:00
Joas Schilling de348180ae Use the public interface and our method instead of the doctrine thing 2015-07-21 15:25:47 +02:00
Joas Schilling 1bfb944d51 Add QueryBuilder, ExpressionBuilder and CompositeExpression wrappers 2015-07-21 15:25:47 +02:00
Morris Jobke 2d691c2fb4 Merge pull request #17381 from owncloud/fix_sharing_add_to_group
[sharing] fix addToGroup hook
2015-07-21 13:30:41 +02:00
Joas Schilling a35193c704 Merge pull request #17750 from owncloud/enc_migration_fix_mountpoint_detection
fix system wide mount point detection on migration
2015-07-21 11:06:02 +02:00
Roeland Douma 40170f35f6 Merge pull request #17766 from owncloud/escape-ampersand
Escape ampersand in logout URL
2015-07-21 09:32:16 +02:00
Jenkins for ownCloud 24f12e65ec [tx-robot] updated from transifex 2015-07-21 01:54:52 -04:00
Morris Jobke 5a5c59639b Escape ampersand in logout URL
* fixes #17757
2015-07-21 00:26:30 +02:00
Bernhard Posselt d20e2002a6 Merge pull request #17743 from owncloud/return-proper-statuscodes
Return proper status code in case of a CORS exception
2015-07-20 18:03:25 +02:00
Bjoern Schiessle 570dd17d4f fix mount point detection 2015-07-20 16:00:33 +02:00
Björn Schießle 89d6439445 Merge pull request #17701 from owncloud/fix_repeated_migration
don't move keys if the key where already moved in a previous migration run
2015-07-20 15:12:52 +02:00
Lukas Reschke 7dda86f371 Return proper status code in case of a CORS exception
When returning a 500 statuscode external applications may interpret this as an error instead of handling this more gracefully. This will now make return a 401 thus.

Fixes https://github.com/owncloud/core/issues/17742
2015-07-20 12:54:22 +02:00
blizzz f573659b3a Merge pull request #17723 from owncloud/fix-17631
fix runtime caching in ldap's user manager, fixes #17631
2015-07-20 09:29:15 +02:00
Joas Schilling 0dd1a785fe Merge pull request #16935 from owncloud/allow-app-check-code-for-deprecated-classes
Allow app check code for deprecated classes
2015-07-20 08:39:53 +02:00
Jenkins for ownCloud 83a13c0635 [tx-robot] updated from transifex 2015-07-20 01:54:47 -04:00
Arthur Schiwon b961a29b0c fix indentation. no code changes, whitespace only. 2015-07-20 01:21:52 +02:00
Lukas Reschke 1e4496c1cb Merge pull request #17698 from owncloud/allow-update-of-disabled-apps
Allow upgrade of not enabled apps
2015-07-19 12:14:13 +02:00
Morris Jobke 1e458f186d Merge pull request #17686 from owncloud/fix-occ-config-commands
Fix occ config commands
2015-07-18 10:37:47 +02:00
Thomas Müller bcfa18c0c6 Merge pull request #17725 from owncloud/update-ring-php
Update ringphp to 1.1.0 for PHP 7 compatibility
2015-07-17 23:01:12 +02:00
Lukas Reschke 38bb075bf2 Update ringphp to 1.1.0 for PHP 7 compatibility 2015-07-17 22:59:26 +02:00
Björn Schießle f363fc2d4a Merge pull request #17540 from owncloud/enc_detect_legacy_files2
make sure that we always detect legacy files correctly
2015-07-17 21:42:32 +02:00
Arthur Schiwon 4f910221c4 fix runtime caching in ldap's user manager, fixes #17631 2015-07-17 18:57:56 +02:00
Morris Jobke 37d085901b Merge pull request #17706 from rullzer/external_diricon_filelist
The external directories should get the correct icon in filelist
2015-07-17 16:39:46 +02:00
Bjoern Schiessle 4dba920fdd unit tests 2015-07-17 15:19:10 +02:00
Bjoern Schiessle 3000f0125f don't move keys if the key where already moved in a previous migration run 2015-07-17 15:19:10 +02:00