summaryrefslogtreecommitdiffstats
path: root/core/templates
Commit message (Expand)AuthorAgeFilesLines
* 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
* | Merge pull request #4982 from syncloud/masterOwen Winkler2013-10-051-1/+10
|\ \
| * | Moving Advanced button out of datadirField fieldsetvsapronov2013-10-041-1/+6
| * | Fixed review issuesvsapronov2013-09-291-4/+4
| * | autoconfig.php could have only some of parameters; installation.php generates...vsapronov2013-09-251-0/+4
* | | Allow "Finishing..." button on setup page to be translated.ringmaster2013-10-041-1/+1
* | | Merge branch 'master' into sharing_mail_notification_masterBjoern Schiessle2013-10-021-1/+2
|\ \ \ | | |/ | |/|
| * | introduce OC_Util::rememberLoginAllowed()Bjoern Schiessle2013-09-241-1/+1
| * | don't remember login if the encrypion app is enabled because the userBjoern Schiessle2013-09-241-1/+2
| |/
* | grammar fixesBjoern Schiessle2013-09-302-2/+2
* | 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-252-7/+7
|/
* Bring another enable_avatars to $_ and fix $thus->$thiskondou2013-09-111-1/+1
* Clean up oc_avatarskondou2013-09-041-1/+0
* Have the header avatar to the left of the user namekondou2013-09-031-4/+3
* Provide 'enable_avatars' in config.php, to disable avatarskondou2013-09-011-0/+2
* Merge branch 'master' into oc_avatarskondou2013-08-311-2/+7
|\
| * Apps management as sticky footer and rename to 'Apps', fix #4622Jan-Christoph Borchardt2013-08-301-2/+7
* | Use defaultavatarskondou2013-08-291-1/+1
* | Merge branch 'master' into oc_avatarskondou2013-08-281-3/+1
|\|
| * remove show password toggle from log in page, ref #4577 #4580Jan-Christoph Borchardt2013-08-281-3/+1
* | Clean up some cruftkondou2013-08-261-1/+1
* | Improve styling & enable avatar-upload at personal pagekondou2013-08-251-1/+3
* | Add basic avatars and gravatarkondou2013-08-251-0/+1
|/
* adding file templates for ods, odt and odpThomas Müller2013-08-183-0/+0
* Merge pull request #4339 from owncloud/mimetype-defaultsThomas Müller2013-08-171-0/+9
|\
| * Merge branch 'master' into mimetype-defaultsThomas Müller2013-08-161-0/+13
| |\
| * | add template for html filesRobin Appelman2013-08-071-0/+9
* | | change font on login/install page from black to whiteMorris Jobke2013-08-171-1/+1
* | | tixing width and position of wider error messagesThomas Müller2013-08-161-1/+1
* | | merge master into css-fixesJan-Christoph Borchardt2013-08-162-6/+23
|\ \ \ | | |/ | |/|
| * | show 'More apps' link to app administration directly in app navigationJan-Christoph Borchardt2013-08-071-0/+13
| |/
| * Allow apps to have own 404 content, closes #3225Victor Dubiniuk2013-07-291-6/+10
* | remove unused and never to be used paginationJan-Christoph Borchardt2013-07-311-22/+0
|/
* show tablespace only for oracle, hide dbhost for sqlite, remove unnecessary j...Jörn Friedrich Dreyer2013-07-241-15/+15
* merge masterJan-Christoph Borchardt2013-07-247-28/+22
|\
| * Merge pull request #4175 from owncloud/remember-checkedJan-Christoph Borchardt2013-07-241-2/+2
| |\
| | * check remember log in by default, ref #3918Jan-Christoph Borchardt2013-07-241-2/+2
| * | use OC_Defaults directly from the templateBjörn Schießle2013-07-241-2/+2
| * | initialize OC_Defaults in template constructorXBjörn Schießle2013-07-245-23/+14
| |/
| * use themable strings for installationJan-Christoph Borchardt2013-07-111-2/+5
| * introduce shortname themable string and split from title, use for image alt textJan-Christoph Borchardt2013-07-114-8/+8
* | sticky footerJan-Christoph Borchardt2013-07-231-5/+9
* | input field adjustments for new full-color background on log inJan-Christoph Borchardt2013-07-231-1/+2