summaryrefslogtreecommitdiffstats
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
* Rebuild app navigation in JSRobin McCorkell2015-09-051-23/+0
| | | | | | Retrieve all app navigations to prevent reloading appinfo/app.php and causing an error when the app isn't fully loaded. The addition/deletion logic has been moved to JS, simplifying a lot of code.
* Merge pull request #18833 from owncloud/share-prevent-twiceMorris Jobke2015-09-041-0/+12
|\ | | | | Prevent sharing twice with user when already a group
| * Prevent sharing twice with user when already a groupVincent Petry2015-09-041-0/+12
| |
* | Merge pull request #18794 from individual-it/reuse_systemConfigIndividual IT Services2015-09-041-1/+1
|\ \ | | | | | | reuse existing $systemConfig variable
| * | reuse existing $systemConfig variableIndividual IT Services2015-09-031-1/+1
| | |
* | | [tx-robot] updated from transifexJenkins for ownCloud2015-09-042-0/+2
| | |
* | | Merge pull request #18799 from owncloud/appconfig-with-one-requestMorris Jobke2015-09-031-110/+109
|\ \ \ | | | | | | | | Only query the appconfig once per request
| * | | Make sure the array existsJoas Schilling2015-09-031-0/+8
| | | |
| * | | Only query the appconfig onceJoas Schilling2015-09-031-111/+102
| | | |
* | | | Merge pull request #18810 from owncloud/shared-mount-delay-setupVincent Petry2015-09-031-0/+2
|\ \ \ \ | | | | | | | | | | Delay setting up the filesystem for a share owner untill the share is used
| * | | | setup owner when getting users for shareRobin Appelman2015-09-031-0/+2
| | |_|/ | |/| |
* / | | Proper details about git submodule updateMorris Jobke2015-09-031-1/+1
|/ / / | | | | | | | | | * fixes #18801
* | | Merge pull request #18777 from owncloud/locking-defaultMorris Jobke2015-09-031-4/+4
|\ \ \ | | | | | | | | enable transational locking by default
| * | | enable transational locking by defaultRobin Appelman2015-09-021-4/+4
| | | |
* | | | Encode HTML tags in JSONLukas Reschke2015-09-032-2/+2
| | | | | | | | | | | | | | | | While not encoding the HTML tags in the JSON response is perfectly fine since we set the proper mimetype as well as disable content sniffing a lot of automated code scanner do report this as security bug. Encoding them leads to less discussions and a lot of saved time.
* | | | Revert "Soft fail when deleting and no entry found"Joas Schilling2015-09-021-4/+0
|/ / /
* / / Soft fail when deleting and no entry foundRobin McCorkell2015-09-021-0/+4
|/ /
* | Allow creating previewss that cover the specified dimensionsRobin Appelman2015-09-021-6/+68
| |
* | Merge pull request #18744 from owncloud/fix-ocs-routerMorris Jobke2015-09-021-2/+3
|\ \ | |/ |/| Delay adding OCS prefix to route collection until all is loaded
| * Delay adding OCS prefix to route collection until all is loadedRobin McCorkell2015-09-011-2/+3
| | | | | | | | | | ->addPrefix() iterates over all registered routes, so must be run after all apps have had a chance to load their OCS routes.
* | [tx-robot] updated from transifexJenkins for ownCloud2015-09-012-0/+2
| |
* | Merge pull request #18743 from owncloud/autoloader-check-log-pathRobin Appelman2015-09-011-1/+1
|\ \ | |/ |/| Show the path as part of the exception for not allowed autoloading paths
| * Show the path as part of the exception for not allowed autoloading pathsRobin Appelman2015-09-011-1/+1
| |
* | Merge pull request #18730 from owncloud/appframework_proper_304Vincent Petry2015-09-011-1/+1
|\ \ | |/ |/| Properly return 304 in AppFramework
| * Properly return 304Roeland Jago Douma2015-09-011-1/+1
| | | | | | | | | | | | | | | | The ETag set in the IF_NONE_MODIFIED header is wraped in quotes ("). However the ETag that is set in response is not (yet). Also we need to cast the ETag to a string. * Added unit test
* | verify the path in the autoloaderRobin Appelman2015-09-012-5/+47
| |
* | Merge pull request #18635 from ↵Vincent Petry2015-08-311-1/+13
|\ \ | |/ |/| | | | | owncloud/stickify-files-and-sharing-notification-types Sticky the notification types of files and sharing
| * Sticky the notification types of files and sharingJoas Schilling2015-08-281-1/+13
| |
* | Merge pull request #17899 from owncloud/enc_make_key_storage_root_configurableVincent Petry2015-08-316-30/+133
|\ \ | | | | | | Make root of key storage configurable
| * | don't read certificates if ownCloud is not installedBjoern Schiessle2015-08-303-3/+17
| | |
| * | make system root of key storage configurableBjoern Schiessle2015-08-304-29/+118
| | |
* | | Merge pull request #18691 from owncloud/request-no-readMorris Jobke2015-08-311-34/+49
|\ \ \ | | | | | | | | Decode request content only on getContent
| * | | Decode request content only on getContentRobin McCorkell2015-08-311-34/+49
| | |/ | |/|
* | | Merge pull request #10149 from owncloud/storage-wrapper-checkMorris Jobke2015-08-301-0/+3
|\ \ \ | |_|/ |/| | Check result of storage wrappers
| * | Check result of storage wrappersRobin Appelman2015-08-301-0/+3
| | |
* | | Merge pull request #18651 from owncloud/ocs_share_create_with_expireVincent Petry2015-08-301-0/+15
|\ \ \ | |/ / |/| | Allow to directly set the expireDate on a new (link)share
| * | Actually validate the expire date on shareRoeland Jago Douma2015-08-301-0/+15
| |/ | | | | | | * Added more intergration tests
* | Merge pull request #18620 from owncloud/add-public-interface-for-factoryVincent Petry2015-08-295-17/+63
|\ \ | | | | | | Add a public interface for the language factory so apps can use it
| * | Add since tagJoas Schilling2015-08-281-0/+4
| | |
| * | Deprecate OC_L10N::get()Joas Schilling2015-08-282-7/+4
| | |
| * | Add a public interface for the language factory so apps can use itJoas Schilling2015-08-273-10/+55
| | |
* | | Merge pull request #18511 from owncloud/downgrad-sharing-error-logs-to-debugJoas Schilling2015-08-281-22/+22
|\ \ \ | | | | | | | | Change log level of debugging logs to debug
| * | | Change log level of debugging logs to debugJoas Schilling2015-08-241-22/+22
| | | |
* | | | Merge pull request #18423 from owncloud/occ_encrypt_allBjörn Schießle2015-08-282-29/+27
|\ \ \ \ | |_|_|/ |/| | | occ command line tool to encrypt all files
| * | | copy always file by file to encrypt/decrypt it if neededBjoern Schiessle2015-08-261-29/+15
| | | |
| * | | occ tool to encrypt all filesBjoern Schiessle2015-08-261-0/+12
| | | |
* | | | [tx-robot] updated from transifexJenkins for ownCloud2015-08-286-2/+6
| | | |
* | | | [tx-robot] updated from transifexJenkins for ownCloud2015-08-276-0/+6
| | | |
* | | | Remove last occurence of `forcessl`Lukas Reschke2015-08-261-2/+2
| | | | | | | | | | | | | | | | This shoudl have been adjusted as well, now it's consistent with `setMagicInCookie`. While it does not have a security impact directly some automated scanners reported this all the time.
* | | | Remove languages which are no longer maintained on transifexThomas Müller2015-08-2634-342/+0
| |_|/ |/| |