summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2015-09-1012-0/+30
* Merge pull request #18895 from owncloud/make-code-analyzers-happierMorris Jobke2015-09-093-24/+100
|\
| * Add proper PHPDocLukas Reschke2015-09-083-24/+100
* | Merge pull request #18873 from owncloud/enc_use_master_passwordLukas Reschke2015-09-0910-27/+472
|\ \
| * | 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 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 warningLukas Reschke2015-09-091-2/+2
* | | | Merge pull request #18913 from owncloud/put-in-single-field-for-speedLukas Reschke2015-09-094-35/+52
|\ \ \ \ | |/ / / |/| | |
| * | | 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
| * | | 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
|\ \ \
| * | | 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
* | | | Merge pull request #18908 from owncloud/allow-0-as-passwordBjörn Schießle2015-09-091-1/+1
|\ \ \ \
| * | | | Allow 0 and false as passwordLukas Reschke2015-09-081-1/+1
* | | | | [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 resultLukas Reschke2015-09-081-1/+8
|/ / / /
* | | | Merge pull request #18881 from owncloud/kill-sendfileMorris Jobke2015-09-081-57/+1
|\ \ \ \ | |_|_|/ |/| | |
| * | | Remove XSendFile supportLukas Reschke2015-09-071-57/+1
* | | | Merge pull request #18882 from owncloud/load-all-apps-testsLukas Reschke2015-09-081-3/+2
|\ \ \ \
| * | | | 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 staticJoas Schilling2015-09-071-1/+1
* | | | Merge pull request #18630 from owncloud/files-combineuploadbuttonJan-Christoph Borchardt2015-09-0714-320/+792
|\ \ \ \
| * | | | Added unit tests for "new" file menu and small fixesVincent Petry2015-09-035-54/+247
| * | | | 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
* | | | | Merge pull request #18872 from owncloud/settings_users_ldapMorris Jobke2015-09-071-1/+1
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | 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 includeMorris Jobke2015-09-071-1/+0
* | | | | Merge pull request #18866 from tflidd/doc_link_phpfpmRobin McCorkell2015-09-071-1/+1
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | remove spaces and empty linetflidd2015-09-071-2/+1
| * | | | Add documentation link php-fpmtflidd2015-09-071-1/+2
|/ / / /
* | | | [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 sidebarVincent Petry2015-09-0318-221/+976
* | | | | Merge pull request #18839 from owncloud/autoloader-supersecureMorris Jobke2015-09-075-15/+56
|\ \ \ \ \
| * | | | | Unique exception for invalid autoload paths, better handlingRobin McCorkell2015-09-053-9/+53
| * | | | | Resolve autoloader valid roots before checkingRobin McCorkell2015-09-051-1/+1
| * | | | | Only add valid root for enabled appsRobin McCorkell2015-09-052-5/+2