Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-02-21 | 134 | -1230/+4224 |
* | Merge pull request #1773 from owncloud/trash_bin_delete_selected | Björn Schießle | 2013-02-20 | 6 | -33/+82 |
|\ | |||||
| * | Merge branch 'master' into trash_bin_delete_selected | Thomas Mueller | 2013-02-20 | 54 | -207/+274 |
| |\ | |/ |/| | |||||
* | | Merge pull request #1809 from owncloud/fix_ie_deletefolder | Björn Schießle | 2013-02-20 | 2 | -5/+5 |
|\ \ | |||||
| * | | replaced for in loops with normal enumerating loops to fix #1803 | Bernhard Posselt | 2013-02-20 | 2 | -5/+5 |
|/ / | |||||
* | | Merge pull request #1806 from eMerzh/ref_1799 | Bernhard Posselt | 2013-02-20 | 1 | -1/+5 |
|\ \ | |||||
| * | | Add message when trouble sending email ref #1799 | Brice Maron | 2013-02-20 | 1 | -1/+5 |
|/ / | |||||
* | | 5.0.0 beta 1v5.0.0beta1 | Frank Karlitschek | 2013-02-20 | 1 | -2/+2 |
* | | Merge pull request #1738 from owncloud/fix_multiselect_in_settings | Frank Karlitschek | 2013-02-20 | 1 | -2/+3 |
|\ \ | |||||
| * | | Extra position check for multiselect dropdown. Fix app/issues/575 | Thomas Tanghus | 2013-02-16 | 1 | -2/+3 |
* | | | Merge pull request #1753 from owncloud/Extra_info | Frank Karlitschek | 2013-02-20 | 1 | -3/+4 |
|\ \ \ | |||||
| * | | | Add Ability to the app to detect more details on the file | VicDeo | 2013-02-18 | 1 | -3/+4 |
* | | | | Merge pull request #1787 from maelzx/patch-1 | Frank Karlitschek | 2013-02-20 | 1 | -1/+9 |
|\ \ \ \ | |||||
| * | | | | Update apps/files_versions/js/versions.js | maelzx | 2013-02-20 | 1 | -1/+9 |
* | | | | | Merge pull request #1752 from schiesbn/versioning_use_new_filesystem_api | Björn Schießle | 2013-02-20 | 3 | -55/+35 |
|\ \ \ \ \ | |||||
| * | | | | | fix getUidAndFilename() function | Björn Schießle | 2013-02-18 | 2 | -46/+23 |
| * | | | | | make store function static | Björn Schießle | 2013-02-14 | 1 | -1/+1 |
| * | | | | | use new filesystem to mount users home | Björn Schießle | 2013-02-14 | 1 | -3/+13 |
| * | | | | | don't use OC_FilesystemView() | Björn Schießle | 2013-02-10 | 1 | -16/+9 |
* | | | | | | Merge pull request #1790 from owncloud/update_office_icons | Jan-Christoph Borchardt | 2013-02-20 | 5 | -0/+0 |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | |||||
| * | | | | | Update office icons | Jörn Friedrich Dreyer | 2013-02-20 | 5 | -0/+0 |
|/ / / / / | |||||
* | | | | | Merge pull request #1731 from owncloud/unknown-freespace | Frank Karlitschek | 2013-02-19 | 10 | -27/+28 |
|\ \ \ \ \ | |||||
| * | | | | | Keep user quota into account when the storage backend has unkown free space | Robin Appelman | 2013-02-17 | 1 | -6/+9 |
| * | | | | | Give storage backends the option to define having no known free space | Robin Appelman | 2013-02-16 | 9 | -21/+19 |
* | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-02-20 | 28 | -110/+182 |
* | | | | | | Merge pull request #1720 from owncloud/usermenu-css | Frank Karlitschek | 2013-02-19 | 1 | -2/+2 |
|\ \ \ \ \ \ | |||||
| * | | | | | | fix erroneous CSS, remove obsolete selectors | Jan-Christoph Borchardt | 2013-02-15 | 1 | -2/+2 |
| |/ / / / / | |||||
| | | | | * | change for loop to make it hopefully work with IE | Björn Schießle | 2013-02-20 | 1 | -1/+1 |
| | | | | * | switch to json encoded file list | Björn Schießle | 2013-02-20 | 3 | -6/+8 |
| | | | | * | use "|" as delimiter instead of ";", since "|" is not allowed in file/folder ... | Björn Schießle | 2013-02-20 | 3 | -8/+4 |
| | | | | * | add timestamp to function call; fix trash.js to handle multiple delete operat... | Björn Schießle | 2013-02-19 | 2 | -5/+5 |
| | | | | * | initialize $result | Björn Schießle | 2013-02-19 | 1 | -0/+1 |
| | | | | * | rebase to master | Björn Schießle | 2013-02-19 | 74 | -614/+1048 |
| | | | | |\ | |_|_|_|_|/ |/| | | | | | |||||
* | | | | | | Merge pull request #1740 from houqp/issue#1688 | Björn Schießle | 2013-02-19 | 2 | -3/+24 |
|\ \ \ \ \ \ | |||||
| * | | | | | | check filename and timestamp in Trashbin's file_exists method | Qingping Hou | 2013-02-18 | 1 | -3/+11 |
| * | | | | | | Properly delete empty directories in Trashbin | Qingping Hou | 2013-02-16 | 1 | -1/+3 |
| * | | | | | | add file_exists method to files_trashbin app | Qingping Hou | 2013-02-16 | 1 | -2/+13 |
* | | | | | | | Merge pull request #1764 from owncloud/Undelete_directory_fix | Lukas Reschke | 2013-02-19 | 1 | -0/+3 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Calculate size for existing directories only | Victor Dubiniuk | 2013-02-18 | 1 | -0/+3 |
* | | | | | | | | Merge pull request #1771 from owncloud/mountconfig | Thomas Müller | 2013-02-18 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | no pretty print | Thomas Mueller | 2013-02-19 | 1 | -1/+1 |
* | | | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-02-19 | 62 | -559/+752 |
* | | | | | | | | | Merge pull request #1728 from owncloud/mountconfig | Thomas Müller | 2013-02-18 | 3 | -44/+223 |
|\| | | | | | | | | |||||
| * | | | | | | | | Merge branch 'mountconfig' of github.com:owncloud/core into mountconfig | Robin Appelman | 2013-02-18 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | look where you are typing ... | Jörn Friedrich Dreyer | 2013-02-16 | 1 | -1/+1 |
| | * | | | | | | | | pretty print json | Jörn Friedrich Dreyer | 2013-02-16 | 1 | -1/+1 |
| * | | | | | | | | | merge master into mountconfig | Robin Appelman | 2013-02-18 | 127 | -965/+1378 |
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | | | |||||
| * | | | | | | | | | Create new mountconfig files in json | Robin Appelman | 2013-02-16 | 2 | -35/+26 |
| * | | | | | | | | | Use a parser to read custom mount configuration instead of including the php ... | Robin Appelman | 2013-02-16 | 3 | -8/+200 |
| | |_|_|/ / / / / | |/| | | | | | | | |||||
* | | | | | | | | | Merge pull request #1767 from owncloud/fixing-1766-master | Lukas Reschke | 2013-02-18 | 1 | -1/+0 |
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | | |