aboutsummaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into external_storage_ui_feedbackMichael Gapczynski2013-02-19116-262/+801
|\
| * Merge pull request #1731 from owncloud/unknown-freespaceFrank Karlitschek2013-02-196-19/+2
| |\
| | * Give storage backends the option to define having no known free spaceRobin Appelman2013-02-166-19/+2
| * | [tx-robot] updated from transifexJenkins for ownCloud2013-02-204-1/+19
| * | Merge pull request #1740 from houqp/issue#1688Björn Schießle2013-02-192-3/+24
| |\ \
| | * | check filename and timestamp in Trashbin's file_exists methodQingping Hou2013-02-181-3/+11
| | * | Properly delete empty directories in TrashbinQingping Hou2013-02-161-1/+3
| | * | add file_exists method to files_trashbin appQingping Hou2013-02-161-2/+13
| * | | Merge pull request #1764 from owncloud/Undelete_directory_fixLukas Reschke2013-02-191-0/+3
| |\ \ \
| | * | | Calculate size for existing directories onlyVictor Dubiniuk2013-02-181-0/+3
| * | | | Merge pull request #1771 from owncloud/mountconfigThomas Müller2013-02-181-1/+1
| |\ \ \ \
| | * | | | no pretty printThomas Mueller2013-02-191-1/+1
| * | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-02-1914-11/+95
| * | | | | Merge pull request #1728 from owncloud/mountconfigThomas Müller2013-02-181-35/+15
| |\| | | |
| | * | | | Merge branch 'mountconfig' of github.com:owncloud/core into mountconfigRobin Appelman2013-02-181-1/+1
| | |\ \ \ \
| | | * | | | look where you are typing ...Jörn Friedrich Dreyer2013-02-161-1/+1
| | | * | | | pretty print jsonJörn Friedrich Dreyer2013-02-161-1/+1
| | * | | | | merge master into mountconfigRobin Appelman2013-02-1842-108/+320
| | |\ \ \ \ \ | | | |/ / / / | | |/| | | |
| | * | | | | Create new mountconfig files in jsonRobin Appelman2013-02-161-31/+14
| | * | | | | Use a parser to read custom mount configuration instead of including the php ...Robin Appelman2013-02-161-1/+2
| | | |_|_|/ | | |/| | |
| * | | | | files_versions no longer contains a personal settings page -> remove the callThomas Mueller2013-02-181-1/+0
| | |_|/ / | |/| | |
| * | | | Merge pull request #1759 from owncloud/redirect_fix_1737Thomas Müller2013-02-181-1/+1
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | fix redirect, use the new routingBjörn Schießle2013-02-181-1/+1
| * | | | Sanitize HTMLLukas Reschke2013-02-181-1/+1
| |/ / /
| * | | [tx-robot] updated from transifexJenkins for ownCloud2013-02-189-6/+26
| * | | Merge pull request #1709 from owncloud/style-cleanup-files_externalThomas Müller2013-02-172-6/+15
| |\ \ \
| | * | | Join split translated stringsBart Visscher2013-02-151-6/+2
| | * | | Style cleanup files_externalBart Visscher2013-02-152-6/+19
| | |/ /
| * | | Merge pull request #1708 from owncloud/style-cleanup-user_ldapBernhard Posselt2013-02-179-69/+206
| |\ \ \
| | * | | Join split translated stringsBart Visscher2013-02-152-13/+6
| | * | | Join short comment linesBart Visscher2013-02-151-4/+2
| | * | | Style cleanup user_ldapBart Visscher2013-02-149-72/+218
| * | | | Merge branch 'master' into fix-googledriveThomas Mueller2013-02-17108-136/+640
| |\ \ \ \
| | * \ \ \ Merge pull request #1699 from owncloud/multiselect-bar-fixThomas Müller2013-02-171-0/+1
| | |\ \ \ \
| | | * | | | fix multiselect bar offset on shared page, close #1339 finallyJan-Christoph Borchardt2013-02-141-0/+1
| | | |/ / /
| | * | | | Merge pull request #1730 from owncloud/ldap_fix_warningsThomas Müller2013-02-171-1/+2
| | |\ \ \ \
| | | * | | | LDAP: check array with isset first to avoid warnings about undefined indexArthur Schiwon2013-02-161-1/+2
| | * | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-02-178-21/+24
| | * | | | | Merge pull request #1729 from owncloud/fix_1727Frank Karlitschek2013-02-161-2/+5
| | |\ \ \ \ \
| | | * | | | | LDAP: announce that OC_USER_BACKEND_GET_DISPLAYNAME is implemented, fixes #1727Arthur Schiwon2013-02-161-2/+5
| | | |/ / / /
| | * / / / / Add missing requesttokenLukas Reschke2013-02-161-0/+1
| | |/ / / /
| | * | / / [tx-robot] updated from transifexJenkins for ownCloud2013-02-1611-3/+44
| | | |/ / | | |/| |
| | * | | Merge pull request #1683 from owncloud/ie-fixesJan-Christoph Borchardt2013-02-151-0/+5
| | |\ \ \
| | | * | | always show checkbox when selected, also in IE8, fix #1621Jan-Christoph Borchardt2013-02-141-0/+5
| | | |/ /
| | * | | check if glob() returns any results, fix for stable45 was already approved by...Björn Schießle2013-02-151-0/+4
| | * | | [tx-robot] updated from transifexJenkins for ownCloud2013-02-1537-28/+73
| | * | | Merge pull request #1662 from owncloud/style-cleanupBart Visscher2013-02-1416-44/+44
| | |\ \ \ | | | |_|/ | | |/| |
| | | * | Fix NoSpaceAfterComma and SpaceBeforeCommaBart Visscher2013-02-1413-34/+34
| | | * | Fix indentation styleBart Visscher2013-02-141-1/+1
| | | * | Fix SpaceBeforeOpenBrace errorsBart Visscher2013-02-147-9/+9
| | | |/