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

26127 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Bernhard Posselt
546cd39217 condense doc warnings into small section that gets showed to the user before enabling encryption 
remove share warning

remove app and just write it out as feature

adjust warnings

reframe storage issue

fix typo
 2015-07-22 21:59:31 +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
Morris Jobke
e0455d77c2 update moment.js to 2.10.3 2015-07-22 16:10:40 +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
Joas Schilling
1dac78644a Update sabre-dav to 2.1.6 2015-07-22 12:28:03 +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
Morris Jobke
009d1f3214 move updateFileActionSpinner to OCA.Files.FileActions 2015-07-22 10:35:15 +02: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
Robin McCorkell
75a5e6e12b Fix mounting wrapped storages resulting in many-layered wrapping 
This usually doesn't cause issues, but in unit tests sometimes a wrapped
storage is passed to Filesystem::mount() and gets rewrapped, hitting the
XDebug function nesting level limit when used.
 2015-07-20 16:27:26 +01:00
Robin McCorkell
df19cabb44 Store storage availability in database 
Storage status is saved in the database. Failed storages are rechecked every
10 minutes, while working storages are rechecked every request.

Using the files_external app will recheck all external storages when the
settings page is viewed, or whenever an external storage is saved.
 2015-07-20 16:27:26 +01: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
Bernhard Posselt
a4e3939204 add registerAlias method to shorcut interface registration 
remove unused import

add since tag

fix typo
 2015-07-18 13:43:54 +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