Commit Graph

23401 Commits

Author SHA1 Message Date
Joas Schilling 6039523cd6 Revert "Incorporate review changes"
This reverts commit f6a452cabf.
2015-02-13 15:15:10 +01:00
Robin Appelman 6ecfcde954 update test 2015-02-13 15:01:05 +01:00
Robin Appelman 134243d3e5 Dont lower the mtime of a folder when propagating changes 2015-02-13 14:30:05 +01:00
Lukas Reschke 4032c7b685 This is an array 2015-02-13 14:23:22 +01:00
Morris Jobke 1393563965 Merge pull request #14178 from RealRancor/fix_config_sample
Removed anchor in config.sample.php
2015-02-13 13:38:56 +01:00
Joas Schilling d20a8fae45 Move displaying of files related activities to files app 2015-02-13 13:37:10 +01:00
Lukas Reschke a7df23ceba Manually type-case all AJAX files
This enforces proper types on POST and GET arguments where I considered it sensible. I didn't update some as I don't know what kind of values they would support 🙈

Fixes https://github.com/owncloud/core/issues/14196 for core
2015-02-13 13:33:20 +01:00
Lukas Reschke 276bfe5f33 Merge pull request #14197 from owncloud/ensure-that-passed-file-path-is-always-a-string
Ensure that passed argument is always a string
2015-02-13 13:30:54 +01:00
Joas Schilling 12fc625885 Fix test with the invalid filter check being added 2015-02-13 13:08:57 +01:00
Roeland Jago Douma 9a6da8e6e2 Extended avatar unit tests 2015-02-13 12:57:24 +01:00
Lukas Reschke 95860d8113 Merge pull request #14086 from hlop/master
App install behind a Proxy
2015-02-13 12:56:01 +01:00
Lukas Reschke 9904b30070 Ensure that passed argument is always a string
Some code paths called the `normalizePath` functionality with types other than a string which resulted in unexpected behaviour.

