Michael Gapczynski
|
0b13b41189
|
Merge pull request #1053 from owncloud/ocs_api
External API for ownCloud based on OCS
|
2013-01-04 17:18:58 -08:00 |
Jenkins for ownCloud
|
90f39cd703
|
[tx-robot] updated from transifex
|
2013-01-04 13:23:31 +01:00 |
Jenkins for ownCloud
|
3bcdd8c900
|
[tx-robot] updated from transifex
|
2013-01-03 00:05:19 +01:00 |
Jörn Friedrich Dreyer
|
ed06070741
|
omit type attribute in script tag to use fallback (text/javascript)
|
2013-01-02 12:13:07 +01:00 |
Jenkins for ownCloud
|
516464ba94
|
[tx-robot] updated from transifex
|
2013-01-02 00:05:14 +01:00 |
Jenkins for ownCloud
|
c6064a542c
|
[tx-robot] updated from transifex
|
2013-01-01 00:04:42 +01:00 |
Tom Needham
|
6eb194b702
|
Merge branch 'master' into ocs_api
Conflicts:
l10n/templates/core.pot
l10n/templates/files.pot
l10n/templates/files_encryption.pot
l10n/templates/files_external.pot
l10n/templates/files_sharing.pot
l10n/templates/files_versions.pot
l10n/templates/lib.pot
l10n/templates/settings.pot
l10n/templates/user_ldap.pot
l10n/templates/user_webdavauth.pot
|
2012-12-31 15:47:15 +00:00 |
Jenkins for ownCloud
|
329bddab48
|
[tx-robot] updated from transifex
|
2012-12-31 00:05:31 +01:00 |
Jenkins for ownCloud
|
66e57f5fb1
|
[tx-robot] updated from transifex
|
2012-12-30 00:05:52 +01:00 |
Thomas Müller
|
36da34e5f6
|
Merge pull request #902 from owncloud/storage-wording
Storage wording
|
2012-12-28 23:19:52 -08:00 |
Michael Gapczynski
|
f922f836ce
|
Change old variable name $default_quota to $defaultQuota
|
2012-12-28 19:14:33 -05:00 |
Jenkins for ownCloud
|
e9c51b319e
|
[tx-robot] updated from transifex
|
2012-12-28 00:20:34 +01:00 |
Jenkins for ownCloud
|
27f9ea2abb
|
[tx-robot] updated from transifex
|
2012-12-27 00:05:17 +01:00 |
Jenkins for ownCloud
|
b7257b2524
|
[tx-robot] updated from transifex
|
2012-12-26 00:12:10 +01:00 |
Jenkins for ownCloud
|
5d59ac0739
|
[tx-robot] updated from transifex
|
2012-12-25 00:11:11 +01:00 |
Jenkins for ownCloud
|
7d52c39419
|
[tx-robot] updated from transifex
|
2012-12-24 00:12:16 +01:00 |
Jenkins for ownCloud
|
0656b41747
|
[tx-robot] updated from transifex
|
2012-12-23 00:10:23 +01:00 |
Jenkins for ownCloud
|
05fda76776
|
[tx-robot] updated from transifex
|
2012-12-22 00:26:25 +01:00 |
Thomas Müller
|
7e78f8e15a
|
moving logic from template to the 'controller'
THX @VicDeo
|
2012-12-21 00:48:12 +01:00 |
Jenkins for ownCloud
|
3e39c39d6a
|
[tx-robot] updated from transifex
|
2012-12-21 00:11:31 +01:00 |
Thomas Müller
|
24e0a2a358
|
remove unused code
|
2012-12-20 15:45:10 +01:00 |
Thomas Müller
|
436df6b67d
|
enable translations for quota sizes 'none' and 'default'
|
2012-12-20 15:35:36 +01:00 |
Jan-Christoph Borchardt
|
31aa317952
|
Merge pull request #970 from owncloud/fixing-950-master
within the user administratio page some translations have been missing
|
2012-12-20 04:15:51 -08:00 |
Thomas Müller
|
cc9061d20d
|
adding missing translations for various strings + fixing tool tip on delete
|
2012-12-20 09:59:09 +01:00 |
Jenkins for ownCloud
|
ecf82d2218
|
[tx-robot] updated from transifex
|
2012-12-20 00:13:09 +01:00 |
Thomas Müller
|
bca02f4b40
|
[l18n] fixing typos in source text
|
2012-12-19 23:43:07 +01:00 |
Frank Karlitschek
|
b162e72f94
|
Merge pull request #961 from owncloud/check_locale
add a check and a warning if setlocale is working
|
2012-12-19 08:53:43 -08:00 |
Frank Karlitschek
|
d7fbe47583
|
Merge pull request #868 from owncloud/new_doc_system
New doc system
|
2012-12-19 06:40:37 -08:00 |
Frank Karlitschek
|
196f1c3786
|
add a check and a warning if setlocale is working
|
2012-12-19 15:10:33 +01:00 |
Frank Karlitschek
|
7c5150ce32
|
Merge pull request #913 from owncloud/fix_settings
cleaning up the settings
|
2012-12-18 15:27:52 -08:00 |
Jenkins for ownCloud
|
982e46cd29
|
[tx-robot] updated from transifex
|
2012-12-19 00:04:14 +01:00 |
Jenkins for ownCloud
|
a4b0df419e
|
[tx-robot] updated from transifex
|
2012-12-18 00:14:58 +01:00 |
Tom Needham
|
3c98f36121
|
Merge branch 'master' into ocs_api
|
2012-12-16 22:29:00 +00:00 |
Frank Karlitschek
|
30b0e8b70c
|
cleaning up the settings. standardize the format, add missing I10N and other small things. Yes. This is not perfect. But way better than before ;-)
|
2012-12-15 20:02:16 +01:00 |
Bart Visscher
|
df7d6cb26c
|
More style fixes
|
2012-12-15 00:43:46 +01:00 |
Bart Visscher
|
68562dafb4
|
More whitespace fixes
|
2012-12-15 00:43:46 +01:00 |
Bart Visscher
|
2ef2dc4dda
|
Fix "There must be a single space between the closing parenthesis and the opening brace"
|
2012-12-15 00:43:46 +01:00 |
Jan-Christoph Borchardt
|
74d41b8b96
|
dim Default Storage label color a bit
|
2012-12-14 23:24:51 +01:00 |
Jan-Christoph Borchardt
|
4ee9d39422
|
change storage space 'none' to 'Unlimited' and capitalize Default
|
2012-12-14 23:22:55 +01:00 |
Jan-Christoph Borchardt
|
4acb2f70e1
|
change technical expression 'Quota' to simpler 'Storage'
|
2012-12-14 23:02:22 +01:00 |
Tom Needham
|
5fe6129698
|
Merge master into ocs_api, fix conflicts.
|
2012-12-14 15:15:05 +00:00 |
Thomas Mueller
|
e7c288a719
|
fixing links docu/ ->doc/
|
2012-12-14 15:25:52 +01:00 |
Frank Karlitschek
|
cde74fe248
|
make it more readable
|
2012-12-14 14:41:09 +01:00 |
Jenkins for ownCloud
|
6d7ae463df
|
[tx-robot] updated from transifex
|
2012-12-14 00:17:42 +01:00 |
Frank Karlitschek
|
2330d6bcc7
|
show the link to the issue tracker only for Admins as discussed with Björn and Jan.
|
2012-12-13 11:08:12 +01:00 |
Frank Karlitschek
|
89bbabd77b
|
a bit more polish. We are getting there.
|
2012-12-13 09:26:25 +01:00 |
Frank Karlitschek
|
f85106b6b5
|
first version of the new documentation system integration.
|
2012-12-12 22:41:12 +01:00 |
Jenkins for ownCloud
|
f7f462f273
|
[tx-robot] updated from transifex
|
2012-12-11 00:04:40 +01:00 |
Jenkins for ownCloud
|
a444999a8c
|
[tx-robot] updated from transifex
|
2012-12-10 00:12:32 +01:00 |
Jenkins for ownCloud
|
e3e4dcf77b
|
[tx-robot] updated from transifex
|
2012-12-09 00:12:41 +01:00 |