kondou
|
76b1b5b6a3
|
Provide 'enable_avatars' in config.php, to disable avatars
|
2013-09-01 18:17:14 +02:00 |
|
kondou
|
5d653753bd
|
Merge branch 'master' into oc_avatars
|
2013-08-31 12:56:36 +02:00 |
|
Jan-Christoph Borchardt
|
c9c4ab22a4
|
Apps management as sticky footer and rename to 'Apps', fix #4622
|
2013-08-30 11:17:31 +02:00 |
|
kondou
|
0c708be76b
|
Use defaultavatars
|
2013-08-29 14:26:11 +02:00 |
|
kondou
|
67c5be9f19
|
Merge branch 'master' into oc_avatars
Conflicts:
3rdparty
|
2013-08-28 16:44:11 +02:00 |
|
Jan-Christoph Borchardt
|
c6eda25d50
|
remove show password toggle from log in page, ref #4577 #4580
|
2013-08-28 13:58:49 +02:00 |
|
kondou
|
e6473e6d49
|
Clean up some cruft
|
2013-08-26 17:41:19 +02:00 |
|
kondou
|
252548c62c
|
Improve styling & enable avatar-upload at personal page
|
2013-08-25 21:04:45 +02:00 |
|
kondou
|
4a08f7d710
|
Add basic avatars and gravatar
|
2013-08-25 21:02:43 +02:00 |
|
Thomas Müller
|
0890a915b3
|
adding file templates for ods, odt and odp
|
2013-08-18 21:11:11 +02:00 |
|
Thomas Müller
|
12f4494de0
|
Merge pull request #4339 from owncloud/mimetype-defaults
Add the option to provide templates for newly created files
|
2013-08-17 08:42:49 -07:00 |
|
Morris Jobke
|
18769e1348
|
change font on login/install page from black to white
|
2013-08-17 10:26:30 +02:00 |
|
Thomas Müller
|
0aa7dc9b89
|
tixing width and position of wider error messages
|
2013-08-16 00:56:09 +02:00 |
|
Jan-Christoph Borchardt
|
399adf67b0
|
merge master into css-fixes
|
2013-08-16 00:29:43 +02:00 |
|
Thomas Müller
|
7279a07ca2
|
Merge branch 'master' into mimetype-defaults
Conflicts:
apps/files/ajax/newfile.php
|
2013-08-16 00:13:10 +02:00 |
|
Jan-Christoph Borchardt
|
367b248bc0
|
show 'More apps' link to app administration directly in app navigation
|
2013-08-07 18:18:09 +02:00 |
|
Robin Appelman
|
1c1ede5703
|
add template for html files
|
2013-08-07 16:53:33 +02:00 |
|
Jan-Christoph Borchardt
|
0a5be39446
|
remove unused and never to be used pagination
|
2013-07-31 09:58:57 +02:00 |
|
Victor Dubiniuk
|
97f2c393c1
|
Allow apps to have own 404 content, closes #3225
|
2013-07-29 16:54:19 +03:00 |
|
Jörn Friedrich Dreyer
|
284fb86258
|
show tablespace only for oracle, hide dbhost for sqlite, remove unnecessary js & html ids
|
2013-07-24 19:56:57 +02:00 |
|
Jan-Christoph Borchardt
|
9b1866f1ac
|
merge master
|
2013-07-24 16:31:01 +02:00 |
|
Jan-Christoph Borchardt
|
876309a215
|
Merge pull request #4175 from owncloud/remember-checked
check remember log in by default, ref #3918
|
2013-07-24 07:05:41 -07:00 |
|
Björn Schießle
|
003ae7b916
|
use OC_Defaults directly from the template
|
2013-07-24 12:04:18 +02:00 |
|
Björn Schießle
|
75fd6d4fde
|
initialize OC_Defaults in template constructorX
|
2013-07-24 11:51:21 +02:00 |
|
Jan-Christoph Borchardt
|
6a5e2ea7d5
|
check remember log in by default, ref #3918
|
2013-07-24 10:01:56 +02:00 |
|
Jan-Christoph Borchardt
|
38bfae57fe
|
sticky footer
|
2013-07-23 18:36:45 +02:00 |
|
Jan-Christoph Borchardt
|
14edfa52ea
|
input field adjustments for new full-color background on log in
|
2013-07-23 18:36:44 +02:00 |
|
Jan-Christoph Borchardt
|
107ace42b8
|
rip out unneeded #login div, replace with existing body-login
|
2013-07-23 18:36:44 +02:00 |
|
Jan-Christoph Borchardt
|
20791e0ad1
|
use themable strings for installation
|
2013-07-11 17:39:44 +02:00 |
|
Jan-Christoph Borchardt
|
aacca494c5
|
introduce shortname themable string and split from title, use for image alt text
|
2013-07-11 16:38:07 +02:00 |
|
Björn Schießle
|
83898e87be
|
Merge https://github.com/owncloud/core/pull/3900
Squashed commit of the following:
commit a34098427720c2d0470367cd9698c184d85b8dfd
Merge: ccf849b 955646c
Author: Björn Schießle <schiessle@owncloud.com>
Date: Fri Jul 5 09:59:29 2013 +0200
Merge branch 'master' into theme_aware_mail_footer
commit ccf849bc6f18d80cdb593e851529b87579fe072b
Merge: 8d5fb70 3c1308f
Author: Björn Schießle <schiessle@owncloud.com>
Date: Thu Jul 4 11:03:47 2013 +0200
Merge branch 'master' into theme_aware_mail_footer
commit 8d5fb70e6dcb2e2e34dcdf2a883680ef034afeea
Author: Björn Schießle <schiessle@owncloud.com>
Date: Thu Jul 4 10:38:39 2013 +0200
switch to non-static defaults.php
commit 88ab2768dcc4ced12c48872c887baa94ad938d62
Merge: e199df8 84c25f9
Author: Björn Schießle <schiessle@owncloud.com>
Date: Wed Jul 3 16:59:48 2013 +0200
Merge branch 'theme_aware_mail_footer' of github.com:owncloud/core into theme_aware_mail_footer
Conflicts:
core/templates/altmail.php
commit e199df844b5faf80a36d8380a5b0b58025cd425f
Author: Björn Schießle <schiessle@owncloud.com>
Date: Wed Jul 3 16:56:29 2013 +0200
name and slogan should be in one line
commit 84c25f9853e1bfbe4ae780371b1353aafb6b15c2
Author: Thomas Müller <thomas.mueller@tmit.eu>
Date: Mon Jul 1 21:15:35 2013 +0200
no ?> at the end of a file
commit 3bd8d38d011f62ce78bcd0c108eb8cf2ce97eb99
Author: Björn Schießle <schiessle@owncloud.com>
Date: Mon Jul 1 12:58:36 2013 +0200
print url unescaped
commit d304ed18c8b7350e92e24565b9b9ba77b519d74c
Author: Björn Schießle <schiessle@owncloud.com>
Date: Mon Jul 1 12:56:05 2013 +0200
make new mail templates aware of different ownCloud themes
|
2013-07-05 10:07:23 +02:00 |
|
Björn Schießle
|
3c691c9ec9
|
move to non-static OC_Defaults
Conflicts:
lib/mail.php
|
2013-07-04 10:11:16 +02:00 |
|
Björn Schießle
|
d46e62886a
|
Add init funtion to OC_Defaults to be able to wrap translatable strings
|
2013-07-04 10:09:28 +02:00 |
|
Björn Schießle
|
d97d00fe0f
|
add logo claim to defaults.php
|
2013-07-01 10:48:13 +02:00 |
|
Björn Schießle
|
23cc69b816
|
construct the foother in defaults.php so that we use always the same footer
Conflicts:
settings/templates/admin.php
|
2013-07-01 10:46:00 +02:00 |
|
Bart Visscher
|
414b5f150e
|
Merge pull request #2914 from Kondou-ger/label_overlapping_value
Fix textfield label overlapping value.
|
2013-06-29 04:09:50 -07:00 |
|
Jan-Christoph Borchardt
|
aaefa157fd
|
hide the logo claim in case the theme is not loaded
|
2013-06-17 20:35:08 +02:00 |
|
Thomas Mueller
|
f3d33a7d5b
|
remove » and « from the text mail because they will be escaped
|
2013-06-14 20:04:20 +02:00 |
|
Stephan Arts
|
ff64278a07
|
Do no translate "ownCloud - "
|
2013-06-14 18:02:35 +02:00 |
|
Stephan Arts
|
3cd7747e7b
|
Use templates to theme share e-mails (#3683)
|
2013-06-14 17:38:56 +02:00 |
|
Björn Schießle
|
15eda53215
|
improved footer
|
2013-06-13 16:10:33 +02:00 |
|
Björn Schießle
|
2141c41d0d
|
add logo-claim
|
2013-06-12 17:20:09 +02:00 |
|
Björn Schießle
|
b29e01d5cf
|
keep all strings in one place to make it easier to change them
|
2013-06-12 15:15:08 +02:00 |
|
Björn Schießle
|
918906f042
|
make footer aware of ownCloud editions
|
2013-06-12 14:49:30 +02:00 |
|
Björn Schießle
|
7c108edc36
|
mage page title aware of ownCloud edition
|
2013-06-12 14:33:24 +02:00 |
|
Jörn Friedrich Dreyer
|
1d720099c3
|
Merge pull request #3179 from pawl/patch-1
Improve IE Compatibility
|
2013-05-28 05:18:43 -07:00 |
|
Thomas Tanghus
|
27a5132b46
|
Don't set image path in template.
|
2013-05-20 09:44:31 +02:00 |
|
Thomas Tanghus
|
a0b79f5649
|
Dialogs: Loose up-button.
|
2013-05-17 06:48:24 +02:00 |
|
Thomas Tanghus
|
152e275c8a
|
Various cleanups in OC.dialogs
|
2013-05-17 04:54:08 +02:00 |
|
Thomas Tanghus
|
c8bbf90feb
|
Port OC.dialogs to use octemplate except for prompt() and form().
Also load octemplate per default.
|
2013-05-16 13:41:04 +02:00 |
|