Thus the function is now manually casting the type to a string and I corrected the usage in list.php as well.
2015-02-13 12:49:34 +01:00
Roeland Jago Douma 90218dcd4c Added config check 2015-02-13 12:17:22 +01:00
Lukas Reschke 025110821f URLEncode logout attribute
Otherwise logout can fail if the requesttoken contains a +
2015-02-13 12:08:23 +01:00
Joas Schilling 6c349c00bb Order methods to by grouped by their task 2015-02-13 11:55:06 +01:00
Joas Schilling be63e18b0a Check whether filter is valid, before doing stuff for it 2015-02-13 11:50:55 +01:00
Joas Schilling c02de748e5 Cache some values from the extensions 2015-02-13 11:36:34 +01:00
Joas Schilling b768a70616 Use filterNotificationTypes to filter the types and group the methods 2015-02-13 11:30:36 +01:00
Joas Schilling 9ccfbc14f6 Copy sharing related activity code to Files_Sharing activity extension 2015-02-13 11:16:43 +01:00
Joas Schilling 51f8d240c1 Merge pull request #14171 from owncloud/fix/11639
Improve: Index for file_map
2015-02-13 10:55:21 +01:00
Jenkins for ownCloud 6b1ed4d688 [tx-robot] updated from transifex 2015-02-13 01:55:06 -05:00
RealRancor 840ad708d6 Removed anchor in config.sample.php 2015-02-12 22:00:24 +01:00
Lukas Reschke f6a452cabf Incorporate review changes 2015-02-12 19:14:54 +01:00
windaishi c9b5608405 Improve: Index for file_map
Added two indices for file_map, that improve syncing and uploading and deleting files
2015-02-12 19:12:08 +01:00
Lukas Reschke dfcd4acd5a Merge pull request #13771 from owncloud/fix-humanfileSize
generate valid human readable text for 0
2015-02-12 18:34:54 +01:00
Lukas Reschke bd5440a8a3 Merge pull request #13780 from owncloud/cmreflector-inheritance
Additional controllermethodreflector inheritance tests
2015-02-12 18:34:07 +01:00
Lukas Reschke 8e8acad550 Merge pull request #14145 from owncloud/no-whitespace-from-themes-master
catch any whitespaces which might get written to the output buffer while...
2015-02-12 17:23:28 +01:00
Thomas Müller 738fcdafbe Merge pull request #14159 from owncloud/remove-internal
Remove internal annotation
2015-02-12 17:07:59 +01:00
Roeland Jago Douma ecb7d44775 Small unit test rewrite 2015-02-12 17:05:59 +01:00
Roeland Jago Douma e952687dcd Added unit test 2015-02-12 16:50:14 +01:00
Roeland Jago Douma 47b96c9fa1 Added dependancy for the JS unit tests
Still not correct but it is a small step
2015-02-12 16:50:14 +01:00
Roeland Jago Douma 639a634cfd Display user avatar in share dialog 2015-02-12 16:50:14 +01:00
Thomas Müller fc7f279d90 catch any whitespaces which might get written to the output buffer while loading a theme 2015-02-12 16:42:17 +01:00
Lukas Reschke 2f80be45b0 Remove internal annotation
PHPStorm complained about those functions being declared as Internal. I doubt that this is actually the case since they are even in the public API.
2015-02-12 16:35:47 +01:00
Morris Jobke c751ba0409 Merge pull request #14121 from Zillode/app-favicon
Disable application-specific favicons for non-user pages
2015-02-12 13:19:07 +01:00
Lukas Reschke 4142267a02 Merge pull request #9038 from owncloud/add_tag_file
Add .tag file to make tar balls tracable
2015-02-12 13:17:45 +01:00
Björn Schießle 780024e252 Merge pull request #14071 from owncloud/add_timeout_for_post_requests
add timeout to curl request
2015-02-12 11:38:35 +01:00
Lukas Reschke b68c376e8e Merge pull request #13913 from rullzer/showusergroups
Added overview of groups a user is member of
2015-02-12 11:21:40 +01:00
Morris Jobke 0b38a48bb4 Merge pull request #14135 from cmeh/master
Clean-up of messages (orthography, format)
2015-02-12 11:03:49 +01:00
Morris Jobke f4182d2dc9 Merge pull request #10993 from owncloud/scanner-reuse-fileid
Reuse known fileids and cache data in the scanner
2015-02-12 10:53:00 +01:00
Bjoern Schiessle 4155252379 add timeout to curl request 2015-02-12 10:51:39 +01:00
Roeland Jago Douma 7a8f95be2f Added overview of groups a user is a member of 2015-02-12 10:49:55 +01:00
Morris Jobke 4b2d80a34b add fix for checkmark icon for IE8 2015-02-12 10:31:55 +01:00
Morris Jobke a496c34aea Check if imageflip is available
* imageflip() isn't available in PHP < 5.5
* fixes #14130
2015-02-12 10:21:20 +01:00
Morris Jobke 64216971d4 Merge pull request #14129 from owncloud/deprecate-oc-json
Deprecate `OC_JSON` and `OCP\JSON`
2015-02-12 10:05:30 +01:00
cmeh f24f7f7c74 Orthography: "Back-end" -> Backend (without hyphen) and correction of "users" to the genitive "user's" 2015-02-12 08:18:24 +01:00
cmeh 01f89083ba Adding a missing space between value and unit
Added the missing space between value and unit, as it is formatted in all other places across ownCloud.
2015-02-12 08:14:12 +01:00
Jenkins for ownCloud e929d43bb6 [tx-robot] updated from transifex 2015-02-12 01:54:41 -05:00
Lukas Reschke 86139fcce8 Deprecate `OC_JSON` and `OCP\JSON`
This deprecates – but not removes – those two classes and all functions in it. There is no reason that new developments should use those methods as with the AppFramework there is a replacement that allows testable code.

With the `@deprecated` annotation IDEs like PHPStorm will point out to the developer that a functionality is deprecated and that there is a better suited replacement.
2015-02-12 00:56:13 +01:00
Lukas Reschke 2c899f1d43 Merge pull request #14126 from owncloud/remove-that-old-thing
Remove unused file
2015-02-11 23:59:00 +01:00