Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-04-02 | 180 | -3035/+3004 |
| | |||||
* | Merge pull request #7989 from owncloud/files-deletefileregressionfix | Thomas Müller | 2014-04-01 | 2 | -8/+20 |
|\ | | | | | Fixed broken delete file action | ||||
| * | Fixed broken delete file action | Vincent Petry | 2014-04-01 | 2 | -8/+20 |
| | | |||||
* | | Merge pull request #7884 from owncloud/use-idn_to_ascii-if-available | Thomas Müller | 2014-04-01 | 2 | -0/+12 |
|\ \ | | | | | | | idn_to_ascii is only used if available | ||||
| * | | idn_to_ascii is only used if available | Thomas Müller | 2014-03-26 | 2 | -0/+12 |
| | | | |||||
* | | | Merge pull request #7935 from owncloud/getpath-shared | Vincent Petry | 2014-04-01 | 4 | -14/+120 |
|\ \ \ | | | | | | | | | Make getPath work for shared files | ||||
| * | | | Improve phpdoc | Robin Appelman | 2014-03-31 | 2 | -1/+10 |
| | | | | |||||
| * | | | Implement getPath for shared files | Robin Appelman | 2014-03-28 | 2 | -8/+82 |
| | | | | |||||
| * | | | Give storages the option to implement the getById behaviour for View->getPath | Robin Appelman | 2014-03-28 | 2 | -6/+29 |
| | | | | |||||
* | | | | Merge pull request #7817 from owncloud/app-navigation-for-apps | Morris Jobke | 2014-04-01 | 4 | -60/+50 |
|\ \ \ \ | | | | | | | | | | | Makes #app-navigation a part of app management. | ||||
| * | | | | apply proposed change | Morris Jobke | 2014-04-01 | 1 | -2/+2 |
| | | | | | |||||
| * | | | | merge CSS rules | Morris Jobke | 2014-03-31 | 1 | -4/+2 |
| | | | | | |||||
| * | | | | Removes highlighting of selected items, padding from apps management. | raghunayyar | 2014-03-30 | 2 | -3/+3 |
| | | | | | |||||
| * | | | | Adds Style changes to app-navigation in core/css/apps.css | raghunayyar | 2014-03-24 | 2 | -4/+13 |
| | | | | | |||||
| * | | | | Makes #app-navigation a part of app management. | raghunayyar | 2014-03-20 | 3 | -59/+42 |
| | | | | | |||||
* | | | | | Merge pull request #7997 from owncloud/correct-remember-trashbin-state | Bart Visscher | 2014-04-01 | 1 | -3/+3 |
|\ \ \ \ \ | | | | | | | | | | | | | Correct the remembering of the trashbin app state in encryption test | ||||
| * | | | | | Remember before change works better | Bart Visscher | 2014-04-01 | 1 | -3/+3 |
| | | | | | | |||||
* | | | | | | Merge pull request #7986 from owncloud/files-fixredirectwhendirnotexists | Vincent Petry | 2014-04-01 | 1 | -1/+1 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Fix dirInfo check when dir does not exist | ||||
| * | | | | | | Fix dirInfo check when dir does not exist | Vincent Petry | 2014-04-01 | 1 | -1/+1 |
| | |_|_|_|/ | |/| | | | | |||||
* | | | | | | Merge pull request #7984 from owncloud/wording-applicable2 | Morris Jobke | 2014-04-01 | 1 | -4/+7 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | External Storage: change confusing 'applicable' to 'available for', default to »All Users« | ||||
| * | | | | | | external storage: set storages to be available for All Users by default | Jan-Christoph Borchardt | 2014-04-01 | 1 | -3/+6 |
| | | | | | | | |||||
| * | | | | | | external storage: change confusing 'applicable' to 'available for' | Jan-Christoph Borchardt | 2014-04-01 | 1 | -1/+1 |
| | | | | | | | |||||
* | | | | | | | Merge pull request #7696 from owncloud/chunk-remainingspacefix | Vincent Petry | 2014-04-01 | 2 | -3/+48 |
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | Fixed chunking and insufficient storage check | ||||
| * | | | | | | Fixed chunking and insufficient storage check | Vincent Petry | 2014-03-17 | 2 | -3/+48 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - fixed free space detection based on the already uploaded chunks - now deleting chunks as soon as it is read out before writing it into the part file, which reduces the space needed when assembling part files | ||||
* | | | | | | | Merge pull request #7293 from owncloud/update-shares-postgres | Vincent Petry | 2014-04-01 | 4 | -16/+109 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | fix update to remove shares where file doesn't exist on postgres | ||||
| * | | | | | | | Fixed share upgrade cleanup tests to use the correct ids | Vincent Petry | 2014-03-26 | 1 | -9/+9 |
| | | | | | | | | |||||
| * | | | | | | | Fixed share updater unit test | Vincent Petry | 2014-03-25 | 1 | -8/+10 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now using \OC_DB::insertId() to retrieve the generated ids because Oracle ignores the passed values. | ||||
| * | | | | | | | remove invalid shares with one SQL statement | Morris Jobke | 2014-03-13 | 1 | -12/+5 |
| | | | | | | | | |||||
| * | | | | | | | Added backticks for Oracle in sharing updater unit test | Vincent Petry | 2014-03-13 | 1 | -8/+8 |
| | | | | | | | | |||||
| * | | | | | | | Clean up database before setup the database for testing | Morris Jobke | 2014-03-13 | 1 | -0/+4 |
| | | | | | | | | |||||
| * | | | | | | | Refactor update script to class and add unit test | Morris Jobke | 2014-03-13 | 3 | -13/+108 |
| | | | | | | | | |||||
| * | | | | | | | fix update to remove shares where file doesn't exist on postgres | Jamie McClelland | 2014-03-13 | 2 | -15/+14 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Without patch, breaks with: Failed to upgrade "files_sharing". Exception="SQLSTATE[22P02]: Invalid text representation: 7 ERROR: invalid input syntax for integer: "5,179"" See: https://github.com/owncloud/core/issues/5758 removing unnecessary cruft - no parameter is set, none to pass. https://github.com/owncloud/core/issues/5758 removing subquery, making more readable See: https://github.com/owncloud/core/pull/6016#issuecomment-29510979 parameters to sql calls should be arrays https://github.com/owncloud/core/pull/6016 boosting version to ensure fix gets executed properly escaping the sql select statement removing extraneous closing paren. | ||||
* | | | | | | | | Merge pull request #7940 from owncloud/settings-userlistajaxcallfix | blizzz | 2014-04-01 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | | Fixed user list offset call | ||||
| * | | | | | | | Fixed user list offset call | Vincent Petry | 2014-03-28 | 1 | -1/+1 |
| | | | | | | | | |||||
* | | | | | | | | Merge pull request #7912 from owncloud/enc_move_checks_to_pre_hook | Björn Schießle | 2014-04-01 | 3 | -87/+66 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | move check if a file should be encrypted to the pre hook | ||||
| * | | | | | | | | don't call getFileInfo() to avoid to open the same file twice | Bjoern Schiessle | 2014-03-31 | 1 | -12/+16 |
| | | | | | | | | | |||||
| * | | | | | | | | move check if a file should be encrypted to the pre hook | Bjoern Schiessle | 2014-03-31 | 2 | -75/+50 |
| | |_|_|_|_|/ / | |/| | | | | | | |||||
* | | | | | | | | Merge pull request #7943 from hjort/master | Vincent Petry | 2014-04-01 | 1 | -3/+3 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Correction: failure on sharing when user ID was prefixed by zero | ||||
| * | | | | | | | | Correction: failure on sharing when user ID was prefixed by zero | Rodrigo Hjort | 2014-03-28 | 1 | -3/+3 |
| | | | | | | | | | |||||
* | | | | | | | | | Merge pull request #7975 from owncloud/fix-7973-master-2 | Vincent Petry | 2014-04-01 | 15 | -2569/+0 |
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | remove pl_PL - fixes #7973 | ||||
| * | | | | | | | | | remove pl_PL - fixes #7973 | Thomas Müller | 2014-03-31 | 15 | -2569/+0 |
| | |_|_|_|_|/ / / | |/| | | | | | | | |||||
* | | | | | | | | | Merge pull request #7915 from owncloud/replace-personalblock | Vincent Petry | 2014-04-01 | 11 | -430/+407 |
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Replace personalblock with .section | ||||
| * \ \ \ \ \ \ \ \ | external storage: fix merge conflict, indentation | Jan-Christoph Borchardt | 2014-03-31 | 119 | -2126/+3046 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | replace last personalblock fieldset within files_external | Jan-Christoph Borchardt | 2014-03-31 | 1 | -3/+1 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | remove CSS rules for personalblock, remove it from core | Jan-Christoph Borchardt | 2014-03-27 | 2 | -17/+4 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | replace personalblock fieldset with section class in core user_ apps | Jan-Christoph Borchardt | 2014-03-27 | 2 | -9/+7 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | replace personalblock fieldset with section class in files apps | Jan-Christoph Borchardt | 2014-03-27 | 4 | -271/+261 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | replace personalblock fieldset with section div in admin and personal settings | Jan-Christoph Borchardt | 2014-03-27 | 2 | -124/+112 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | general styles for the content area | Jan-Christoph Borchardt | 2014-03-27 | 1 | -3/+19 |
| | |_|_|/ / / / / / | |/| | | | | | | | | |||||
* | | | | | | | | | | Merge pull request #7966 from owncloud/url_generation_hack | Morris Jobke | 2014-04-01 | 1 | -1/+6 |
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | Check if web root has already been appended |