Björn Schießle
|
7f6a9e8fef
|
fix lost password page, don't show checkbox is encryption is not enabled
|
2013-06-19 11:48:09 +02:00 |
Frank Karlitschek
|
11194c69db
|
Merge pull request #3765 from owncloud/hide-logo-claim
hide the logo claim in case the theme is not loaded
|
2013-06-18 14:14:34 -07:00 |
Jenkins for ownCloud
|
d991a9372b
|
[tx-robot] updated from transifex
|
2013-06-18 02:11:10 +02:00 |
Jan-Christoph Borchardt
|
aaefa157fd
|
hide the logo claim in case the theme is not loaded
|
2013-06-17 20:35:08 +02:00 |
|
Jenkins for ownCloud
|
6156d71832
|
[tx-robot] updated from transifex
|
2013-06-17 02:08:11 +02:00 |
|
Jenkins for ownCloud
|
8243d19050
|
[tx-robot] updated from transifex
|
2013-06-16 02:07:45 +02:00 |
|
Jenkins for ownCloud
|
ab411d2700
|
[tx-robot] updated from transifex
|
2013-06-15 02:07:18 +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 |
|
Jan-Christoph Borchardt
|
2344654236
|
Merge pull request #3726 from owncloud/remove-outlines
remove dotted outlines in Firefox, fix #3712
|
2013-06-14 08:06:52 -07:00 |
|
Jan-Christoph Borchardt
|
06fd7e0d21
|
remove dotted outlines in Firefox, fix #3712
|
2013-06-14 14:08:04 +02:00 |
|
Thomas Mueller
|
c8564c0795
|
Merge branch 'master' into move-maint-start
Conflicts:
lib/util.php
|
2013-06-14 10:06:13 +02:00 |
|
Jenkins for ownCloud
|
6c534c8165
|
[tx-robot] updated from transifex
|
2013-06-14 02:52:34 +02:00 |
Björn Schießle
|
7889f2ef5c
|
Merge pull request #3687 from owncloud/template_updates
Make templates aware of different owncloud editions
|
2013-06-13 07:32:41 -07:00 |
|
Björn Schießle
|
15eda53215
|
improved footer
|
2013-06-13 16:10:33 +02:00 |
|
Björn Schießle
|
7cfb0dc406
|
Merge branch 'master' into files_encryption_check_private_key
Conflicts:
apps/files_encryption/appinfo/app.php
apps/files_encryption/lib/util.php
|
2013-06-13 13:17:35 +02:00 |
Thomas Tanghus
|
3584d48d65
|
Merge pull request #3679 from owncloud/multiselect-fixes
Multiselect fixes
|
2013-06-12 09:52:15 -07: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 |
|
Jan-Christoph Borchardt
|
cdedfb6f37
|
multiselect: up min-width of group multiselect to 150px
|
2013-06-11 18:23:29 +02:00 |
|
Jan-Christoph Borchardt
|
0bcb04398d
|
multiselect: fixed 'add group' interface a bit
|
2013-06-11 18:21:13 +02:00 |
|
Jan-Christoph Borchardt
|
686797eb6d
|
multiselect: more breathing space for entries
|
2013-06-11 18:08:47 +02:00 |
|
Jan-Christoph Borchardt
|
27996d1c64
|
multiselect: drop shadow for better focus
|
2013-06-11 18:04:33 +02:00 |
|
Jan-Christoph Borchardt
|
35e7b64cc2
|
multiselect: do not cut off group names
|
2013-06-11 18:04:11 +02:00 |
|
Jan-Christoph Borchardt
|
e6a4721f64
|
checkstyle: add space after colon
|
2013-06-11 18:02:52 +02:00 |
|
Jan-Christoph Borchardt
|
09ff9b2a2c
|
remove leading spaces
|
2013-06-11 18:01:50 +02:00 |
|
Björn Schießle
|
20ddd6e1c7
|
Merge branch 'master' into files_encryption_check_private_key
Conflicts:
apps/files_encryption/tests/crypt.php
|
2013-06-11 15:19:02 +02:00 |
|
Jan-Christoph Borchardt
|
abfbd9b136
|
feedback for hover/tap on breadcrumbs
|
2013-06-11 14:51:29 +02:00 |
|
Jan-Christoph Borchardt
|
651f1b0995
|
better contrast and grouping for blocks in personal settings through darker background color
|
2013-06-11 14:51:06 +02:00 |
|
Jan-Christoph Borchardt
|
2a936670ce
|
better contrast for controls bar
|
2013-06-11 14:50:23 +02:00 |
|
Jenkins for ownCloud
|
4f0f537b42
|
[tx-robot] updated from transifex
|
2013-06-11 02:02:44 +02:00 |
|
Björn Schießle
|
13017ce9e1
|
Merge branch 'master' into files_encryption_check_private_key
Conflicts:
settings/ajax/changepassword.php
|
2013-06-10 12:12:07 +02:00 |
|
Jenkins for ownCloud
|
3c79d89492
|
[tx-robot] updated from transifex
|
2013-06-08 02:13:41 +02:00 |
|
Jenkins for ownCloud
|
67c085417c
|
[tx-robot] updated from transifex
|
2013-06-07 02:17:50 +02:00 |
|
Björn Schießle
|
58fd76607b
|
print a warning if a user wants to reset his password and encryption is enabled
|
2013-06-05 18:38:39 +02:00 |
|
Jenkins for ownCloud
|
666a5c1cc7
|
[tx-robot] updated from transifex
|
2013-06-05 02:01:42 +02:00 |
opensaucesystems
|
d987bea635
|
Added input[type="url"] to styles.css
|
2013-06-04 16:04:29 +02:00 |
|
Jenkins for ownCloud
|
bc50d92841
|
[tx-robot] updated from transifex
|
2013-06-04 02:31:06 +02:00 |
|
Thomas Tanghus
|
46d4886709
|
Set default button in oc-dialogs
|
2013-06-03 03:31:33 +02:00 |
|
Thomas Tanghus
|
5f1cbc6a1a
|
Catch double destroy on escape.
|
2013-06-03 03:19:35 +02:00 |
|
Thomas Tanghus
|
afd723fdcd
|
Let the content determine overflow.
|
2013-06-03 02:11:01 +02:00 |
|
Thomas Tanghus
|
901b1150ff
|
Replacement for jquery.dialog to fit better with ownCloud design.
|
2013-06-02 21:52:59 +02:00 |
|
Thomas Tanghus
|
bfcf113ce7
|
Forgot typeof condition
|
2013-06-01 16:47:34 +02:00 |
|
Thomas Tanghus
|
64c9fdcc28
|
Speed up octemplate rendering.
|
2013-06-01 16:38:35 +02:00 |
Jörn Friedrich Dreyer
|
476747ee89
|
Merge pull request #3509 from owncloud/update_jquery_to_1_10
Update jquery to 1.10.0 and add jquery-migrate 1.2.1
|
2013-05-30 06:00:52 -07:00 |
|
Jenkins for ownCloud
|
8e1d9261aa
|
[tx-robot] updated from transifex
|
2013-05-30 02:34:14 +02:00 |
|
Jenkins for ownCloud
|
7c0c6bd779
|
[tx-robot] updated from transifex
|
2013-05-29 02:10:54 +02:00 |