summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | 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
* | | | | | | | | | Merge pull request #3096 from owncloud/add_missing_space_for_new_groupsRaghu Nayyar2013-04-243-11/+11
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Add space around checkboxes.kondou2013-04-241-2/+4
| * | | | | | | | | | Fix #3095.kondou2013-04-243-11/+9
| | |_|/ / / / / / / | |/| | | | | | | |
* | | | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-04-24185-1461/+1519
* | | | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-04-24108-755/+1071
| |_|_|_|_|_|_|_|/ |/| | | | | | | |
* | | | | | | | | Merge pull request #3112 from owncloud/markdown-mimetypeicewind19912013-04-241-1/+5
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Add markdown to mimetype listRobin Appelman2013-04-241-1/+5
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Merge pull request #3111 from owncloud/csp-audioicewind19912013-04-242-2/+3
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Allow loading of external media ressourcesLukas Reschke2013-04-242-2/+3
* | | | | | | | | | Merge pull request #3106 from IMM0rtalis/xframe_restriction_configLukas Reschke2013-04-242-1/+10
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | - xframe restriction configurable nowFlorian Scholz2013-04-242-1/+10
| | |/ / / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge pull request #3109 from owncloud/fix-2928Morris Jobke2013-04-241-0/+1
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | |
| * | | | | | | | | fix wrong shared icon descriptionMorris Jobke2013-04-241-0/+1
| |/ / / / / / / /
* | | | | | | | | Merge pull request #3100 from owncloud/ensure_index_phpDaniel Molkentin2013-04-243-0/+8
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | sync parameters in setup.php with the ones in the actual .htaccessDaniel Molkentin2013-04-241-0/+4
| * | | | | | | | | Try to prefer index.php over index.html in the same directoryDaniel Molkentin2013-04-242-0/+4