summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #2515 from yannickoo/masterJan-Christoph Borchardt2013-03-211-2/+2
|\ | | | | No Scrolling for more than approximately 10 Applications
| * Fixed typoyannickoo2013-03-211-1/+1
| |
| * No Scrolling for more than approximately 10 Applicationsyannickoo2013-03-211-2/+2
|/
* Add phpdoc documentation to the Storage interfaceRobin Appelman2013-03-211-14/+255
|
* Merge pull request #2447 from owncloud/fix_namespace_in_autoloaderLukas Reschke2013-03-214-0/+33
|\ | | | | Remove leading and trailing backslashes in classname. Ref #2310
| * Remove space before parethesisVicDeo2013-03-201-1/+1
| |
| * Show a warning in the installer if the used PHP version is vulnerable to the ↵Lukas Reschke2013-03-201-0/+7
| | | | | | | | NULL Byte attack
| * Check if the installed PHP version has a fix for the nullbyte vulnerabilityLukas Reschke2013-03-201-0/+5
| |
| * some basic unit test for loading classesThomas Mueller2013-03-191-0/+19
| |
| * Remove leading and trailing backslashes in classname. Ref #2310VicDeo2013-03-191-0/+2
| |
* | [tx-robot] updated from transifexJenkins for ownCloud2013-03-2120-214/+219
| |
* | Add link to issue creationLukas Reschke2013-03-201-1/+1
| | | | | | We're directly linking users to this in ownCloud when they click "report a bug" - this often confused people because they don't know where to report the issue exactly.
* | Merge pull request #2324 from owncloud/html_video_tagBjörn Schießle2013-03-201-1/+8
|\ \ | | | | | | use html video tag to preview videos for public shares
| * | use html video tag to preview videos for public sharesBjörn Schießle2013-03-141-1/+8
| | |
* | | [tx-robot] updated from transifexJenkins for ownCloud2013-03-2022-108/+139
| | |
* | | Merge pull request #2457 from KnownSubset/masterFrank Karlitschek2013-03-191-0/+1
|\ \ \ | | | | | | | | Extend .gitignore for better compatability with phpStorm/IntelliJ
| * | | Update the ignores to include project structure file *.imlNathan Dauber2013-03-191-0/+1
|/ / /
* | | Merge pull request #2244 from owncloud/fixing-windows-datadir-masterBernhard Posselt2013-03-191-0/+4
|\ \ \ | | | | | | | | remove trailing slash from data dir on windows
| * \ \ Merge branch 'master' into fixing-windows-datadir-masterThomas Mueller2013-03-19227-2986/+6147
| |\ \ \
| * | | | using rtrimThomas Mueller2013-03-191-4/+1
| | | | |
| * | | | fixes #2081Thomas Mueller2013-03-121-0/+7
| | | | |
* | | | | Merge pull request #2451 from owncloud/fix_npe_masterBernhard Posselt2013-03-191-1/+5
|\ \ \ \ \ | | | | | | | | | | | | fix npe when createStorage() returns null
| * | | | | fix npe when createStorage() returns nullJörn Friedrich Dreyer2013-03-191-1/+5
| | |/ / / | |/| | |
* | | | | Merge pull request #2445 from owncloud/extend_public_apiThomas Müller2013-03-191-0/+10
|\ \ \ \ \ | |/ / / / |/| | | | add a searchbymime to the public api. Please all remember that access to...
| * | | | add a searchbymime to the public api. Please all remember that access to ↵Frank Karlitschek2013-03-191-0/+10
| | |_|/ | |/| | | | | | | | | | internal oc classes will be disabled for all app for ownCloud 6. So please port yur stuff to the public api :-)
* | | | LDAP: user exists check on getHome, otherwise check will be performed with ↵Arthur Schiwon2013-03-191-0/+5
| | | | | | | | | | | | | | | | wrong configs on a multi LDAP server setup.
* | | | LDAP: avoid irritating log outputArthur Schiwon2013-03-191-1/+4
| | | |
* | | | LDAP: check whether user exists for before trying to determine displaynameArthur Schiwon2013-03-191-0/+4
| | | |
* | | | LDAP: check first whether group exists in this backend before doing other ↵Arthur Schiwon2013-03-191-0/+9
| | | | | | | | | | | | | | | | operations
* | | | LDAP: remove unnecessary func call, was a leftover from earlier refactorArthur Schiwon2013-03-191-1/+0
| | | |
* | | | LDAP: specify appid when selecting from appconfigArthur Schiwon2013-03-191-1/+2
|/ / /
* | | Merge pull request #2440 from owncloud/js_version_parameterBernhard Posselt2013-03-191-4/+5
|\ \ \ | | | | | | | | Add hashed version parameter to js and css. Ref #1520 and many more ;)
| * | | Add hashed version parameter to js and css. Ref #1520 and many more ;)Thomas Tanghus2013-03-191-4/+5
|/ / /
* | | Merge pull request #2433 from owncloud/db_primary_keysBernhard Posselt2013-03-192-1/+55
|\ \ \ | | | | | | | | Additional indexes and missing primary keys
| * | | Add indexes and primary keys.Thomas Tanghus2013-03-192-1/+55
| | | |
| * | | Revert "Add indexes and primary keys."Thomas Tanghus2013-03-192-55/+1
| | | | | | | | | | | | | | | | This reverts commit 3b33712dc9f4a3debfb98bc892034d7e41804a17.
| * | | Add indexes and primary keys.Thomas Tanghus2013-03-192-1/+55
| | | |
* | | | Merge pull request #2434 from owncloud/userlist_no_dupesBernhard Posselt2013-03-191-15/+65
|\ \ \ \ | |/ / / |/| | | User list: Avoid dupes and better sorting. Fix #2420
| * | | User list: Avoid dupes and better sorting. Fix #2420Thomas Tanghus2013-03-191-15/+65
|/ / /
* | | [tx-robot] updated from transifexJenkins for ownCloud2013-03-1927-311/+458
| | |
* | | Merge pull request #2363 from owncloud/uploadsizeBernhard Posselt2013-03-184-5/+22
|\ \ \ | | | | | | | | Improve behaviour when max upload size is unknown
| * | | Don't show storage space warning when the free space can't be determinedRobin Appelman2013-03-151-2/+10
| | | |
| * | | Don't block uploads if the max upload size is unknownRobin Appelman2013-03-152-2/+4
| | | |
| * | | Improve handeling of unlimited max upload sizeRobin Appelman2013-03-153-2/+9
| | | |
* | | | Merge pull request #2408 from dcneiner/infield-upgradeJan-Christoph Borchardt2013-03-182-36/+51
|\ \ \ \ | | | | | | | | | | Upgraded infield labels plugin to the latest version. Updated invocation...
| * | | | Upgraded infield labels plugin to the latest version. Updated invocation to ↵Doug Neiner2013-03-172-36/+51
| | | | | | | | | | | | | | | | | | | | opt-in to pollling at the same duration you were using before, 100ms
* | | | | Merge pull request #2417 from owncloud/trash_more_error_logsThomas Tanghus2013-03-182-0/+3
|\ \ \ \ \ | | | | | | | | | | | | add some error logs to the trash bin app
| * | | | | add some error logs to the trash bin appBjörn Schießle2013-03-182-0/+3
|/ / / / /
* | | | | Merge pull request #2411 from owncloud/fix_magicquotesFrank Karlitschek2013-03-181-2/+2
|\ \ \ \ \ | |/ / / / |/| | | | remove deprecated call
| * | | | remove deprecated callFrank Karlitschek2013-03-171-2/+2
|/ / / /