summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
| |/ /
* | | Merge pull request #1715 from owncloud/fixing-1640-masterThomas Müller2013-02-151-1/+1
|\ \ \
| * | | changing the bit mask of OC_USER_BACKEND_SET_DISPLAYNAMEThomas Mueller2013-02-151-1/+1
* | | | Merge pull request #1683 from owncloud/ie-fixesJan-Christoph Borchardt2013-02-155-14/+25
|\ \ \ \
| * | | | exchange bright caret with dark triangleJan-Christoph Borchardt2013-02-141-1/+1
| * | | | only style text, password and search inputs like inputs, instead of using uns...Jan-Christoph Borchardt2013-02-141-1/+2
| * | | | no ugly border around checkboxes or radio buttonsJan-Christoph Borchardt2013-02-141-1/+1
| * | | | fix user delete button not showing in IE, another SVG replacement issueJan-Christoph Borchardt2013-02-141-1/+1
| * | | | fix navigation icons SVG replacement, also hover and active opacity for IEJan-Christoph Borchardt2013-02-142-11/+16
| * | | | fix caret on installation page for IEJan-Christoph Borchardt2013-02-141-1/+1
| * | | | 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
* | | | Merge pull request #1700 from owncloud/fixing-1680-masterJan-Christoph Borchardt2013-02-153-11/+32
|\ \ \ \ | |_|/ / |/| | |
| * | | sort languages based on display name not the iso codeThomas Mueller2013-02-141-9/+19
| * | | some more missing language code fallbacksThomas Mueller2013-02-141-0/+6
| * | | adding language code ocThomas Mueller2013-02-141-1/+2
| * | | add some missing fallback language mappingsThomas Mueller2013-02-141-1/+5
| * | | filter l10n-* filesThomas Mueller2013-02-141-1/+1
* | | | Merge pull request #1714 from owncloud/fixing-1677-masterFrank Karlitschek2013-02-151-0/+3
|\ \ \ \
| * | | | we should never drop a databaseThomas Mueller2013-02-151-0/+3
|/ / / /
* | | | Merge pull request #1712 from owncloud/debug-exceptionThomas Müller2013-02-141-6/+6
|\ \ \ \
| * | | | set DEBUG from xdebug session before we first use itRobin Appelman2013-02-151-6/+6