summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2013-04-27934-28068/+28442
* Code styleRobin Appelman2013-04-261-206/+231
* Merge pull request #3136 from owncloud/mount-cleanupicewind19912013-04-2615-201/+326
|\
| * Further seperation of mount management logicRobin Appelman2013-04-2611-171/+235
| * Cache: seperate handing of numeric storage id's to it's own classRobin Appelman2013-04-264-30/+91
* | Merge pull request #3002 from owncloud/priorize_common_languagesBart Visscher2013-04-263-4/+21
|\ \
| * | Make divider not selectablekondou2013-04-192-5/+4
| * | Priorize common languages.kondou2013-04-183-4/+22
* | | Merge pull request #3026 from owncloud/cli-no-sessionBart Visscher2013-04-261-1/+3
|\ \ \
| * | | Don't start the session when in cli modeRobin Appelman2013-04-261-1/+3
* | | | Merge pull request #3028 from owncloud/simplyfy-resource-locatingBart Visscher2013-04-261-42/+17
|\ \ \ \
| * | | | Simplify app js locating for layout pagesBart Visscher2013-04-261-11/+8
| * | | | Simplify app css locating for layout pagesBart Visscher2013-04-261-31/+9
| |/ / /
* | | | Merge pull request #2955 from owncloud/displaynames-numericBart Visscher2013-04-261-1/+1
|\ \ \ \
| * | | | Fix OC_User::getDisplaynames when using numeric user id'sRobin Appelman2013-04-171-1/+1
* | | | | Merge pull request #2783 from Kondou-ger/improve_passwordresetscreenBart Visscher2013-04-262-12/+21
|\ \ \ \ \
| * | | | | Fis syntax error and add user icon.kondou2013-04-241-2/+3
| * | | | | Oneliners, <br>, proper errors & print_unescaped()kondou2013-04-231-8/+6
| * | | | | Don't split translation lineskondou2013-04-231-10/+4
| * | | | | Fix syntax error.kondou2013-04-231-1/+1
| * | | | | Improve the password reset screen.kondou2013-04-232-10/+26
* | | | | | Merge pull request #1872 from herbrechtsmeier/forcessl-with-ssl-proxyBart Visscher2013-04-261-6/+7
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | request.php: add type check to the not empty check of a stringherbrechtsmeier2013-03-091-5/+5
| * | | | | Overwrite host and webroot when forcessl is enabledherbrechtsmeier2013-03-091-3/+4
* | | | | | Merge pull request #2787 from owncloud/fix-password-autocomplete-2632Bart Visscher2013-04-261-2/+12
|\ \ \ \ \ \
| * | | | | | modify password clone to password type right on submit to prevent the browser...Morris Jobke2013-04-191-1/+10
| * | | | | | turn off autocompletion for password fieldMorris Jobke2013-04-071-1/+2
* | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-04-26721-28730/+26862
* | | | | | | adding resource typeThomas Mueller2013-04-261-0/+3
* | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-04-26190-3783/+3111
* | | | | | | Merge pull request #3098 from jerrac/displaynamesaveontimeoutMorris Jobke2013-04-253-40/+46
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | |
| * | | | | | Fixed comment in personal.js. Changed message text in changedisplayname.php.David Reagan2013-04-232-2/+2
| * | | | | | Made saving the display name work the same way as the email address. Fixed a ...David Reagan2013-04-233-40/+46
* | | | | | | Merge pull request #3132 from owncloud/mount-setupfsicewind19912013-04-253-6/+7
|\ \ \ \ \ \ \
| * | | | | | | Have the filecache updater testcase clean the filesystem properlyRobin Appelman2013-04-252-6/+4
| * | | | | | | Make sure the filesystem is initialized when searching for mountsRobin Appelman2013-04-251-0/+3
* | | | | | | | Correct the parameter descriptionLukas Reschke2013-04-251-1/+1
* | | | | | | | Correct function descriptionLukas Reschke2013-04-251-1/+1
* | | | | | | | Merge pull request #3126 from owncloud/json-utf8Thomas Tanghus2013-04-251-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | use utf-8 encoding for jsonBernhard Posselt2013-04-251-1/+1
* | | | | | | | | Merge pull request #3094 from owncloud/log-ajaxBart Visscher2013-04-252-8/+6
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | fix syntax layoutMorris Jobke2013-04-231-3/+6
| * | | | | | | | remove log sort in admin sectionMorris Jobke2013-04-231-5/+0
| * | | | | | | | fix logical issue while retrieving log via ajaxMorris Jobke2013-04-231-1/+1
| | |_|_|_|/ / / | |/| | | | | |
* | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-04-2523-52/+60
* | | | | | | | Merge pull request #2993 from owncloud/resolve_apps_lib_pathThomas Tanghus2013-04-241-2/+9
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | Added explanationThomas Tanghus2013-04-181-0/+1
| * | | | | | | Let autoloader resolve paths under apps lib directory.Thomas Tanghus2013-04-181-2/+8
* | | | | | | | Merge pull request #3108 from owncloud/fileactions-orderLukas Reschke2013-04-241-7/+7
|\ \ \ \ \ \ \ \
| * | | | | | | | Files: fix the order fileactions are computed for a fileRobin Appelman2013-04-241-7/+7