summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2013-02-1962-559/+752
* Merge pull request #1728 from owncloud/mountconfigThomas Müller2013-02-183-44/+223
|\
| * 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-18127-965/+1378
| |\ \ | | |/ | |/|
| * | Create new mountconfig files in jsonRobin Appelman2013-02-162-35/+26
| * | Use a parser to read custom mount configuration instead of including the php ...Robin Appelman2013-02-163-8/+200
* | | Merge pull request #1767 from owncloud/fixing-1766-masterLukas Reschke2013-02-181-1/+0
|\ \ \
| * | | files_versions no longer contains a personal settings page -> remove the callThomas Mueller2013-02-181-1/+0
|/ / /
* | | Merge pull request #1762 from owncloud/user_password_fixThomas Müller2013-02-182-3/+3
|\ \ \
| * | | Do not set password if it has't providedVictor Dubiniuk2013-02-181-2/+2
| * | | Correct new password input nameVictor Dubiniuk2013-02-181-1/+1
|/ / /
* | | Merge pull request #1724 from owncloud/long-storage-idFrank Karlitschek2013-02-184-4/+45
|\ \ \
| * | | Cache: hash long storage ids to ensure they fit in the databaseRobin Appelman2013-02-154-4/+45
| |/ /
* | | 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
* | | Merge pull request #1751 from owncloud/sanitizeHTMLFrank Karlitschek2013-02-182-2/+2
|\ \ \ | |/ / |/| |
| * | Sanitize HTMLLukas Reschke2013-02-181-1/+1
| * | Sanitize user inputLukas Reschke2013-02-181-1/+1
|/ /
* | [tx-robot] updated from transifexJenkins for ownCloud2013-02-1855-551/+649
* | 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 #1719 from owncloud/fixing-1659-masterThomas Müller2013-02-174-15/+73
|\ \ \
| * | | class Mapper no respects an unchanged physical root which will be excluded fr...Thomas Mueller2013-02-151-12/+12
| * | | fix error in recursive searchThomas Mueller2013-02-151-3/+3
| * | | new test cases added to search in sub foldersThomas Mueller2013-02-151-0/+16
| * | | folder should be created :-(Thomas Mueller2013-02-151-0/+2
| * | | adding a new test class for mapped local using a dot in the datadir - reflect...Thomas Mueller2013-02-151-0/+40
* | | | 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 pull request #1642 from owncloud/fix-googledriveThomas Müller2013-02-171-1/+1
|\ \ \ \ \
| * \ \ \ \ Merge branch 'master' into fix-googledriveThomas Mueller2013-02-17651-10889/+24460
| |\ \ \ \ \ | |/ / / / / |/| | | | |
* | | | | | 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-1737-171/+199
* | | | | | | 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-1642-178/+259
| |_|_|_|/ |/| | | |
* | | | | Merge pull request #1717 from owncloud/fix-warning-templateicewind19912013-02-152-1/+3
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Fix strict standard warning in user templateRobin Appelman2013-02-152-1/+3
|/ / / /
* | | | Merge pull request #1694 from owncloud/users-headerblizzz2013-02-151-2/+8
|\ \ \ \ | |_|_|/ |/| | |
| * | | also fix header alignment for multiselect columnsJan-Christoph Borchardt2013-02-141-0/+1
| * | | fix Users settings header bar element positioning, close #1686Jan-Christoph Borchardt2013-02-141-2/+7
| |/ /
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-19 20:07:25 +0000