aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* get all display names from users in a given groupBjörn Schießle2013-01-256-7/+54
* get all display namesBjörn Schießle2013-01-254-5/+53
* add display name to title instead if login-IDBjörn Schießle2013-01-242-2/+2
* new branch which introduces display namesBjörn Schießle2013-01-243-2/+60
* Merge pull request #1265 from j-ed/masterLukas Reschke2013-01-242-2/+18
|\
| * Update config/config.sample.phpj-ed2013-01-221-2/+2
| * Update config/config.sample.phpj-ed2013-01-221-1/+1
| * Update config/config.sample.phpj-ed2013-01-221-0/+10
| * Update lib/mail.phpj-ed2013-01-221-2/+8
* | [tx-robot] updated from transifexJenkins for ownCloud2013-01-2434-170/+244
* | [tx-robot] updated from transifexJenkins for ownCloud2013-01-23166-1081/+4115
* | Merge pull request #1113 from owncloud/fix-issue-1085Michael Gapczynski2013-01-226-18/+24
|\ \
| * | Make database connection error messages less verboseMichael Gapczynski2013-01-211-2/+3
| * | returning http status code 503 in case connecting to the database failedThomas Mueller2013-01-211-0/+8
| * | Merge branch 'master' into fix-issue-1085Michael Gapczynski2013-01-07148-2782/+3647
| |\ \
| * | | Move template parameters around so database error page is properly renderedMichael Gapczynski2013-01-076-18/+15
* | | | Merge pull request #1259 from TheSFReader/masterThomas Müller2013-01-221-0/+2
|\ \ \ \
| * | | | Add ebook specific mimetypesTheSFReader2013-01-171-1/+0
| * | | | Add ebook specific mimetypesTheSFReader2013-01-171-0/+3
* | | | | Merge pull request #1237 from owncloud/fix-template-testsicewind19912013-01-221-4/+0
|\ \ \ \ \
| * | | | | Remove unnecessary ob_end_clean() from template testsMichael Gapczynski2013-01-191-4/+0
* | | | | | Merge pull request #1105 from owncloud/files_encryptionSam Tuke2013-01-2238-793/+4118
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Merge branch 'master' into files_encryptionSam Tuke2013-01-22740-9271/+9056
| |\ \ \ \ \ | |/ / / / / |/| | | | |
* | | | | | Merge pull request #1255 from owncloud/leftcontent_fixicewind19912013-01-211-1/+1
|\ \ \ \ \ \
| * | | | | | Fix scrolling of leftcontentRobin Appelman2013-01-211-1/+1
* | | | | | | enable unittesting on appframework and apptemplateadvancedThomas Mueller2013-01-211-1/+2
|/ / / / / /
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-01-2148-121/+173
* | | | | | Merge pull request #1247 from owncloud/clear-queries-cache-on-schema-change-m...Thomas Müller2013-01-201-0/+3
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | cached queries need to be reset on schema change because they become invalidThomas Mueller2013-01-201-0/+3
|/ / / / /
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-01-20150-2825/+3011
* | | | | Merge pull request #1233 from owncloud/visualphpunitLukas Reschke2013-01-191-0/+3
|\ \ \ \ \
| * | | | | Add listener for VisualPHPUnitMichael Gapczynski2013-01-181-0/+3
* | | | | | Sanitize the exceptionLukas Reschke2013-01-191-1/+1
* | | | | | Also replace the backslash with a minusLukas Reschke2013-01-191-1/+2
* | | | | | Merge pull request #1214 from Raydiation/masterBernhard Posselt2013-01-191-0/+17
|\ \ \ \ \ \
| * | | | | | spaces to tabsBernhard Posselt2013-01-171-12/+12
| * | | | | | load classpaths of apps before routesBernhard Posselt2013-01-171-0/+17
* | | | | | | Merge pull request #1230 from owncloud/remove-unused-autocomplete.phpLukas Reschke2013-01-191-54/+0
|\ \ \ \ \ \ \
| * | | | | | | Remove uneeded fileLukas Reschke2013-01-181-54/+0
* | | | | | | | Merge pull request #1228 from owncloud/generating_zip_messageJan-Christoph Borchardt2013-01-191-1/+1
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | |
| * | | | | | | Change the second part of the notificationLukas Reschke2013-01-191-1/+1
| * | | | | | | Make the message friendlierLukas Reschke2013-01-181-1/+1
| |/ / / / / /
* | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-01-1920-118/+140
* | | | | | | Merge pull request #986 from owncloud/fixing-784-masterThomas Müller2013-01-188-16/+171
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | fixing indentThomas Mueller2013-01-185-73/+73
| * | | | | | adding a ajax call to get the current file storage stats like free spaceThomas Mueller2013-01-112-0/+42
| * | | | | | load jquery-visibilityThomas Mueller2013-01-111-0/+1
| * | | | | | adding jquery-visibilityThomas Mueller2013-01-111-0/+32
| * | | | | | Merge branch 'master' into fixing-784-masterThomas Mueller2013-01-11275-5555/+8279
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'master' into fixing-784-masterThomas Mueller2013-01-06502-7419/+14471
| |\ \ \ \ \ \ \