Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into external_storage_ui_feedback | Michael Gapczynski | 2013-02-19 | 116 | -262/+801 |
|\ | |||||
| * | Merge pull request #1731 from owncloud/unknown-freespace | Frank Karlitschek | 2013-02-19 | 6 | -19/+2 |
| |\ | |||||
| | * | Give storage backends the option to define having no known free space | Robin Appelman | 2013-02-16 | 6 | -19/+2 |
| * | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-02-20 | 4 | -1/+19 |
| * | | 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 | 14 | -11/+95 |
| * | | | | | Merge pull request #1728 from owncloud/mountconfig | Thomas Müller | 2013-02-18 | 1 | -35/+15 |
| |\| | | | | |||||
| | * | | | | 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 | 42 | -108/+320 |
| | |\ \ \ \ \ | | | |/ / / / | | |/| | | | | |||||
| | * | | | | | Create new mountconfig files in json | Robin Appelman | 2013-02-16 | 1 | -31/+14 |
| | * | | | | | Use a parser to read custom mount configuration instead of including the php ... | Robin Appelman | 2013-02-16 | 1 | -1/+2 |
| | | |_|_|/ | | |/| | | | |||||
| * | | | | | files_versions no longer contains a personal settings page -> remove the call | Thomas Mueller | 2013-02-18 | 1 | -1/+0 |
| | |_|/ / | |/| | | | |||||
| * | | | | Merge pull request #1759 from owncloud/redirect_fix_1737 | Thomas Müller | 2013-02-18 | 1 | -1/+1 |
| |\ \ \ \ | | |_|/ / | |/| | | | |||||
| | * | | | fix redirect, use the new routing | Björn Schießle | 2013-02-18 | 1 | -1/+1 |
| * | | | | Sanitize HTML | Lukas Reschke | 2013-02-18 | 1 | -1/+1 |
| |/ / / | |||||
| * | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-02-18 | 9 | -6/+26 |
| * | | | Merge pull request #1709 from owncloud/style-cleanup-files_external | Thomas Müller | 2013-02-17 | 2 | -6/+15 |
| |\ \ \ | |||||
| | * | | | Join split translated strings | Bart Visscher | 2013-02-15 | 1 | -6/+2 |
| | * | | | Style cleanup files_external | Bart Visscher | 2013-02-15 | 2 | -6/+19 |
| | |/ / | |||||
| * | | | Merge pull request #1708 from owncloud/style-cleanup-user_ldap | Bernhard Posselt | 2013-02-17 | 9 | -69/+206 |
| |\ \ \ | |||||
| | * | | | Join split translated strings | Bart Visscher | 2013-02-15 | 2 | -13/+6 |
| | * | | | Join short comment lines | Bart Visscher | 2013-02-15 | 1 | -4/+2 |
| | * | | | Style cleanup user_ldap | Bart Visscher | 2013-02-14 | 9 | -72/+218 |
| * | | | | Merge branch 'master' into fix-googledrive | Thomas Mueller | 2013-02-17 | 108 | -136/+640 |
| |\ \ \ \ | |||||
| | * \ \ \ | Merge pull request #1699 from owncloud/multiselect-bar-fix | Thomas Müller | 2013-02-17 | 1 | -0/+1 |
| | |\ \ \ \ | |||||
| | | * | | | | fix multiselect bar offset on shared page, close #1339 finally | Jan-Christoph Borchardt | 2013-02-14 | 1 | -0/+1 |
| | | |/ / / | |||||
| | * | | | | Merge pull request #1730 from owncloud/ldap_fix_warnings | Thomas Müller | 2013-02-17 | 1 | -1/+2 |
| | |\ \ \ \ | |||||
| | | * | | | | LDAP: check array with isset first to avoid warnings about undefined index | Arthur Schiwon | 2013-02-16 | 1 | -1/+2 |
| | * | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-02-17 | 8 | -21/+24 |
| | * | | | | | Merge pull request #1729 from owncloud/fix_1727 | Frank Karlitschek | 2013-02-16 | 1 | -2/+5 |
| | |\ \ \ \ \ | |||||
| | | * | | | | | LDAP: announce that OC_USER_BACKEND_GET_DISPLAYNAME is implemented, fixes #1727 | Arthur Schiwon | 2013-02-16 | 1 | -2/+5 |
| | | |/ / / / | |||||
| | * / / / / | Add missing requesttoken | Lukas Reschke | 2013-02-16 | 1 | -0/+1 |
| | |/ / / / | |||||
| | * | / / | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-02-16 | 11 | -3/+44 |
| | | |/ / | | |/| | | |||||
| | * | | | Merge pull request #1683 from owncloud/ie-fixes | Jan-Christoph Borchardt | 2013-02-15 | 1 | -0/+5 |
| | |\ \ \ | |||||
| | | * | | | always show checkbox when selected, also in IE8, fix #1621 | Jan-Christoph Borchardt | 2013-02-14 | 1 | -0/+5 |
| | | |/ / | |||||
| | * | | | check if glob() returns any results, fix for stable45 was already approved by... | Björn Schießle | 2013-02-15 | 1 | -0/+4 |
| | * | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-02-15 | 37 | -28/+73 |
| | * | | | Merge pull request #1662 from owncloud/style-cleanup | Bart Visscher | 2013-02-14 | 16 | -44/+44 |
| | |\ \ \ | | | |_|/ | | |/| | | |||||
| | | * | | Fix NoSpaceAfterComma and SpaceBeforeComma | Bart Visscher | 2013-02-14 | 13 | -34/+34 |
| | | * | | Fix indentation style | Bart Visscher | 2013-02-14 | 1 | -1/+1 |
| | | * | | Fix SpaceBeforeOpenBrace errors | Bart Visscher | 2013-02-14 | 7 | -9/+9 |
| | | |/ |