summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | Merge pull request #7978 from owncloud/enc_cleanupVincent Petry2014-04-021-45/+0
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | there is no need to re-calculate the shares after a touchBjoern Schiessle2014-03-311-45/+0
| | |_|/ / | |/| | |
* | | | | Merge pull request #7995 from owncloud/fix-h3-stylesMorris Jobke2014-04-022-2/+3
|\ \ \ \ \
| * | | | | fix h3 style, move out from settings to apps CSSJan-Christoph Borchardt2014-04-022-2/+3
* | | | | | Merge pull request #8003 from owncloud/extstorage-sftp-upgradephpseclibVincent Petry2014-04-0227-723/+1287
|\ \ \ \ \ \
| * | | | | | Upgraded phpseclib to version 0.3.6Vincent Petry2014-04-0227-723/+1287
* | | | | | | Merge pull request #8006 from wakeup/masterMorris Jobke2014-04-021-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Fix admin-dir_permissions redirection when cannot write warningVolkan Gezer2014-04-021-1/+1
* | | | | | | | Merge pull request #7977 from owncloud/fix_enc_if_sharing_is_disabledMorris Jobke2014-04-023-13/+11
|\ \ \ \ \ \ \ \
| * | | | | | | | always encrypt files to ownerBjoern Schiessle2014-03-313-13/+11
| | |_|_|_|/ / / | |/| | | | | |
* | | | | | | | Merge pull request #7968 from owncloud/core-overwritewebrootwithrootVincent Petry2014-04-022-3/+4
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | |
| * | | | | | | Allow using "/" in "overwritewebroot"Vincent Petry2014-03-312-3/+4
| |/ / / / / /
* | | | | | | Merge pull request #7979 from owncloud/core-fixfilegetcontentsloopVincent Petry2014-04-023-8/+48
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | Added missing fclose in file_get_contents and file_put_contentsVincent Petry2014-04-011-1/+4
| * | | | | | Correctly read the full stream in file_get_contentsVincent Petry2014-04-013-7/+44
| | |_|/ / / | |/| | | |
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-04-02180-3035/+3004
| |_|_|_|/ |/| | | |
* | | | | 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 #7884 from owncloud/use-idn_to_ascii-if-availableThomas Müller2014-04-012-0/+12
|\ \ \ \ \ \
| * | | | | | idn_to_ascii is only used if availableThomas Müller2014-03-262-0/+12
* | | | | | | Merge pull request #7935 from owncloud/getpath-sharedVincent Petry2014-04-014-14/+120
|\ \ \ \ \ \ \
| * | | | | | | Improve phpdocRobin Appelman2014-03-312-1/+10
| * | | | | | | Implement getPath for shared filesRobin Appelman2014-03-282-8/+82
| * | | | | | | Give storages the option to implement the getById behaviour for View->getPathRobin Appelman2014-03-282-6/+29
* | | | | | | | Merge pull request #7817 from owncloud/app-navigation-for-appsMorris Jobke2014-04-014-60/+50
|\ \ \ \ \ \ \ \
| * | | | | | | | apply proposed changeMorris Jobke2014-04-011-2/+2
| * | | | | | | | merge CSS rulesMorris Jobke2014-03-311-4/+2
| * | | | | | | | Removes highlighting of selected items, padding from apps management.raghunayyar2014-03-302-3/+3
| * | | | | | | | Adds Style changes to app-navigation in core/css/apps.cssraghunayyar2014-03-242-4/+13
| * | | | | | | | Makes #app-navigation a part of app management.raghunayyar2014-03-203-59/+42
* | | | | | | | | 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 #7696 from owncloud/chunk-remainingspacefixVincent Petry2014-04-012-3/+48
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | |
| * | | | | | | | Fixed chunking and insufficient storage checkVincent Petry2014-03-172-3/+48
* | | | | | | | | 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 #7940 from owncloud/settings-userlistajaxcallfixblizzz2014-04-011-1/+1
|\ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / |/| | | | | | | | |
| * | | | | | | | | Fixed user list offset callVincent Petry2014-03-281-1/+1
* | | | | | | | | | Merge pull request #7912 from owncloud/enc_move_checks_to_pre_hookBjörn Schießle2014-04-013-87/+66
|\ \ \ \ \ \ \ \ \ \
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-09 05:00:17 +0000