summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Prevent referer from being sentLukas Reschke2015-09-093-0/+3
| | | | Nice hardening for enhanced privacy. Especially useful when using embedded viewers such as files_pdfviewer.
* Merge pull request #18873 from owncloud/enc_use_master_passwordLukas Reschke2015-09-0910-27/+472
|\ | | | | Allow admin to use a master key for all files
| * occ command to enable master keyBjoern Schiessle2015-09-083-0/+196
| |
| * enable usage of a master keyBjoern Schiessle2015-09-077-27/+276
| |
* | Merge pull request #18931 from owncloud/fix-files_sharing-breakageLukas Reschke2015-09-091-9/+11
|\ \ | | | | | | Check if files_sharing is actually enabled before using it
| * | Check if files_sharing is actually enabled before using itRobin McCorkell2015-09-091-9/+11
| | |
* | | Merge pull request #18925 from owncloud/change-risky-testMorris Jobke2015-09-091-2/+2
|\ \ \ | |/ / |/| | Rename data provider to avoid risky test warning
| * | Rename data provider to avoid risky test warningLukas Reschke2015-09-091-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | ``` 06:49:56 There was 1 risky test: 06:49:56 06:49:56 1) OC\AppFramework\Http\JSONResponseTest::testRenderProvider 06:49:56 This test did not perform any assertions ```
* | | Merge pull request #18913 from owncloud/put-in-single-field-for-speedLukas Reschke2015-09-094-35/+52
|\ \ \ | |/ / |/| | Put session data in single field for speed
| * | Write to session in batch at the end of the requestLukas Reschke2015-09-093-17/+22
| | |
| * | Write session data to single keyLukas Reschke2015-09-092-20/+34
| | | | | | | | | | | | This prevents decrypting values multiple times.
| * | Use md5 over the version file to prevent cyclyc dependencyLukas Reschke2015-09-091-3/+1
|/ /
* | Merge pull request #18684 from owncloud/explicit-upgrade-versionMorris Jobke2015-09-094-25/+94
|\ \ | | | | | | Explicit upgrade version + prevent downgrades
| * | Improved update version detection logicVincent Petry2015-08-311-7/+1
| | |
| * | Simplify comparison algoVincent Petry2015-08-311-15/+1
| | |
| * | Throw exception on downgrade attemptVincent Petry2015-08-301-1/+5
| | |
| * | Restrict upgrades to explicit allowed versionVincent Petry2015-08-303-20/+105
| | | | | | | | | | | | | | | | | | version.php now contains the previous ownCloud version from which upgrades are allowed. Any other upgrades will show a message that the upgrade/downgrade is not supported.
* | | Merge pull request #18908 from owncloud/allow-0-as-passwordBjörn Schießle2015-09-091-1/+1
|\ \ \ | | | | | | | | Allow 0 and false as password
| * | | Allow 0 and false as passwordLukas Reschke2015-09-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | When we use the check for "empty" here passwords such as 0 will not work. Fixes https://github.com/owncloud/password_policy/issues/8
* | | | [tx-robot] updated from transifexJenkins for ownCloud2015-09-0930-0/+50
| | | |
* | | | Merge pull request #18914 from owncloud/generate-requesttoken-only-onceLukas Reschke2015-09-081-1/+8
|\ \ \ \ | |/ / / |/| | | Cache generated result
| * | | Cache generated resultLukas Reschke2015-09-081-1/+8
|/ / / | | | | | | | | | Saves 50ms
* | | Merge pull request #18881 from owncloud/kill-sendfileMorris Jobke2015-09-081-57/+1
|\ \ \ | | | | | | | | Remove XSendFile support
| * | | Remove XSendFile supportLukas Reschke2015-09-071-57/+1
| | | | | | | | | | | | | | | | Required to ensure proper locking
* | | | Merge pull request #18882 from owncloud/load-all-apps-testsLukas Reschke2015-09-081-3/+2
|\ \ \ \ | | | | | | | | | | Load all enabled apps in test bootstrap
| * | | | Load all enabled apps in test bootstrapRobin McCorkell2015-09-071-3/+2
| |/ / /
* / / / [tx-robot] updated from transifexJenkins for ownCloud2015-09-08212-1192/+1148
|/ / /
* | | Merge pull request #18876 from owncloud/missing-context-on-update-file-targetMorris Jobke2015-09-071-1/+1
|\ \ \ | | | | | | | | Use context function call instead of static
| * | | Use context function call instead of staticJoas Schilling2015-09-071-1/+1
| | | |
* | | | Merge pull request #18630 from owncloud/files-combineuploadbuttonJan-Christoph Borchardt2015-09-0714-320/+792
|\ \ \ \ | | | | | | | | | | Combine upload action into the "New" menu
| * | | | Added unit tests for "new" file menu and small fixesVincent Petry2015-09-035-54/+247
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - added unit tests for NewFileMenu - use generateUrl for FileList.createFile and FileList.createDirectory - added unit tests for FileList.createFile and FileList.createDirectory
| * | | | Remove ellipsis on new file menu itemsVincent Petry2015-09-031-1/+0
| | | | |
| * | | | fix icon and layout details for new menuJan-Christoph Borchardt2015-09-033-13/+12
| | | | |
| * | | | Combine upload action into the "New" menuVincent Petry2015-08-2811-270/+551
| | | | | | | | | | | | | | | | | | | | Refactored the new menu to be encapsulated in the NewFileMenu JS class
* | | | | Merge pull request #18872 from owncloud/settings_users_ldapMorris Jobke2015-09-071-1/+1
|\ \ \ \ \ | |_|/ / / |/| | | | Check if app is enabled instead of if class exists
| * | | | Check if app is enabled instead of if class existsRobin McCorkell2015-09-071-1/+1
| | | | |
* | | | | Merge pull request #18868 from owncloud/fix-files_version-js-loadJoas Schilling2015-09-071-1/+0
|\ \ \ \ \ | |/ / / / |/| | | | Remove unneeded include
| * | | | Remove unneeded includeMorris Jobke2015-09-071-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | * fixes #18867 * ref #18748
* | | | | Merge pull request #18866 from tflidd/doc_link_phpfpmRobin McCorkell2015-09-071-1/+1
|\ \ \ \ \ | |/ / / / |/| | | | Doc link phpfpm
| * | | | remove spaces and empty linetflidd2015-09-071-2/+1
| | | | |
| * | | | Add documentation link php-fpmtflidd2015-09-071-1/+2
|/ / / / | | | | | | | | | | | | Admin-Page warning didn't have a direct link to the documentation.
* | | | [tx-robot] updated from transifexJenkins for ownCloud2015-09-074-0/+30
| | | |
* | | | Merge pull request #18748 from owncloud/files-versions-tabMorris Jobke2015-09-0718-221/+976
|\ \ \ \ | | | | | | | | | | Add versions tab to files sidebar
| * | | | Add versions tab to files sidebarVincent Petry2015-09-0318-221/+976
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - move versions to a tab in the files sidebar - added mechanism to auto-update the row in the FileList whenever values are set to the FileInfoModel given to the sidebar - updated tags/favorite action to make use of that new mechanism
* | | | | Merge pull request #18839 from owncloud/autoloader-supersecureMorris Jobke2015-09-075-15/+56
|\ \ \ \ \ | | | | | | | | | | | | Restrict autoloaded paths to loaded apps (and other enhancements)
| * | | | | Unique exception for invalid autoload paths, better handlingRobin McCorkell2015-09-053-9/+53
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Background jobs are tolerant of stale entries left by disabled apps, which will cause an autoload exception.
| * | | | | Resolve autoloader valid roots before checkingRobin McCorkell2015-09-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Allows symlinked app directories to work properly
| * | | | | Only add valid root for enabled appsRobin McCorkell2015-09-052-5/+2
| | | | | |
* | | | | | Merge pull request #18742 from owncloud/mimetype-updatedbRoeland Douma2015-09-0613-124/+702
|\ \ \ \ \ \ | | | | | | | | | | | | | | Introduce mimetype DB update occ command
| * | | | | | Unit tests for mimetype loaderRobin McCorkell2015-09-042-0/+277
| | | | | | |
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-29 17:08:54 +0000