summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Update 3rdpartyLukas Reschke2013-04-101-0/+0
* Merge pull request #2781 from owncloud/fix-2592Bernhard Posselt2013-04-101-1/+2
|\
| * Initialize collectionTypes variable as falseMichael Gapczynski2013-04-081-0/+1
| * Correct undefined variable in post_shared hook, fixes #2592Michael Gapczynski2013-04-071-1/+1
* | Merge pull request #2850 from owncloud/touch-newfileBernhard Posselt2013-04-102-1/+7
|\ \
| * | Fix touch for creating new filesRobin Appelman2013-04-102-1/+7
* | | Merge pull request #2851 from owncloud/added-user-quotaBernhard Posselt2013-04-101-12/+19
|\ \ \ | |/ / |/| |
| * | Add the quota change listeners to newly added user entries in the user listRobin Appelman2013-04-101-12/+19
|/ /
* | size of the trash bin could be incorrect, remove it for all users to enforce ...Björn Schießle2013-04-102-36/+6
* | only add filesize to trashbin size if the file was moved to the trash bin suc...Björn Schießle2013-04-101-2/+4
* | [tx-robot] updated from transifexJenkins for ownCloud2013-04-1069-799/+1074
* | Merge pull request #2758 from Kondou-ger/refactor_OCdialogsBart Visscher2013-04-092-154/+312
|\ \
| * | Fix OC.dialogs.form()kondou2013-04-091-3/+3
| * | Remove manual mimetype checking.kondou2013-04-081-5/+1
| * | Make files _and_ directorys selectable/browsable.kondou2013-04-061-10/+13
| * | Make files selectable again.kondou2013-04-061-3/+3
| * | Fix repeating directory names.kondou2013-04-062-15/+18
| * | Make directories show at top.kondou2013-04-061-2/+12
| * | Make directories clickable.kondou2013-04-061-13/+23
| * | Small fixeskondou2013-04-062-37/+37
| * | Refactor OCdialogs.kondou2013-04-062-152/+288
| |/
* | Merge pull request #2834 from owncloud/suppress-setup-warningLukas Reschke2013-04-091-1/+1
|\ \
| * | Suppress the notice from the nullbyte checkBart Visscher2013-04-091-1/+1
* | | Merge pull request #2147 from eMerzh/split_configeMerzh2013-04-091-7/+17
|\ \ \ | |/ / |/| |
| * | Small perf improvement : filter before sortBrice Maron2013-03-091-3/+3
| * | Allow to load splited config files ref #946Brice Maron2013-03-061-7/+17
* | | Merge pull request #2811 from owncloud/app-version-checkThomas Müller2013-04-091-0/+8
|\ \ \
| * | | used oc version 5.0.3Bernhard Posselt2013-04-091-1/+1
| * | | added yet another test for the verion compare check due to mailBernhard Posselt2013-04-091-0/+8
* | | | Merge pull request #2815 from owncloud/default-quotaThomas Tanghus2013-04-091-1/+1
|\ \ \ \
| * | | | Users: fix "Other.." quota option for the default quotaRobin Appelman2013-04-091-1/+1
* | | | | Merge pull request #2819 from Kondou-ger/fix_2730Bernhard Posselt2013-04-091-4/+4
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Fix #2730kondou2013-04-091-4/+4
|/ / / /
* | | | Merge pull request #2801 from OpenLarry/patch-1Bernhard Posselt2013-04-091-2/+2
|\ \ \ \
| * | | | fixes #2679OpenLarry2013-04-091-2/+2
* | | | | Merge pull request #2697 from owncloud/button-css-fixesBernhard Posselt2013-04-091-4/+22
|\ \ \ \ \
| * | | | | group some selectors againJan-Christoph Borchardt2013-04-031-7/+2
| * | | | | add styles for disabled input fieldsJan-Christoph Borchardt2013-04-031-0/+9
| * | | | | button selector cleanupJan-Christoph Borchardt2013-04-031-5/+19
* | | | | | Merge pull request #2754 from owncloud/cookie-pathBernhard Posselt2013-04-092-4/+7
|\ \ \ \ \ \
| * | | | | | Juse send the cookies in the ownCloud directoryLukas Reschke2013-04-062-4/+7
| | |_|_|_|/ | |/| | | |
* | | | | | Merge pull request #2799 from owncloud/add-mimetype-filter-to-getdirectorycon...Bernhard Posselt2013-04-092-2/+4
|\ \ \ \ \ \
| * | | | | | Add mimetype filter to getDirectoryContent functionBart Visscher2013-04-082-2/+4
* | | | | | | Merge pull request #2797 from owncloud/fixing-2792-masterBjörn Schießle2013-04-091-0/+3
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | |
| * | | | | | fixes #2792 - only touch if writableThomas Mueller2013-04-081-0/+3
| |/ / / / /
* | | | | | Merge pull request #2764 from owncloud/remove-limit-from-count-queryBernhard Posselt2013-04-091-1/+1
|\ \ \ \ \ \
| * | | | | | Remove wrong limit parameter from count query in compatibility functionBart Visscher2013-04-061-1/+1
* | | | | | | Merge pull request #2798 from owncloud/fixing-2789-masterBernhard Posselt2013-04-092-1/+9
|\ \ \ \ \ \ \
| * | | | | | | fixes #2789 - no internet connectivity check if there is non on purposeThomas Mueller2013-04-082-1/+9
| | |/ / / / / | |/| | | | |
* | | | | | | Merge pull request #2800 from owncloud/fixing-2743-masterBernhard Posselt2013-04-091-1/+1
|\ \ \ \ \ \ \