aboutsummaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Expand)AuthorAgeFilesLines
* Files, trashbin, public apps use ajax/JSON for the file listVincent Petry2014-04-0238-1365/+2340
* Merge pull request #7989 from owncloud/files-deletefileregressionfixThomas Müller2014-04-012-8/+20
|\
| * Fixed broken delete file actionVincent Petry2014-04-012-8/+20
* | Merge pull request #7935 from owncloud/getpath-sharedVincent Petry2014-04-012-8/+89
|\ \
| * | Improve phpdocRobin Appelman2014-03-311-0/+7
| * | Implement getPath for shared filesRobin Appelman2014-03-282-8/+82
* | | Merge pull request #7997 from owncloud/correct-remember-trashbin-stateBart Visscher2014-04-011-3/+3
|\ \ \
| * | | Remember before change works betterBart Visscher2014-04-011-3/+3
* | | | Merge pull request #7986 from owncloud/files-fixredirectwhendirnotexistsVincent Petry2014-04-011-1/+1
|\ \ \ \
| * | | | Fix dirInfo check when dir does not existVincent Petry2014-04-011-1/+1
| | |_|/ | |/| |
* | | | Merge pull request #7984 from owncloud/wording-applicable2Morris Jobke2014-04-011-4/+7
|\ \ \ \ | |/ / / |/| | |
| * | | external storage: set storages to be available for All Users by defaultJan-Christoph Borchardt2014-04-011-3/+6
| * | | external storage: change confusing 'applicable' to 'available for'Jan-Christoph Borchardt2014-04-011-1/+1
* | | | Merge pull request #7293 from owncloud/update-shares-postgresVincent Petry2014-04-014-16/+109
|\ \ \ \ | |/ / / |/| | |
| * | | Fixed share upgrade cleanup tests to use the correct idsVincent Petry2014-03-261-9/+9
| * | | Fixed share updater unit testVincent Petry2014-03-251-8/+10
| * | | remove invalid shares with one SQL statementMorris Jobke2014-03-131-12/+5
| * | | Added backticks for Oracle in sharing updater unit testVincent Petry2014-03-131-8/+8
| * | | Clean up database before setup the database for testingMorris Jobke2014-03-131-0/+4
| * | | Refactor update script to class and add unit testMorris Jobke2014-03-133-13/+108
| * | | fix update to remove shares where file doesn't exist on postgresJamie McClelland2014-03-132-15/+14
* | | | Merge pull request #7912 from owncloud/enc_move_checks_to_pre_hookBjörn Schießle2014-04-013-87/+66
|\ \ \ \
| * | | | don't call getFileInfo() to avoid to open the same file twiceBjoern Schiessle2014-03-311-12/+16
| * | | | move check if a file should be encrypted to the pre hookBjoern Schiessle2014-03-312-75/+50
| | |_|/ | |/| |
* | | | Merge pull request #7975 from owncloud/fix-7973-master-2Vincent Petry2014-04-011-5/+0
|\ \ \ \
| * | | | remove pl_PL - fixes #7973Thomas Müller2014-03-311-5/+0
| | |_|/ | |/| |
* | | | Merge pull request #7915 from owncloud/replace-personalblockVincent Petry2014-04-016-286/+272
|\ \ \ \
| * | | | external storage: fix merge conflict, indentationJan-Christoph Borchardt2014-03-3127-75/+164
| |\| | |
| * | | | replace last personalblock fieldset within files_externalJan-Christoph Borchardt2014-03-311-3/+1
| * | | | replace personalblock fieldset with section class in core user_ appsJan-Christoph Borchardt2014-03-272-9/+7
| * | | | replace personalblock fieldset with section class in files appsJan-Christoph Borchardt2014-03-274-271/+261
| | |/ / | |/| |
* | | | [tx-robot] updated from transifexJenkins for ownCloud2014-04-016-0/+11
| |/ / |/| |
* | | [tx-robot] updated from transifexJenkins for ownCloud2014-03-301-0/+1
* | | Merge pull request #7929 from owncloud/enc_dont_write_file_if_enc_failsBjörn Schießle2014-03-281-0/+2
|\ \ \
| * | | don't write file if opening a stream to encrypt the data failsBjoern Schiessle2014-03-281-0/+2
* | | | Merge pull request #7879 from owncloud/sharing_cleanup_public_apiVincent Petry2014-03-281-1/+1
|\ \ \ \ | |/ / / |/| | |
| * | | finally fix the paths for the OCS Share APIBjoern Schiessle2014-03-251-1/+84
| * | | fix path creation for re-shares, issue #7662Bjoern Schiessle2014-03-251-83/+0
* | | | Merge pull request #7872 from owncloud/trash-disablestoragestatsBjörn Schießle2014-03-281-0/+5
|\ \ \ \
| * | | | Do not retrieve storage stats for trash binVincent Petry2014-03-281-0/+5
* | | | | Merge pull request #7842 from Xenopathic/files_external_config_optionalRobin McCorkell2014-03-282-17/+25
|\ \ \ \ \
| * | | | | Insert missing braceRobin McCorkell2014-03-241-3/+3
| * | | | | Enable the use of 'optional' on password fields (JavaScript part)Robin McCorkell2014-03-211-8/+13
| * | | | | Correct field modifier checkingRobin McCorkell2014-03-201-3/+3
| * | | | | Enable the use of 'optional' on password fieldsRobin McCorkell2014-03-201-7/+10
* | | | | | Merge pull request #7107 from owncloud/load-apps-proper-masterThomas Müller2014-03-287-31/+0
|\ \ \ \ \ \
| * | | | | | killing some more calls to OC_App::loadApps(); - because we load all apps in ...Thomas Müller2014-03-251-1/+0
| * | | | | | Merge branch 'master' into load-apps-proper-masterThomas Müller2014-03-21474-2654/+5611
| |\ \ \ \ \ \
| * | | | | | | Within OC:init() the minimum set of apps is loaded - which is filesystem, aut...Thomas Müller2014-02-061-6/+0
| * | | | | | | remove superfluous $RUNTIME_APPTYPESThomas Müller2014-02-065-24/+0