summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #1881 from owncloud/safemode_checkThomas Müller2013-02-241-0/+5
|\
| * add a safe_mode checkFrank Karlitschek2013-02-211-0/+5
|/
* [tx-robot] updated from transifexJenkins for ownCloud2013-02-2411-11/+11
* Merge pull request #1879 from owncloud/fix-webdav-quotaMichael Gapczynski2013-02-231-1/+2
|\
| * Reuse $freeSpace variableMichael Gapczynski2013-02-231-1/+1
| * Don't throw insufficient storage exception if free space is unknownMichael Gapczynski2013-02-231-1/+2
|/
* Merge pull request #1862 from owncloud/whitespace-cleanupThomas Müller2013-02-2340-453/+449
|\
| * Whitespace fixesBart Visscher2013-02-2240-453/+449
* | [tx-robot] updated from transifexJenkins for ownCloud2013-02-2321-278/+291
|/
* Merge pull request #1855 from owncloud/userlist_load_displaynamesBernhard Posselt2013-02-222-6/+8
|\
| * Fetch displayname in userlist ajax requests. Refs #1681Thomas Tanghus2013-02-222-6/+8
* | Merge pull request #1859 from owncloud/blacklist-fixBernhard Posselt2013-02-221-7/+15
|\ \
| * | Add OC\Files\Filesystem::isFileBlacklistedRobin Appelman2013-02-221-7/+15
* | | Merge pull request #1711 from owncloud/style-cleanupJörn Friedrich Dreyer2013-02-2230-129/+308
|\ \ \
| * | | Fix review issuesBart Visscher2013-02-222-17/+18
| * | | Join split translated stringsBart Visscher2013-02-215-19/+8
| * | | Style cleanup settingsBart Visscher2013-02-218-34/+64
| * | | Style cleanup core dirBart Visscher2013-02-219-43/+143
| * | | Style cleanup files_versionsBart Visscher2013-02-213-17/+26
| * | | Style cleanup files_trashbinBart Visscher2013-02-211-17/+36
| * | | Style cleanup files_sharingBart Visscher2013-02-218-19/+50
* | | | Merge pull request #1854 from owncloud/fix_mount_orderblizzz2013-02-221-2/+3
|\ \ \ \ | |_|_|/ |/| | |
| * | | fix order of mount commandsGeorg Ehrke2013-02-221-2/+3
|/ / /
* | | Merge pull request #1849 from owncloud/mount_users_homeblizzz2013-02-221-0/+1
|\ \ \
| * | | mount users home before write/read file to it, necessary to deal with externa...Björn Schießle2013-02-221-0/+1
|/ / /
* | | Merge pull request #1848 from owncloud/keep_transparencyFrank Karlitschek2013-02-221-0/+15
|\ \ \
| * | | keep transparency when resizing or cropping png/gifJörn Friedrich Dreyer2013-02-221-0/+15
|/ / /
* | | Merge pull request #1838 from owncloud/fix-changedisplayname-callThomas Müller2013-02-221-2/+2
|\ \ \
| * | | Fix error path in changedisplayname callBart Visscher2013-02-221-2/+2
| |/ /
* | | [tx-robot] updated from transifexJenkins for ownCloud2013-02-22373-2570/+3010
* | | Merge pull request #1835 from owncloud/normalize-giant-caretBernhard Posselt2013-02-213-1/+103
|\ \ \ | |/ / |/| |
| * | fix giant advanced caret in installationJan-Christoph Borchardt2013-02-213-1/+103
* | | Merge pull request #1836 from owncloud/update-version-remarkLukas Reschke2013-02-211-2/+2
|\ \ \ | |/ / |/| |
| * | Update hint by the internal version number.Bart Visscher2013-02-211-2/+2
|/ /
* | Merge pull request #1830 from owncloud/fix_css_numberFrank Karlitschek2013-02-211-5/+6
|\ \
| * | make number-input fields look like they shouldArthur Schiwon2013-02-211-5/+6
* | | rename app to 'deleted files'Björn Schießle2013-02-211-1/+1
|/ /
* | Merge pull request #1812 from owncloud/add-logging-to-webdav-test-masterBjörn Schießle2013-02-211-1/+2
|\ \
| * | WebDAV-Testing:Thomas Mueller2013-02-201-1/+2
* | | Merge pull request #1768 from houqp/issue_1739Björn Schießle2013-02-212-8/+9
|\ \ \
| * | | bug fix for issue 1739, two changes included:Qingping Hou2013-02-182-8/+9
* | | | [tx-robot] updated from transifexJenkins for ownCloud2013-02-21134-1230/+4224
* | | | Merge pull request #1773 from owncloud/trash_bin_delete_selectedBjörn Schießle2013-02-206-33/+82
|\ \ \ \ | |_|/ / |/| | |
| * | | Merge branch 'master' into trash_bin_delete_selectedThomas Mueller2013-02-2054-207/+274
| |\ \ \ | |/ / / |/| | |
* | | | Merge pull request #1809 from owncloud/fix_ie_deletefolderBjörn Schießle2013-02-202-5/+5
|\ \ \ \
| * | | | replaced for in loops with normal enumerating loops to fix #1803Bernhard Posselt2013-02-202-5/+5
|/ / / /
* | | | Merge pull request #1806 from eMerzh/ref_1799Bernhard Posselt2013-02-201-1/+5
|\ \ \ \
| * | | | Add message when trouble sending email ref #1799Brice Maron2013-02-201-1/+5
|/ / / /
* | | | 5.0.0 beta 1v5.0.0beta1Frank Karlitschek2013-02-201-2/+2
* | | | Merge pull request #1738 from owncloud/fix_multiselect_in_settingsFrank Karlitschek2013-02-201-2/+3
|\ \ \ \