Jan-Christoph Borchardt
|
0c8ac241df
|
fix shadow style of username input box
|
2013-08-28 13:59:23 +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 |
Thomas Tanghus
|
9843c8e838
|
Merge pull request #4434 from owncloud/fix_octemplate_escaping
Fix octemplate string escaping.
|
2013-08-28 03:59:43 -07:00 |
|
Thomas Tanghus
|
776d64f804
|
Cache Object.keys(this.vars)
|
2013-08-28 12:50:05 +02:00 |
Jenkins for ownCloud
|
3e7ddbc9d9
|
[tx-robot] updated from transifex
|
2013-08-28 06:24:14 -04:00 |
|
Jenkins for ownCloud
|
d5062b9e0e
|
[tx-robot] updated from transifex
|
2013-08-27 11:23:18 -04:00 |
Morris Jobke
|
ea446544ef
|
Merge pull request #4586 from owncloud/fixing-3431-master
kill zh_CN.GB2312
|
2013-08-27 02:00:48 -07:00 |
|
Thomas Müller
|
c9123263ab
|
kill zh_CN.GB2312
|
2013-08-27 01:27:05 +02:00 |
|
Thomas Müller
|
9909b8b726
|
adding translations to update events
|
2013-08-27 00:26:44 +02:00 |
|
Morris Jobke
|
653bc9a477
|
Merge pull request #4281 from owncloud/ie8-multiselect
Better ie8 multiselect
|
2013-08-26 02:59:31 -07:00 |
|
Morris Jobke
|
438e816941
|
Merge pull request #4519 from owncloud/style-fixes
fix minor style issue in the app navigation
|
2013-08-26 00:47:34 -07:00 |
|
Morris Jobke
|
ec0808ce75
|
fix reviewers concerns
|
2013-08-26 09:44:21 +02:00 |
|
Jenkins for ownCloud
|
d587146a5a
|
[tx-robot] updated from transifex
|
2013-08-25 19:21:52 -04:00 |
Christopher
|
b8965c6107
|
Merge pull request #4331 from owncloud/improve_app-management
Improve app-management
|
2013-08-25 11:56:56 -07:00 |
|
Jenkins for ownCloud
|
596ac40b7f
|
[tx-robot] updated from transifex
|
2013-08-23 20:17:08 -04:00 |
|
Jenkins for ownCloud
|
02b2b5a808
|
[tx-robot] updated from transifex
|
2013-08-22 10:37:23 -04:00 |
|
kondou
|
0ce35af02a
|
Merge branch 'master' into improve_app-management
Conflicts:
settings/js/apps.js
|
2013-08-21 19:20:25 +02:00 |
|
Jenkins for ownCloud
|
a89199cc7b
|
[tx-robot] updated from transifex
|
2013-08-21 08:14:27 -04:00 |
|
Christopher
|
90da518e3e
|
Merge pull request #4262 from owncloud/fix_jslint_kondou
Fix some JSLint warnings
|
2013-08-20 12:45:10 -07:00 |
|
Jenkins for ownCloud
|
e9644c2f52
|
[tx-robot] updated from transifex
|
2013-08-19 15:14:38 -04:00 |
|
Morris Jobke
|
9e5b721a0d
|
fix minor style issue in the app navigation
|
2013-08-19 15:42:51 +02:00 |
|
Thomas Müller
|
0890a915b3
|
adding file templates for ods, odt and odp
|
2013-08-18 21:11:11 +02:00 |
|
kondou
|
7c296a6cf9
|
Move .errormsg from settings-css to .warning in core. Reusable!
|
2013-08-18 17:37:22 +02:00 |
|
Kondou
|
c7af26ec84
|
Merge pull request #4497 from owncloud/newlines_at_eof_kondou
Add newlines at the end of files
|
2013-08-18 07:16:15 -07:00 |
|
Kondou
|
141d2f67aa
|
Merge pull request #4496 from owncloud/fixing-error-page-layout-master
fixing error page layout
|
2013-08-18 06:46:48 -07:00 |
Owen Winkler
|
1793ec1d5d
|
Fixed inconsistent spacing.
|
2013-08-18 05:17:28 -04:00 |
|
kondou
|
9e8a6b704d
|
Add _many_ newlines at the end of files
|
2013-08-18 11:06:59 +02:00 |
|
Thomas Müller
|
3d760222d4
|
fixing error page layout
|
2013-08-18 10:30:21 +02:00 |
|
kondou
|
edd92e4c09
|
Merge branch 'master' into fix_jslint_kondou
Conflicts:
apps/files/js/file-upload.js
|
2013-08-18 00:38:52 +02:00 |
|
Thomas Müller
|
15c9a0f405
|
fixing undefined js error
|
2013-08-17 19:24:06 +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 |
|
Kondou
|
a1128aadd0
|
Merge pull request #4482 from owncloud/remove_cancel_button_filepicker
Remove cancel button from filepicker
|
2013-08-17 06:58:34 -07:00 |
|
Morris Jobke
|
3e88430840
|
Merge pull request #4475 from owncloud/brighter-font-color
change font on login/install page from black to white
|
2013-08-17 04:37:49 -07:00 |
|
Thomas Müller
|
69350c4e0d
|
Merge pull request #4471 from owncloud/password-icon
use proper password icon, three dots are 'more'
|
2013-08-17 03:16:11 -07:00 |
|
Thomas Müller
|
264ee9df9a
|
Merge pull request #4476 from owncloud/doc-on-master
fix difference between packaged version and master
|
2013-08-17 03:13:17 -07:00 |
|
kondou
|
2ee8425295
|
Remove cancel button from filepicker
Having the cancel button in the bottom right corner was a bit confusing.
It's useless anyways, since there's a X in the top right.
|
2013-08-17 12:07:58 +02:00 |
|
Morris Jobke
|
60efd93d5d
|
fixes for IE8
|
2013-08-17 11:56:52 +02:00 |
|
Thomas Müller
|
de52157e76
|
remove ru_RU - fixes #3135
|
2013-08-17 11:43:37 +02:00 |
|
Morris Jobke
|
746d32eb05
|
fix difference between packaged version and master
|
2013-08-17 10:33:11 +02:00 |
|
Morris Jobke
|
18769e1348
|
change font on login/install page from black to white
|
2013-08-17 10:26:30 +02:00 |
|
Jan-Christoph Borchardt
|
b8b24bbae7
|
use proper password icon, three dots are 'more'
|
2013-08-16 17:59:48 +02:00 |
|
Jan-Christoph Borchardt
|
1e8849b04e
|
Merge pull request #4314 from owncloud/css-fixes
Design fixes
|
2013-08-16 01:05:29 -07:00 |
|
Morris Jobke
|
c196985ea3
|
Merge pull request #4032 from owncloud/more-whitespace
More whitespace
|
2013-08-16 01:02:03 -07:00 |
|
Jenkins for ownCloud
|
6bd0ba79df
|
[tx-robot] updated from transifex
|
2013-08-16 01:32:30 -04:00 |
|
Thomas Müller
|
0aa7dc9b89
|
tixing width and position of wider error messages
|
2013-08-16 00:56:09 +02:00 |
|
Jan-Christoph Borchardt
|
d2767faf61
|
Merge pull request #4113 from owncloud/delete-fix
Delete icon fix
|
2013-08-15 15:31:42 -07: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
|
b632b8f4e4
|
force show loading icon also for IE
|
2013-08-16 00:02:11 +02:00 |
|
Jan-Christoph Borchardt
|
3563eecfff
|
merge master into more-whitespace
|
2013-08-15 23:25:20 +02:00 |