summaryrefslogtreecommitdiffstats
path: root/core
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #5183 from owncloud/login-warningstyleVincent Petry2013-10-091-2/+1
|\
| * Fixed login warning style #5065Vincent Petry2013-10-091-2/+1
* | [tx-robot] updated from transifexJenkins for ownCloud2013-10-086-1/+35
* | [tx-robot] updated from transifexJenkins for ownCloud2013-10-072-0/+11
|/
* Merge pull request #4921 from owncloud/file_conflicts_dialog_fixesVicDeo2013-10-071-1/+1
|\
| * use correct property for mimetype of existing filesJörn Friedrich Dreyer2013-10-071-1/+1
* | Merge pull request #5072 from owncloud/apache-auth-masterThomas Müller2013-10-072-1/+7
|\ \
| * | move call to print_unescaped() to templateThomas Müller2013-10-071-1/+1
| * | adding warning about failed apache module authThomas Müller2013-10-021-0/+6
| * | $defaults is not necessary here - merge artifactThomas Müller2013-10-021-2/+0
| * | Revert "use $defaults instead of $theme"Thomas Müller2013-10-021-3/+3
| * | use $defaults instead of $themeThomas Müller2013-10-011-3/+3
| * | Squashed commit of the following:Thomas Müller2013-10-011-1/+3
* | | Prevent share dropdown to close too early with autocompleteVincent Petry2013-10-071-1/+1
* | | Fixed label for sharing notification to be clickableVincent Petry2013-10-071-1/+1
* | | Prevent scroll up when click on links in sharing dropdownVincent Petry2013-10-071-0/+2
| |/ |/|
* | [tx-robot] updated from transifexJenkins for ownCloud2013-10-0659-82/+180
* | Merge pull request #5154 from owncloud/fix-appimagesMorris Jobke2013-10-064-4/+3
|\ \
| * | Optimize images with optipngkondou2013-10-063-0/+0
| * | fix mobile and desktop app images looking differentJan-Christoph Borchardt2013-10-054-4/+3
* | | Merge pull request #4982 from syncloud/masterOwen Winkler2013-10-052-4/+24
|\ \ \ | |/ / |/| |
| * | Moving Advanced button out of datadirField fieldsetvsapronov2013-10-041-1/+6
| * | Fixed review issuesvsapronov2013-09-292-14/+14
| * | autoconfig.php could have only some of parameters; installation.php generates...vsapronov2013-09-252-3/+18
* | | Merge pull request #5131 from owncloud/fix-5130VicDeo2013-10-052-2/+2
|\ \ \
| * | | Allow "Finishing..." button on setup page to be translated.ringmaster2013-10-042-2/+2
* | | | more elegant style for Personal and Admin settingsJan-Christoph Borchardt2013-10-051-5/+11
* | | | Merge pull request #5136 from owncloud/design-fixesMorris Jobke2013-10-048-2/+39
|\ \ \ \
| * | | | add useful icon from News app to coreJan-Christoph Borchardt2013-10-046-0/+32
| * | | | prevent hover effect when settings are openJan-Christoph Borchardt2013-10-041-1/+6
| * | | | fix disabled buttons not showing iconsJan-Christoph Borchardt2013-10-041-1/+1
| |/ / /
* | | | remove specific border-radius for .primary button as it should be specific to...Jan-Christoph Borchardt2013-10-041-1/+3
* | | | merge master into input-simplifyJan-Christoph Borchardt2013-10-0413-38/+235
|\| | |
| * | | Fixed array syntax to work with PHP 5.3Vincent Petry2013-10-041-1/+1
| * | | Merge branch 'master' into sharing_mail_notification_masterBjoern Schiessle2013-10-048-27/+84
| |\ \ \
| | * \ \ Merge pull request #5107 from owncloud/user_skeletonThomas Müller2013-10-041-0/+5
| | |\ \ \
| | | * | | add a real examplefile instead of an .gitignore which is a bit stupid hereFrank Karlitschek2013-10-042-4/+5
| | | * | | make it possible to prepopulate a new user gome with a skeletonFrank Karlitschek2013-10-031-0/+4
| | * | | | Merge pull request #5109 from owncloud/controls-bar-heightMorris Jobke2013-10-045-21/+59
| | |\ \ \ \
| | | * | | | increase height of controls bar and elements to more clickable 44pxJan-Christoph Borchardt2013-10-045-21/+59
| | | |/ / /
| | * / / / Hide defaultavatar in #header and don't darken proper avatars in #headerkondou2013-10-043-6/+20
| | |/ / /
| * | | | Merge branch 'sharing_mail_notification_master' of github.com:owncloud/core i...Bjoern Schiessle2013-10-044-72/+81
| |\ \ \ \
| | * | | | Fixed syntax error in arrayVincent Petry2013-10-031-1/+1
| | * | | | Merge branch 'master' into sharing_mail_notification_masterThomas Müller2013-10-024-72/+81
| | |\| | |
| * | | | | fix array_diff callBjoern Schiessle2013-10-041-1/+1
| |/ / / /
| * | | | Merge branch 'master' into sharing_mail_notification_masterBjoern Schiessle2013-10-0218-21/+136
| |\ \ \ \ | | | |_|/ | | |/| |
| * | | | grammar fixesBjoern Schiessle2013-09-302-2/+2
| * | | | fix mail subject; don't show time for expire dateBjoern Schiessle2013-09-301-2/+3
| * | | | go back to old template but add expire date as optional contentBjoern Schiessle2013-09-302-6/+15
| * | | | use template for txt and html mails to send notification mailsBjoern Schiessle2013-09-253-26/+29
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-30 23:29:51 +0000