summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* LDAP: fix generation of alternate internal name on conflicts. Use also smalle...Arthur Schiwon2013-05-301-2/+2
* Merge pull request #3509 from owncloud/update_jquery_to_1_10Jörn Friedrich Dreyer2013-05-304-5/+10
|\
| * Update jquery to 1.10.0 & add jquery-migrate 1.2.1kondou2013-05-274-5/+10
* | Merge pull request #3529 from owncloud/folder-permissionsicewind19912013-05-304-12/+62
|\ \
| * | Implement getDirectoryPermissions() in Shared Permissions, fixes #2846Michael Gapczynski2013-05-292-1/+31
| * | Only retrieve the current user's permissionsMichael Gapczynski2013-05-292-5/+6
| * | Cache: provide a function to get the permissions of all files in a folder wit...Robin Appelman2013-05-292-11/+30
* | | [tx-robot] updated from transifexJenkins for ownCloud2013-05-30624-1663/+2479
* | | Merge pull request #3533 from owncloud/signature-delimiterThomas Tanghus2013-05-291-1/+1
|\ \ \
| * | | fix wrong signature delimiter - fix #3523Morris Jobke2013-05-291-1/+1
* | | | Merge pull request #3507 from owncloud/remove_unused_varsMorris Jobke2013-05-2916-722/+761
|\ \ \ \ | |/ / / |/| | |
| * | | reformat codeFlorin Peter2013-05-292-16/+16
| * | | changed " to 'Florin Peter2013-05-293-13/+13
| * | | Merge branch 'master' into remove_unused_varsFlorin Peter2013-05-292-23/+34
| |\ \ \ | |/ / / |/| | |
* | | | Merge pull request #3532 from owncloud/scan-updateMichael Gapczynski2013-05-291-6/+9
|\ \ \ \
| * | | | Organize conditionals in a better orderMichael Gapczynski2013-05-291-8/+4
| * | | | Only update metadata that has changedMichael Gapczynski2013-05-291-2/+9
* | | | | Merge pull request #3530 from owncloud/cache-mimeiconicewind19912013-05-291-17/+25
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Style fixesMichael Gapczynski2013-05-291-21/+21
| * | | | Cache mimetype iconsRobin Appelman2013-05-291-7/+15
|/ / / /
| | * | changed l10n to full sentencesFlorin Peter2013-05-291-14/+25
| | * | changes l10n after reviewFlorin Peter2013-05-291-5/+5
| | * | changes after reviewFlorin Peter2013-05-291-1/+5
| | * | Merge branch 'master' into remove_unused_varsFlorin Peter2013-05-29692-33031/+2589
| | |\ \ | |_|/ / |/| | |
* | | | [tx-robot] updated from transifexJenkins for ownCloud2013-05-29552-1868/+1887
|/ / /
* | | Merge pull request #3511 from owncloud/sessionclassicewind19912013-05-2820-238/+336
|\ \ \
| * | | didn't mean to commit this yetRobin Appelman2013-05-285-670/+0
| * | | fixed missing convert to new session handlerFlorin Peter2013-05-281-3/+2
| * | | Merge branch 'sessionclass' of https://github.com/owncloud/core into sessionc...Florin Peter2013-05-285-8/+548
| |\ \ \
| | * | | implement ArrayInterface with SessionRobin Appelman2013-05-285-8/+548
| * | | | fixed encryption session namespace to avoid problemsFlorin Peter2013-05-285-11/+11
| |/ / /
| * | | merge master into sessionclassRobin Appelman2013-05-28669-32892/+2398
| |\ \ \ | |/ / / |/| | |
* | | | Merge pull request #3179 from pawl/patch-1Jörn Friedrich Dreyer2013-05-281-1/+2
|\ \ \ \
| * | | | Improve IE CompatibilityPaul Brown2013-04-291-1/+2
* | | | | Merge pull request #2778 from Kondou-ger/optimize_picturesJörn Friedrich Dreyer2013-05-28118-30919/+353
|\ \ \ \ \
| * | | | | Add shellscript for optimization.kondou2013-04-131-0/+20
| * | | | | Optimize svgs with scour.kondou2013-04-1261-30919/+333
| * | | | | Optimize pictures with optipng.kondou2013-04-0756-0/+0
* | | | | | Merge pull request #3488 from zafi/masterblizzz2013-05-281-0/+6
|\ \ \ \ \ \
| * | | | | | The "lost password" field depends on OC_USER_BACKEND_SET_PASSWORDzafi2013-05-251-0/+6
| | | | * | | fix syntax errorRobin Appelman2013-05-281-1/+1
| | | | * | | provide a dummy session for CLIRobin Appelman2013-05-281-0/+2
| | | | * | | check fix if session start is successfullRobin Appelman2013-05-281-1/+2
| | | | * | | Fix session not working errorRobin Appelman2013-05-282-2/+4
| | | | * | | Use the new session wrapperRobin Appelman2013-05-288-57/+57
| | | | * | | Abstract the session away in a classRobin Appelman2013-05-285-0/+221
| | | | | * | Merge branch 'master' into remove_unused_varsFlorin Peter2013-05-28550-1978/+2058
| | | | | |\ \ | |_|_|_|_|/ / |/| | | | | |
* | | | | | | Merge pull request #3512 from owncloud/file_encryption_session_fixFlorinPeter2013-05-283-17/+56
|\ \ \ \ \ \ \
| * | | | | | | fix for undefined indexFlorin Peter2013-05-281-1/+1
| * | | | | | | fix for losing private key while being logged in and accessing a public linkFlorin Peter2013-05-283-16/+55
|/ / / / / / /