summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2014-06-15219-5995/+7838
* Merge pull request #9028 from owncloud/table-to-paragraph-layout-for-httpsLukas Reschke2014-06-141-29/+25
|\
| * migrate table layout to paragraph layout for HTTPS settingMorris Jobke2014-06-131-29/+25
* | Merge pull request #8618 from owncloud/yet-another-ajax-lost-passwordFrank Karlitschek2014-06-1410-170/+440
|\ \
| * | add proper Exception message for invalid tokenMorris Jobke2014-06-131-2/+5
| * | use array_merge for merging arrays in PHPMorris Jobke2014-06-131-1/+1
| * | complete renaming uid to userIdMorris Jobke2014-06-132-6/+6
| * | remove whitespace at end of lineMorris Jobke2014-06-131-14/+14
| * | Migrate ´ to 'Morris Jobke2014-06-132-5/+5
| * | Remove infield label, add password icon, fix layoutMorris Jobke2014-06-133-2/+12
| * | reformat method call and fix paranthesis mismatchMorris Jobke2014-06-131-8/+8
| * | more style fixesBernhard Posselt2014-06-131-15/+24
| * | use more stuff from core :)Bernhard Posselt2014-06-133-76/+113
| * | Add missing useVictor Dubiniuk2014-06-131-0/+1
| * | Fix check for user existenceVictor Dubiniuk2014-06-131-1/+2
| * | Remove debug outputVictor Dubiniuk2014-06-131-1/+0
| * | Change routes. Update templatesVictor Dubiniuk2014-06-135-24/+27
| * | Changes according to reviewVictor Dubiniuk2014-06-135-156/+154
| * | Use appframeworkVictor Dubiniuk2014-06-138-200/+229
| * | BasicsVictor Dubiniuk2014-06-137-48/+228
| |/
* | [tx-robot] updated from transifexJenkins for ownCloud2014-06-14358-5450/+1627
* | remove double spaceMorris Jobke2014-06-141-1/+1
* | Merge pull request #8978 from owncloud/movie_preview_improvementsMorris Jobke2014-06-141-8/+17
|\ \
| * | movie previews: use file directly when it's stored locally and encryption is ...Georg Ehrke2014-06-101-8/+17
* | | Merge pull request #9025 from owncloud/fix-mail-settingsVolkan Gezer2014-06-131-2/+2
|\ \ \
| * | | fix mail settings save function - ref #8854Morris Jobke2014-06-131-2/+2
| | |/ | |/|
* | | Merge pull request #9018 from owncloud/dbms-socket-supportFrank Karlitschek2014-06-132-26/+20
|\ \ \ | |/ / |/| |
| * | Don't specify host when using a socket.Andreas Fischer2014-06-121-1/+1
| * | Rename variable to indicate that it can be port and socket.Andreas Fischer2014-06-121-4/+4
| * | No need to check the port number as this will fail anyway.Andreas Fischer2014-06-121-1/+1
| * | Move getValue() to where required. This actually is not required "global data".Andreas Fischer2014-06-121-9/+5
| * | Move check for : to where it belongs, getting rid of $socket = false;Andreas Fischer2014-06-121-8/+5
| * | Extract common variables of $connectionParams.Andreas Fischer2014-06-121-11/+8
| * | Inline $port expression, getting rid of $port variable.Andreas Fischer2014-06-121-2/+1
| * | Fixes based on suggestionsjosh4trunks2014-06-111-11/+7
| * | Update notes on dbhostjosh4trunks2014-06-051-1/+1
| * | Fix variable not always being defined.josh4trunks2014-06-041-0/+2
| * | Work with MySQL Socketsjosh4trunks2014-06-041-1/+8
* | | Merge pull request #9010 from owncloud/fix_8941_admin_settings_messageMorris Jobke2014-06-1310-457/+0
|\ \ \
| * | | move mail template editor from core to standalone templateeditor repoJörn Friedrich Dreyer2014-06-1310-457/+0
| * | | access admin settings result message correctlyJörn Friedrich Dreyer2014-06-131-1/+1
|/ / /
* | | Merge pull request #8714 from owncloud/minor-fixesMorris Jobke2014-06-132-4/+4
|\ \ \
| * | | fix some minor issuesVolkan Gezer2014-06-132-4/+4
* | | | [tx-robot] updated from transifexJenkins for ownCloud2014-06-1342-186/+263
* | | | Merge pull request #9017 from owncloud/maxheartbeatintervalMorris Jobke2014-06-132-1/+28
|\ \ \ \ | |/ / / |/| | |
| * | | Added unit tests for heartbeat interval min/max valuesVincent Petry2014-06-121-1/+23
| * | | Added max heartbeat interval to prevent integer overflowVincent Petry2014-06-121-0/+5
* | | | Merge pull request #8968 from owncloud/scanner-parent-repairVincent Petry2014-06-122-39/+89
|\ \ \ \ | |/ / / |/| | |
| * | | remove unused argumentRobin Appelman2014-06-101-3/+2
| * | | add some commentsRobin Appelman2014-06-101-0/+2