Lukas Reschke
ffbf273c9a
Removed uneeded HTML tag
2013-01-11 14:43:56 +01:00
Lukas Reschke
466cdab680
Add security section to admin menu
...
Currently it only allows the admin to enable or disable the HTTPS
enforcement, but in the future it could be expanded to further options.
The HTTPS enforcement only allows the admin to enforce it, if he is
connected via HTTPS. (To prevent admins to enable it without a proper
SSL setup)
2013-01-11 14:18:51 +01:00
Thomas Mueller
508b6a9fc7
displaying notification now centered
...
The notification div has been moved to the user templates.
Correct display of the notification will only work with the use of OC.Notification.show() as on fadeIn() the css needs to be changed as this style required display: inline.
2013-01-11 11:52:07 +01:00
Thomas Mueller
364b1cd391
Merge branch 'master' into fixing-998-master
...
Conflicts:
apps/files/js/files.js
2013-01-11 10:00:12 +01:00
Jenkins for ownCloud
d03dce1283
[tx-robot] updated from transifex
2013-01-11 00:06:14 +01:00
Jenkins for ownCloud
912050afa0
[tx-robot] updated from transifex
2013-01-10 00:05:53 +01:00
Jenkins for ownCloud
533f0e8e25
[tx-robot] updated from transifex
2013-01-09 00:05:49 +01:00
Jenkins for ownCloud
b69328e1d1
[tx-robot] updated from transifex
2013-01-08 00:31:36 +01:00
Thomas Mueller
e475c26f1a
fixing <input> tag
2013-01-07 21:23:14 +01:00
Thomas Mueller
7ebfcab49b
Merge branch 'master' into fixing-998-master
...
Conflicts:
lib/helper.php
2013-01-06 12:18:21 +01:00
Thomas Mueller
6806484c16
Merge branch 'master' into fixing-998-master
2013-01-06 10:36:14 +01:00
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
Thomas Mueller
b5d1dfcdc9
javascript syntax error fixed on the way
2013-01-04 23:38:07 +01:00
Thomas Mueller
594d388ad9
new javascript notification functions used within users.js
2013-01-04 23:37:21 +01: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
Thomas Mueller
2d36a20a1d
moving storage calculation code to OC_Helper::getStorageInfo()
2013-01-02 14:35:45 +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 Tanghus
5f795d3aac
Users: Show selected groups first in list.
2012-12-21 06:18:45 +01:00
Thomas Tanghus
1d55829ba6
multiSelect: Modified users.js to only update other multiSelects.
2012-12-21 00:54:31 +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
Jenkins for ownCloud
69a9fe75a0
[tx-robot] updated from transifex
2012-12-06 00:12:08 +01:00
Jenkins for ownCloud
524f3c3c0b
[tx-robot] updated from transifex
2012-12-05 00:04:55 +01:00
Jenkins for ownCloud
a53a946c20
[tx-robot] updated from transifex
2012-12-04 00:07:11 +01:00
Thomas Müller
cee92bde20
Merge pull request #682 from VicDeo/master
...
Minor cleanup in OC_OCSClient::getKnownledgebaseEntries. Fix for #487
2012-12-03 02:18:04 -08:00
Jenkins for ownCloud
f4d7955fe6
[tx-robot] updated from transifex
2012-12-03 00:05:40 +01:00
Victor Dubiniuk
6a211f3fa1
Check if we have an array with data. Fix #487
2012-12-02 23:54:54 +03:00
Jenkins for ownCloud
401c56ce7b
[tx-robot] updated from transifex
2012-12-02 00:03:12 +01:00
Jenkins for ownCloud
c7c5e2a2e2
[tx-robot] updated from transifex
2012-12-01 00:03:27 +01:00
Bart Visscher
a3f18d4b5a
Merge pull request #603 from owncloud/store_plain_groupname
...
Group name doesn't need to be sanitized before storing it in the database
2012-11-30 04:13:36 -08:00
Georg Ehrke
e5af24d084
use attr instead of data
2012-11-29 13:56:07 +01:00
Georg Ehrke
1d1ab2a911
Revert "fix group and subadmin managing for 'ajax-loaded' users"
...
This reverts commit a5774229a1
.
2012-11-29 13:37:37 +01:00
Georg Ehrke
4c83a4c918
add a client side check
2012-11-28 18:40:58 +01:00
Georg Ehrke
a5774229a1
fix group and subadmin managing for 'ajax-loaded' users
2012-11-28 18:40:00 +01:00
Georg Ehrke
ab13702770
make some checks server-side
2012-11-28 18:15:40 +01:00
Jenkins for ownCloud
1d4d4fd678
[tx-robot] updated from transifex
2012-11-28 00:11:21 +01:00
Bart Visscher
80d1037e42
Group name does't need to be sanitized before storing it in the database
...
It should only be sanitized before display
2012-11-27 20:22:45 +01:00
Jenkins for ownCloud
d251f04b98
[tx-robot] updated from transifex
2012-11-27 00:10:47 +01:00
Jenkins for ownCloud
7892204077
[tx-robot] updated from transifex
2012-11-26 00:02:04 +01:00
Jenkins for ownCloud
3688376a6f
[tx-robot] updated from transifex
2012-11-23 00:03:17 +01:00
Jenkins for ownCloud
3a5f5e127c
[tx-robot] updated from transifex
2012-11-22 00:02:16 +01:00
Jenkins for ownCloud
9204be827b
[tx-robot] updated from transifex
2012-11-21 00:02:33 +01:00
Jenkins for ownCloud
568def2b61
[tx-robot] updated from transifex
2012-11-20 00:02:08 +01:00
Jenkins for ownCloud
e28d71bf55
[tx-robot] updated from transifex
2012-11-18 00:02:00 +01:00
Jenkins for ownCloud
61670184c4
[tx-robot] updated from transifex
2012-11-17 00:02:24 +01:00
Thomas Müller
36bf4e24f0
Merge pull request #433 from owncloud/user_setting_fixes
...
User setting fixes
2012-11-15 14:01:16 -08:00
Jenkins for ownCloud
a418a3ba65
[tx-robot] updated from transifex
2012-11-15 00:03:50 +01:00
Bart Visscher
343e9d8621
Better check and handing of user deletion
2012-11-14 21:52:28 +01:00
Bart Visscher
59627367ae
Better check and handling of user creation
2012-11-14 21:52:28 +01:00
Bart Visscher
4eff27ed42
Always have the username as string in user admin
2012-11-14 21:52:28 +01:00
Bart Visscher
85209a0a00
Cleanup user settings js
2012-11-14 21:52:28 +01:00
Jenkins for ownCloud
9c36326e47
[tx-robot] updated from transifex
2012-11-14 00:03:38 +01:00
Jenkins for ownCloud
ac22cd4ab0
[tx-robot] updated from transifex
2012-11-13 00:07:19 +01:00
Brice Maron
910a25adbd
Fix deleting multiple user w-o reloading V2
2012-11-12 20:29:06 +00:00
Jenkins for ownCloud
09d6d843f7
[tx-robot] updated from transifex
2012-11-12 00:02:24 +01:00
Jenkins for ownCloud
9f8cc09642
[tx-robot] updated from transifex
2012-11-11 00:02:42 +01:00
Diederik de Haas
eff13a28c1
Fixed new checkstyle issues in apps.php from build #1341 .
2012-11-10 01:03:54 +01:00
Diederik de Haas
1b7c0c2b62
Fixed new checkstyle issues in ocs.php from build #1341 .
2012-11-10 01:02:47 +01:00
Jenkins for ownCloud
7ec0efe5c2
[tx-robot] updated from transifex
2012-11-10 00:02:29 +01:00
Thomas Müller
c053863644
Merge pull request #330 from owncloud/check_connection
...
add a check and a warning if the ownCloud server is not able to establis...
2012-11-09 02:11:24 -08:00
Jenkins for ownCloud
b33a443088
[tx-robot] updated from transifex
2012-11-09 10:07:45 +01:00
Jenkins for ownCloud
cb57a20ec2
[tx-robot] updated from transifex
2012-11-09 00:03:49 +01:00
Brice Maron
4c06c25c6c
Fix delete link when new user is added
2012-11-08 20:17:16 +00:00
Frank Karlitschek
55f75c6d8e
add a check and a warning if the ownClodu server is not able to establish http connections to the internet. The reason is that users complained that external filesystem support, the update checker, downloading of new apps or the nowledgebase don´t work and don´t know why.
2012-11-08 18:08:44 +01:00
Thomas Müller
2d52365606
Merge pull request #326 from owncloud/add_credits
...
add credits to personal page too so that non admins can see what they run
2012-11-08 05:50:09 -08:00
Frank Karlitschek
fef2d07873
add credits to personal page too so that non admins can see what they run.
2012-11-08 14:12:49 +01:00
Frank Karlitschek
f799e48f7e
fix the broken image path on the apps page
2012-11-08 13:34:00 +01:00
Brice Maron
fbc3123d8e
Correct more data vs attr to fix #189
2012-11-07 23:51:00 +00:00
Jenkins for ownCloud
3e01fe1dbb
[tx-robot] updated from transifex
2012-11-07 00:02:51 +01:00
Felix Moeller
a4b2ea586d
Style: Remove all the dangling white spaces
2012-11-04 22:16:04 +01:00
Felix Moeller
27ab0357ae
Checkstyle: Fix last six NewlineBeforeOpenBrace
2012-11-04 18:36:16 +01:00
Felix Moeller
0e70ea9d8b
Checkstyle: Fix the last 25 NoSpaceAfterComma
2012-11-04 18:28:29 +01:00
Felix Moeller
30d7993e01
Checkstyle fixes: NoSpaceAfterComma
2012-11-04 11:10:46 +01:00
Felix Moeller
afadf93d31
Checkstyle: many fixes
2012-11-02 19:53:02 +01:00
Jenkins for ownCloud
627509875e
[tx-robot] updated from transifex
2012-11-02 00:04:59 +01:00
Jenkins for ownCloud
aca6d3252f
[tx-robot] updated from transifex
2012-10-31 00:02:32 +01:00
Bart Visscher
9318a9566a
Merge pull request #136 from scambra/users-fixes
...
fix settings' routes
2012-10-29 15:31:37 -07:00
Bart Visscher
1bdd0c949b
Move and fix app setting navigation detect
2012-10-29 15:04:55 +01:00
scambra
1f0bc1713f
fix settings routes
2012-10-29 14:50:03 +01:00
Tom Needham
bcdf3a23db
Merge master into ocs_api
2012-10-28 11:16:04 +00:00
Jenkins for ownCloud
1a08ef6a06
[tx-robot] updated from transifex
2012-10-28 00:02:29 +02:00
Bart Visscher
0120f3fd62
Merge branch 'routing'
...
Conflicts:
core/lostpassword/index.php
core/lostpassword/resetpassword.php
2012-10-27 11:58:02 +02:00
Jenkins for ownCloud
3bef19c623
[tx-robot] updated from transifex
2012-10-27 00:02:05 +02:00
Robin Appelman
da57fbc93a
show/hide navigation entries after enabling/disabling app
2012-10-26 20:13:24 +02:00
Jenkins for ownCloud
c7d64811d6
[tx-robot] updated from transifex
2012-10-26 02:05:56 +02:00
Jenkins for ownCloud
f33af71eb0
[tx-robot] updated from transifex
2012-10-24 02:08:34 +02:00
Lukas Reschke
95505008ec
box-shadow can safely be used without vendor prefixes
2012-10-23 23:50:11 +02:00
Jenkins for ownCloud
bc2a648f2d
[tx-robot] updated from transifex
2012-10-23 02:06:03 +02:00
Jenkins for ownCloud
16c4eb66d7
[tx-robot] updated from transifex
2012-10-21 02:06:44 +02:00
Jenkins for ownCloud
cfbd310d34
[tx-robot] updated from transifex
2012-10-20 02:03:53 +02:00
Jenkins for ownCloud
519a0ae4ab
[tx-robot] updated from transifex
2012-10-18 02:09:32 +02:00
Bart Visscher
6081bfa2bc
Merge branch 'master' into routing
...
Conflicts:
lib/search/provider/file.php
settings/ajax/changepassword.php
settings/settings.php
2012-10-17 16:38:11 +02:00
Thomas Mueller
1c3a36a079
From now on we support two german translation: formal and personal
2012-10-16 23:40:14 +02:00
Jenkins for ownCloud
fd6adc7d08
[tx-robot] updated from transifex
2012-10-16 23:39:13 +02:00
Jenkins for ownCloud
c3823aa864
[tx-robot] updated from transifex
2012-10-16 02:08:21 +02:00
Lukas Reschke
f4142bd2a8
Move isUserVerified to OC_Util
2012-10-16 00:47:38 +02:00
Lukas Reschke
c404148f9a
Password check for admins
2012-10-16 00:47:38 +02:00
Lukas Reschke
c83a2a5517
Correct check for admin
2012-10-16 00:47:38 +02:00
Lukas Reschke
e6c9f5d9f4
Verify passwords for admins
2012-10-16 00:01:48 +02:00
Lukas Reschke
7e2d4e2a8e
Remove verify user from personal.php
2012-10-15 23:51:22 +02:00
Lukas Reschke
e3054b6201
Revert "Verify user login before changing the password reset mail"
...
This reverts commit 9aa9110fd9
.
2012-10-15 23:50:12 +02:00
Lukas Reschke
f475ed5cc1
Revert "Remove old password check from changepassword and use verifyUser instead"
...
This reverts commit e6b8153865
.
2012-10-15 23:49:49 +02:00
Lukas Reschke
9aa9110fd9
Verify user login before changing the password reset mail
2012-10-15 17:44:44 +02:00
Lukas Reschke
e6b8153865
Remove old password check from changepassword and use verifyUser instead
2012-10-15 17:44:44 +02:00
Lukas Reschke
6b39b80648
Change auth checks
2012-10-15 17:44:44 +02:00
Lukas Reschke
0b42d70259
Unneeded double check
2012-10-15 16:08:39 +03:00
Jenkins for ownCloud
c88cf5cae5
[tx-robot] updated from transifex
2012-10-14 02:08:47 +02:00
Robin Appelman
4c4fd36bdd
the Shared folder is no longer in the cache
2012-10-13 14:52:49 +02:00
Jenkins for ownCloud
d386bc8737
[tx-robot] updated from transifex
2012-10-13 02:08:50 +02:00
Jenkins for ownCloud
b761143047
[tx-robot] updated from transifex
2012-10-12 02:07:10 +02:00
Jenkins for ownCloud
673e3dae3f
[tx-robot] updated from transifex
2012-10-11 02:07:32 +02:00
Lukas Reschke
2f4b1b0e4c
Disallow users to delete their own accounts
2012-10-10 18:05:34 +02:00
Jenkins for ownCloud
fce6ce9bc6
[tx-robot] updated from transifex
2012-10-10 02:09:28 +02:00
Frank Karlitschek
c701bed2e3
fix a lot of small layout bugs and make the apps page overall prettier plus add ratings finally
2012-10-08 15:49:48 +02:00
Frank Karlitschek
306bfb44d3
no garbage on the screen please
2012-10-08 13:33:52 +02:00
Jenkins for ownCloud
e36317c21a
[tx-robot] updated from transifex
2012-10-07 02:08:12 +02:00
Jenkins for ownCloud
35c5f71989
[tx-robot] updated from transifex
2012-10-06 02:06:49 +02:00
Bart Visscher
f3a211c03c
Implement routing on javascript side
2012-10-05 09:42:36 +02:00
Bart Visscher
167e9c1cc0
Fix route name
2012-10-05 09:41:27 +02:00
Frank Karlitschek
7efbdb52f6
don´t show negative numbers. this is only a quickfix. I still dont get why the Shared folder can be bigger than the root folder. Perhaps a inconsitency in the filecache?
2012-10-04 12:58:57 +02:00
Jenkins for ownCloud
5c042d88ad
[tx-robot] updated from transifex
2012-10-04 02:07:35 +02:00
Jenkins for ownCloud
32a6b3b862
[tx-robot] updated from transifex
2012-10-02 23:18:26 +02:00
Bart Visscher
bb136b9adf
Make the settings ajax calls use the router
2012-10-02 18:00:23 +02:00
Jenkins for ownCloud
f0c4356392
[tx-robot] updated from transifex
2012-10-02 02:06:08 +02:00
Lukas Reschke
424062f4af
Merge pull request #21 from raghunayyar/master
...
CSS typo fixed.
2012-09-29 08:21:42 -07:00
Raghu Nayyar
0ffab9fea8
Update settings/css/settings.css
...
CSS typo fixed.
2012-09-29 20:50:37 +05:30
Jenkins for ownCloud
27bd9df027
[tx-robot] updated from transifex
2012-09-28 23:36:09 +02:00
Bart Visscher
d0bd2bbf27
Convert menu entries of settings pages to use router
2012-09-28 23:20:17 +02:00
Jenkins for ownCloud
5144d26088
[tx-robot] updated from transifex
2012-09-28 02:06:03 +02:00
Jenkins for ownCloud
2c00f8c850
[tx-robot] updated from transifex
2012-09-26 13:22:37 +02:00
Jenkins for ownCloud
5855355faa
[tx-robot] updated from transifex
2012-09-26 02:06:37 +02:00
Jenkins for ownCloud
e5487376da
[tx-robot] updated from transifex
2012-09-25 02:05:18 +02:00
Jenkins for ownCloud
ecb90d72f3
[tx-robot] updated from transifex
2012-09-24 02:04:10 +02:00
Jenkins for ownCloud
81ecabb19c
[tx-robot] updated from transifex
2012-09-23 02:04:41 +02:00
Jenkins for ownCloud
01160d0fb4
[tx-robot] updated from transifex
2012-09-22 01:18:31 +02:00
Jenkins for ownCloud
8f2c76d3da
[tx-robot] updated from transifex
2012-09-21 02:04:56 +02:00
Jenkins for ownCloud
7c42e88676
[tx-robot] updated from transifex
2012-09-20 02:09:31 +02:00
Jenkins for ownCloud
b0e645fe13
[tx-robot] updated from transifex
2012-09-19 02:07:26 +02:00
Tom Needham
729b36e495
Fix grammer and dont split translatable string
2012-09-18 21:31:03 +00:00
Sam Tuke
9df403f051
Added failsafes for retrieving remote apps on settings->apps page, in case categories or app data are not found
2012-09-18 16:55:03 +01:00
Sam Tuke
dc0dc56d48
Merge branch 'master' of https://github.com/owncloud/core
2012-09-18 14:36:08 +01:00
Sam Tuke
b765e883f3
Fixed bug with duplicate entries for installed 3rd party apps in settings->apps
...
Added method getAppstoreApps to OC_App
Added minor documentation
2012-09-18 14:35:27 +01:00
Jenkins for ownCloud
06e963c54f
[tx-robot] updated from transifex
2012-09-18 02:04:26 +02:00
Tom Needham
88b786e8dd
Merge branch 'master' into ocs_api
2012-09-17 12:09:34 +00:00
Thomas Müller
f85b709fae
Use correct translation file
...
every translation within the sub folder 'settings' need to use 'settings' on OC_L10N::get
2012-09-17 15:00:22 +03:00
Thomas Müller
1fd3c5fbc0
$l was undefined
2012-09-17 14:50:17 +03:00
Jenkins for ownCloud
dbd2dea689
[tx-robot] updated from transifex
2012-09-17 02:07:23 +02:00
Frank Karlitschek
4356f8daeb
add a bit more space
2012-09-16 20:31:56 +02:00
Alessandro Cosentino
158af74b3e
makes cron config layout similar to the sharing one
2012-09-16 12:40:08 -04:00
Frank Karlitschek
442f26ea80
structure the settings options a bit better.
2012-09-16 17:23:21 +02:00
Jenkins for ownCloud
6568671bdc
[tx-robot] updated from transifex
2012-09-16 02:03:40 +02:00
Jenkins for ownCloud
fbdefd5601
[tx-robot] updated from transifex
2012-09-15 02:05:52 +02:00
Jenkins for ownCloud
e41ccd4344
[tx-robot] updated from transifex
2012-09-14 02:03:18 +02:00
Tom Needham
227ada3257
Fix merge conflicts
2012-09-13 10:23:41 +00:00
Jenkins for ownCloud
bb0b438ace
[tx-robot] updated from transifex
2012-09-13 02:03:54 +02:00
Frank Karlitschek
54eae53206
Merge branch 'master' of https://github.com/owncloud/core
2012-09-12 12:10:57 +02:00
Frank Karlitschek
c0a3bdb757
improve the documentation for the cron config a bit
2012-09-12 12:09:46 +02:00
Jörn Friedrich Dreyer
62d8202d59
return a message when app could not be enabled
2012-09-12 12:02:39 +02:00
Jenkins for ownCloud
8c9c095d48
[tx-robot] updated from transifex
2012-09-12 02:02:58 +02:00
Jenkins for ownCloud
6a29bbda7a
[tx-robot] updated from transifex
2012-09-11 02:03:53 +02:00
Jenkins for ownCloud
5e790368bc
[tx-robot] updated from transifex
2012-09-09 02:03:35 +02:00
Jenkins for ownCloud
d5d2e89622
[tx-robot] updated from transifex
2012-09-08 02:05:41 +02:00
Thomas Mueller
3829460ab8
adding space between) and {
2012-09-07 15:22:01 +02:00
Jenkins for ownCloud
a94b56b57b
[tx-robot] updated from transifex
2012-09-07 02:07:22 +02:00
Jenkins for ownCloud
af3e767489
[tx-robot] updated from transifex
2012-09-06 02:06:37 +02:00
Thomas Mueller
ebb28412ca
no more require_once()
2012-09-05 23:28:59 +02:00
Bart Visscher
a8de0af273
Add 'var' before some global js vars
2012-09-05 22:26:09 +02:00
Bart Visscher
9329af921d
Add missing ; to js code
2012-09-05 22:26:09 +02:00
Brice Maron
5fc4c78106
Merge branch 'master' of git://github.com/owncloud/core
2012-09-05 16:16:36 +00:00
Brice Maron
a928b4cd66
Add more language name instead of codes for the setting choice
2012-09-05 16:16:19 +00:00
Thomas Tanghus
a2b6a92107
Disable asking to save password when adding users.
2012-09-05 17:22:03 +02:00
Jenkins for ownCloud
e8fcc71129
[tx-robot] updated from transifex
2012-09-05 02:05:39 +02:00
Thomas Mueller
685f03edf6
fixing translation - thx eMerzh
2012-09-04 23:49:43 +02:00
Thomas Mueller
66c2a391cb
underline link to the app store
2012-09-04 23:42:49 +02:00
Thomas Mueller
ae8d2d029f
Adding missing translation
2012-09-04 20:48:10 +02:00
Tom Needham
37bb16becb
API: Add callback_fail, add OC_OAuth::init and bespoke request token method
2012-09-04 11:10:42 +00:00
Jenkins for ownCloud
acb9682807
[tx-robot] updated from transifex
2012-09-04 12:43:53 +02:00
Thomas Müller
409ede0975
Update settings/templates/users.php
...
respect coding style
2012-09-04 13:05:09 +03:00
Thomas Müller
f3e330ce64
Update settings/templates/help.php
...
respect coding style
2012-09-04 13:03:51 +03:00
Thomas Müller
b698fab109
Update settings/ajax/userlist.php
...
respect coding style
2012-09-04 13:00:56 +03:00
Thomas Müller
4b3fc27a22
Update settings/ajax/togglegroups.php
...
respect coding style
2012-09-04 12:58:07 +03:00
Thomas Müller
9a8a101756
Update settings/ajax/setloglevel.php
...
respect coding style
2012-09-04 12:55:20 +03:00
Thomas Müller
dafe28e079
Update settings/ajax/setlanguage.php
...
respect coding style
2012-09-04 12:54:36 +03:00
Thomas Müller
93496a32cc
Update settings/ajax/removeuser.php
...
$l->t added for error message
2012-09-04 12:54:04 +03:00
Thomas Müller
de987b475d
Update settings/ajax/removeuser.php
...
respect coding style
2012-09-04 12:51:04 +03:00
Thomas Müller
04aea1eb2e
Update settings/ajax/removegroup.php
...
$l->t added for error message
2012-09-04 12:50:16 +03:00
Thomas Müller
b49e8cd04d
Update settings/ajax/removegroup.php
...
respect coding style
2012-09-04 12:49:50 +03:00
Thomas Müller
16b3ffb588
Update settings/ajax/openid.php
...
respect coding style
2012-09-04 12:49:21 +03:00
Thomas Müller
83575a4436
Update settings/ajax/creategroup.php
...
$l->t added to error messages
2012-09-04 12:48:42 +03:00
Thomas Müller
04033585b0
Update settings/ajax/lostpassword.php
...
respect coding style
2012-09-04 12:47:35 +03:00
Thomas Müller
6308f80329
Update settings/ajax/getlog.php
...
respect coding style
2012-09-04 12:46:56 +03:00
Thomas Müller
caaaf7a7bf
Update settings/ajax/creategroup.php
...
respect coding style
2012-09-04 12:45:54 +03:00
Thomas Müller
a570cc7b60
Update settings/ajax/setquota.php
...
respect coding style
2012-09-04 12:36:21 +03:00
Thomas Müller
e10f46d978
Update settings/ajax/createuser.php
...
respect coding style
2012-09-04 12:34:52 +03:00
Thomas Müller
69240afd7a
Update settings/ajax/changepassword.php
...
respect coding style
2012-09-04 12:32:27 +03:00
Thomas Müller
8bea9f34e6
Update settings/ajax/apps/ocs.php
...
respect coding style
2012-09-04 12:31:28 +03:00
Thomas Müller
7ab5256922
Update settings/personal.php
...
respect coding style
2012-09-04 12:29:41 +03:00
Thomas Müller
1063034e93
Update settings/apps.php
...
respect coding style
2012-09-04 12:28:49 +03:00
Thomas Müller
e87387c956
Update settings/users.php
...
respect coding style
2012-09-04 12:19:01 +03:00
Thomas Müller
01f5aa1b2d
Update settings/settings.php
...
respect coding style
2012-09-04 12:17:02 +03:00
Thomas Müller
dc2648b14c
Update settings/personal.php
...
respect coding style
2012-09-04 12:16:24 +03:00
Thomas Müller
0fe0bd86b8
Update settings/help.php
...
respect coding style
2012-09-04 12:14:43 +03:00
Thomas Müller
cfd62d422b
Update settings/apps.php
...
respect coding style
2012-09-04 12:14:09 +03:00
Jenkins for ownCloud
b867b738e8
[tx-robot] updated from transifex
2012-09-04 02:03:21 +02:00
Bart Visscher
38116c7efa
Add check for missing appinfo in apps settings page
2012-09-03 21:51:32 +02:00
Jenkins for ownCloud
d386e0172a
[tx-robot] updated from transifex
2012-09-03 02:07:40 +02:00
Jenkins for ownCloud
2bb7cb9f64
[tx-robot] updated from transifex
2012-09-02 02:02:53 +02:00
Robin Appelman
0fa254508d
dont use shorthand php tags
2012-09-01 16:38:23 +02:00
Jenkins for ownCloud
c0c48cb3ee
[tx-robot] updated from transifex
2012-09-01 13:37:28 +02:00
Thomas Mueller
10bd64debd
translation support enhanced
2012-09-01 13:23:37 +02:00
Jenkins for ownCloud
ab090d5277
[tx-robot] updated from transifex
2012-09-01 02:04:00 +02:00
Frank Karlitschek
72e80bf6bd
send the current owncloud version to the ocs server so that we can filter for compatible apps
2012-08-31 20:22:03 +02:00
Jenkins for ownCloud
75cd7eacf8
[tx-robot] updated from transifex
2012-08-31 02:07:19 +02:00
Robin Appelman
b5234a4f34
allow html inside app descriptions
2012-08-30 22:17:54 +02:00
Tom Needham
0d1d2c0b61
Fix class name
2012-08-30 14:01:27 +00:00
Jenkins for ownCloud
898ca364a2
[tx-robot] updated from transifex
2012-08-30 02:06:45 +02:00
Jenkins for ownCloud
9338d093f9
[tx-robot] updated from transifex
2012-08-29 02:06:48 +02:00
Michael Gapczynski
9ca6290317
Remove unused settings log file
2012-08-28 13:46:16 -04:00
Michael Gapczynski
aad7dc8390
Remove sharing notice in users settings - The default is now share with anyone, groups only sharing is now a setting in the admin page
2012-08-27 20:55:11 -04:00
Michael Gapczynski
42a291286b
Fix incorrect Javascript for changing Share API settings
2012-08-27 20:45:36 -04:00
Michael Gapczynski
9cd55508c3
Add Share API settings to admin page
2012-08-27 20:39:31 -04:00
Jenkins for ownCloud
8374a49cc1
[tx-robot] updated from transifex
2012-08-28 02:03:56 +02:00
Jan-Christoph Borchardt
09300e5f6e
fix cronjobs radio button width
2012-08-27 14:05:18 -07:00
Jörn Friedrich Dreyer
84a5faff36
remove files_imageviewer and files_texteditor from blacklist so they can be activated in a multi apps environment
2012-08-27 20:35:05 +02:00
Michael Gapczynski
59cf1d19e5
setbackgroundjobsmode.php got lost somewhere - switched call to use the perferred OC.AppConfig.setValue() instead
2012-08-26 22:05:34 -04:00
Michael Gapczynski
617449b230
Change URL from gitorious to github
2012-08-26 21:38:53 -04:00
Michael Gapczynski
d6bb04a74e
Move jquery.inview from contacts app to core
2012-08-26 17:55:51 -04:00
Jenkins for ownCloud
faf702b9e6
[tx-robot] updated from transifex
2012-08-26 19:47:33 +02:00
Jenkins for ownCloud
bae07faa34
[tx-robot] updated from transifex
2012-08-26 01:20:16 +02:00
Georg Ehrke
80374c7cb2
fix UI bug with subadmins
2012-08-25 14:35:24 +02:00
Jörn Friedrich Dreyer
4f5eff2b6f
Merge branch 'master' of git://gitorious.org/owncloud/owncloud into oracle-support
2012-08-25 03:14:26 +02:00
Jenkins for ownCloud
f57d527a7c
[tx-robot] updated from transifex
2012-08-25 02:08:36 +02:00
Jörn Friedrich Dreyer
c8255a170c
Merge branch 'master' of git://gitorious.org/owncloud/owncloud into oracle-support
...
Conflicts:
3rdparty/Sabre/CardDAV/Plugin.php
3rdparty/smb4php/smb.php
apps/bookmarks/ajax/addBookmark.php
apps/bookmarks/ajax/editBookmark.php
apps/bookmarks/appinfo/migrate.php
apps/calendar/ajax/calendar/edit.form.php
apps/calendar/ajax/changeview.php
apps/calendar/ajax/import/import.php
apps/calendar/ajax/settings/guesstimezone.php
apps/calendar/ajax/settings/setfirstday.php
apps/calendar/ajax/settings/settimeformat.php
apps/calendar/ajax/share/changepermission.php
apps/calendar/ajax/share/share.php
apps/calendar/ajax/share/unshare.php
apps/calendar/appinfo/app.php
apps/calendar/appinfo/remote.php
apps/calendar/appinfo/update.php
apps/calendar/appinfo/version
apps/calendar/js/calendar.js
apps/calendar/l10n/da.php
apps/calendar/l10n/de.php
apps/calendar/l10n/fi_FI.php
apps/calendar/l10n/gl.php
apps/calendar/l10n/he.php
apps/calendar/l10n/hr.php
apps/calendar/l10n/ja_JP.php
apps/calendar/l10n/lb.php
apps/calendar/l10n/lt_LT.php
apps/calendar/l10n/nb_NO.php
apps/calendar/l10n/pl.php
apps/calendar/l10n/pt_PT.php
apps/calendar/l10n/ro.php
apps/calendar/l10n/ru.php
apps/calendar/l10n/sv.php
apps/calendar/l10n/zh_CN.php
apps/calendar/l10n/zh_TW.php
apps/calendar/lib/app.php
apps/calendar/lib/calendar.php
apps/calendar/lib/object.php
apps/calendar/lib/share.php
apps/calendar/templates/part.choosecalendar.rowfields.php
apps/calendar/templates/part.import.php
apps/calendar/templates/settings.php
apps/contacts/ajax/activation.php
apps/contacts/ajax/addressbook/delete.php
apps/contacts/ajax/contact/add.php
apps/contacts/ajax/contact/addproperty.php
apps/contacts/ajax/contact/delete.php
apps/contacts/ajax/contact/deleteproperty.php
apps/contacts/ajax/contact/saveproperty.php
apps/contacts/ajax/createaddressbook.php
apps/contacts/ajax/cropphoto.php
apps/contacts/ajax/currentphoto.php
apps/contacts/ajax/importaddressbook.php
apps/contacts/ajax/oc_photo.php
apps/contacts/ajax/savecrop.php
apps/contacts/ajax/selectaddressbook.php
apps/contacts/ajax/updateaddressbook.php
apps/contacts/ajax/uploadimport.php
apps/contacts/ajax/uploadphoto.php
apps/contacts/appinfo/migrate.php
apps/contacts/appinfo/remote.php
apps/contacts/css/contacts.css
apps/contacts/import.php
apps/contacts/index.php
apps/contacts/js/contacts.js
apps/contacts/l10n/ca.php
apps/contacts/l10n/cs_CZ.php
apps/contacts/l10n/da.php
apps/contacts/l10n/de.php
apps/contacts/l10n/el.php
apps/contacts/l10n/eo.php
apps/contacts/l10n/es.php
apps/contacts/l10n/et_EE.php
apps/contacts/l10n/eu.php
apps/contacts/l10n/fa.php
apps/contacts/l10n/fi_FI.php
apps/contacts/l10n/fr.php
apps/contacts/l10n/he.php
apps/contacts/l10n/hr.php
apps/contacts/l10n/hu_HU.php
apps/contacts/l10n/ia.php
apps/contacts/l10n/it.php
apps/contacts/l10n/ja_JP.php
apps/contacts/l10n/ko.php
apps/contacts/l10n/lb.php
apps/contacts/l10n/mk.php
apps/contacts/l10n/nb_NO.php
apps/contacts/l10n/nl.php
apps/contacts/l10n/pl.php
apps/contacts/l10n/pt_BR.php
apps/contacts/l10n/pt_PT.php
apps/contacts/l10n/ro.php
apps/contacts/l10n/ru.php
apps/contacts/l10n/sk_SK.php
apps/contacts/l10n/sl.php
apps/contacts/l10n/sv.php
apps/contacts/l10n/th_TH.php
apps/contacts/l10n/tr.php
apps/contacts/l10n/zh_CN.php
apps/contacts/l10n/zh_TW.php
apps/contacts/lib/addressbook.php
apps/contacts/lib/hooks.php
apps/contacts/lib/vcard.php
apps/contacts/photo.php
apps/contacts/templates/part.contact.php
apps/contacts/templates/part.contacts.php
apps/contacts/templates/part.cropphoto.php
apps/contacts/templates/part.importaddressbook.php
apps/contacts/templates/part.selectaddressbook.php
apps/contacts/thumbnail.php
apps/files/ajax/download.php
apps/files/ajax/newfile.php
apps/files/ajax/timezone.php
apps/files/appinfo/update.php
apps/files/appinfo/version
apps/files/index.php
apps/files/js/fileactions.js
apps/files/js/filelist.js
apps/files/js/files.js
apps/files/l10n/ar.php
apps/files/l10n/bg_BG.php
apps/files/l10n/ca.php
apps/files/l10n/cs_CZ.php
apps/files/l10n/da.php
apps/files/l10n/de.php
apps/files/l10n/el.php
apps/files/l10n/eo.php
apps/files/l10n/es.php
apps/files/l10n/et_EE.php
apps/files/l10n/eu.php
apps/files/l10n/fa.php
apps/files/l10n/fi_FI.php
apps/files/l10n/fr.php
apps/files/l10n/gl.php
apps/files/l10n/he.php
apps/files/l10n/hr.php
apps/files/l10n/hu_HU.php
apps/files/l10n/ia.php
apps/files/l10n/id.php
apps/files/l10n/it.php
apps/files/l10n/ja_JP.php
apps/files/l10n/ko.php
apps/files/l10n/lb.php
apps/files/l10n/lt_LT.php
apps/files/l10n/mk.php
apps/files/l10n/ms_MY.php
apps/files/l10n/nb_NO.php
apps/files/l10n/nl.php
apps/files/l10n/nn_NO.php
apps/files/l10n/pl.php
apps/files/l10n/pt_BR.php
apps/files/l10n/pt_PT.php
apps/files/l10n/ro.php
apps/files/l10n/ru.php
apps/files/l10n/sk_SK.php
apps/files/l10n/sl.php
apps/files/l10n/sr.php
apps/files/l10n/sr@latin.php
apps/files/l10n/sv.php
apps/files/l10n/th_TH.php
apps/files/l10n/tr.php
apps/files/l10n/uk.php
apps/files/l10n/zh_CN.php
apps/files/l10n/zh_TW.php
apps/files_archive/js/archive.js
apps/files_encryption/lib/cryptstream.php
apps/files_encryption/lib/proxy.php
apps/files_encryption/tests/proxy.php
apps/files_external/appinfo/app.php
apps/files_external/lib/smb.php
apps/files_external/lib/streamwrapper.php
apps/files_external/tests/config.php
apps/files_external/tests/smb.php
apps/files_sharing/ajax/email.php
apps/files_sharing/ajax/getitem.php
apps/files_sharing/ajax/setpermissions.php
apps/files_sharing/ajax/share.php
apps/files_sharing/ajax/toggleresharing.php
apps/files_sharing/ajax/unshare.php
apps/files_sharing/ajax/userautocomplete.php
apps/files_sharing/js/settings.js
apps/files_sharing/js/share.js
apps/files_sharing/lib_share.php
apps/files_sharing/settings.php
apps/files_sharing/sharedstorage.php
apps/files_sharing/templates/settings.php
apps/files_versions/ajax/rollbackVersion.php
apps/files_versions/versions.php
apps/gallery/ajax/thumbnail.php
apps/gallery/appinfo/app.php
apps/gallery/appinfo/update.php
apps/gallery/appinfo/version
apps/gallery/css/styles.css
apps/gallery/index.php
apps/gallery/js/pictures.js
apps/gallery/l10n/ca.php
apps/gallery/l10n/cs_CZ.php
apps/gallery/l10n/de.php
apps/gallery/l10n/el.php
apps/gallery/l10n/es.php
apps/gallery/l10n/fi_FI.php
apps/gallery/l10n/fr.php
apps/gallery/l10n/it.php
apps/gallery/l10n/pl.php
apps/gallery/l10n/pt_PT.php
apps/gallery/l10n/ru.php
apps/gallery/l10n/sl.php
apps/gallery/l10n/sv.php
apps/gallery/l10n/th_TH.php
apps/gallery/l10n/tr.php
apps/gallery/l10n/zh_CN.php
apps/gallery/lib/album.php
apps/gallery/lib/hooks_handlers.php
apps/gallery/lib/managers.php
apps/gallery/lib/photo.php
apps/gallery/lib/tiles.php
apps/gallery/lib/tiles_test.php
apps/gallery/templates/index.php
apps/media/lib_ampache.php
apps/media/lib_collection.php
apps/media/lib_media.php
apps/remoteStorage/lib_remoteStorage.php
apps/tasks/ajax/addtaskform.php
apps/tasks/ajax/edittask.php
apps/user_ldap/appinfo/update.php
apps/user_ldap/group_ldap.php
apps/user_ldap/lib_ldap.php
apps/user_ldap/settings.php
apps/user_ldap/templates/settings.php
apps/user_ldap/user_ldap.php
apps/user_migrate/appinfo/app.php
apps/user_migrate/templates/settings.php
apps/user_webfinger/host-meta.php
config/config.sample.php
core/js/js.js
core/l10n/da.php
core/l10n/de.php
core/l10n/fi_FI.php
core/l10n/gl.php
core/l10n/he.php
core/l10n/hr.php
core/l10n/id.php
core/l10n/ja_JP.php
core/l10n/lb.php
core/l10n/lt_LT.php
core/l10n/nb_NO.php
core/l10n/pl.php
core/l10n/pt_PT.php
core/l10n/ro.php
core/l10n/ru.php
core/l10n/sv.php
core/lostpassword/index.php
core/templates/layout.user.php
core/templates/login.php
db_structure.xml
index.php
l10n/af/calendar.po
l10n/af/contacts.po
l10n/af/core.po
l10n/af/files.po
l10n/af/settings.po
l10n/ar/calendar.po
l10n/ar/contacts.po
l10n/ar/core.po
l10n/ar/files.po
l10n/ar/media.po
l10n/ar/settings.po
l10n/bg_BG/calendar.po
l10n/bg_BG/contacts.po
l10n/bg_BG/core.po
l10n/bg_BG/files.po
l10n/bg_BG/media.po
l10n/bg_BG/settings.po
l10n/ca/calendar.po
l10n/ca/contacts.po
l10n/ca/core.po
l10n/ca/files.po
l10n/ca/gallery.po
l10n/ca/settings.po
l10n/cs_CZ/calendar.po
l10n/cs_CZ/contacts.po
l10n/cs_CZ/core.po
l10n/cs_CZ/files.po
l10n/cs_CZ/gallery.po
l10n/cs_CZ/settings.po
l10n/da/calendar.po
l10n/da/contacts.po
l10n/da/core.po
l10n/da/files.po
l10n/da/settings.po
l10n/de/calendar.po
l10n/de/contacts.po
l10n/de/core.po
l10n/de/files.po
l10n/de/gallery.po
l10n/de/settings.po
l10n/el/calendar.po
l10n/el/contacts.po
l10n/el/core.po
l10n/el/files.po
l10n/el/gallery.po
l10n/el/settings.po
l10n/eo/calendar.po
l10n/eo/contacts.po
l10n/eo/core.po
l10n/eo/files.po
l10n/eo/media.po
l10n/eo/settings.po
l10n/es/calendar.po
l10n/es/contacts.po
l10n/es/core.po
l10n/es/files.po
l10n/es/gallery.po
l10n/es/settings.po
l10n/et_EE/calendar.po
l10n/et_EE/contacts.po
l10n/et_EE/core.po
l10n/et_EE/files.po
l10n/et_EE/settings.po
l10n/eu/calendar.po
l10n/eu/contacts.po
l10n/eu/core.po
l10n/eu/files.po
l10n/eu/settings.po
l10n/fa/calendar.po
l10n/fa/contacts.po
l10n/fa/core.po
l10n/fa/files.po
l10n/fa/settings.po
l10n/fi_FI/calendar.po
l10n/fi_FI/contacts.po
l10n/fi_FI/core.po
l10n/fi_FI/files.po
l10n/fi_FI/gallery.po
l10n/fi_FI/settings.po
l10n/fr/calendar.po
l10n/fr/contacts.po
l10n/fr/core.po
l10n/fr/files.po
l10n/fr/gallery.po
l10n/fr/media.po
l10n/fr/settings.po
l10n/gl/calendar.po
l10n/gl/contacts.po
l10n/gl/core.po
l10n/gl/files.po
l10n/gl/settings.po
l10n/he/calendar.po
l10n/he/contacts.po
l10n/he/core.po
l10n/he/files.po
l10n/he/settings.po
l10n/hr/calendar.po
l10n/hr/contacts.po
l10n/hr/core.po
l10n/hr/files.po
l10n/hr/settings.po
l10n/hu_HU/calendar.po
l10n/hu_HU/contacts.po
l10n/hu_HU/core.po
l10n/hu_HU/files.po
l10n/hu_HU/settings.po
l10n/hy/calendar.po
l10n/hy/contacts.po
l10n/hy/core.po
l10n/hy/files.po
l10n/hy/settings.po
l10n/ia/calendar.po
l10n/ia/contacts.po
l10n/ia/core.po
l10n/ia/files.po
l10n/ia/settings.po
l10n/id/calendar.po
l10n/id/contacts.po
l10n/id/core.po
l10n/id/files.po
l10n/id/settings.po
l10n/it/calendar.po
l10n/it/contacts.po
l10n/it/core.po
l10n/it/files.po
l10n/it/gallery.po
l10n/it/settings.po
l10n/ja_JP/calendar.po
l10n/ja_JP/contacts.po
l10n/ja_JP/core.po
l10n/ja_JP/files.po
l10n/ja_JP/settings.po
l10n/ko/calendar.po
l10n/ko/contacts.po
l10n/ko/core.po
l10n/ko/files.po
l10n/ko/settings.po
l10n/lb/calendar.po
l10n/lb/contacts.po
l10n/lb/core.po
l10n/lb/files.po
l10n/lb/settings.po
l10n/lt_LT/calendar.po
l10n/lt_LT/contacts.po
l10n/lt_LT/core.po
l10n/lt_LT/files.po
l10n/lt_LT/settings.po
l10n/mk/calendar.po
l10n/mk/contacts.po
l10n/mk/core.po
l10n/mk/files.po
l10n/mk/settings.po
l10n/ms_MY/calendar.po
l10n/ms_MY/contacts.po
l10n/ms_MY/core.po
l10n/ms_MY/files.po
l10n/ms_MY/settings.po
l10n/nb_NO/calendar.po
l10n/nb_NO/contacts.po
l10n/nb_NO/core.po
l10n/nb_NO/files.po
l10n/nb_NO/settings.po
l10n/nl/calendar.po
l10n/nl/contacts.po
l10n/nl/core.po
l10n/nl/files.po
l10n/nl/settings.po
l10n/nn_NO/calendar.po
l10n/nn_NO/contacts.po
l10n/nn_NO/core.po
l10n/nn_NO/files.po
l10n/nn_NO/settings.po
l10n/pl/calendar.po
l10n/pl/contacts.po
l10n/pl/core.po
l10n/pl/files.po
l10n/pl/gallery.po
l10n/pl/settings.po
l10n/pt_BR/calendar.po
l10n/pt_BR/contacts.po
l10n/pt_BR/core.po
l10n/pt_BR/files.po
l10n/pt_BR/settings.po
l10n/pt_PT/calendar.po
l10n/pt_PT/contacts.po
l10n/pt_PT/core.po
l10n/pt_PT/files.po
l10n/pt_PT/gallery.po
l10n/pt_PT/settings.po
l10n/ro/calendar.po
l10n/ro/contacts.po
l10n/ro/core.po
l10n/ro/files.po
l10n/ro/settings.po
l10n/ru/calendar.po
l10n/ru/contacts.po
l10n/ru/core.po
l10n/ru/files.po
l10n/ru/gallery.po
l10n/ru/settings.po
l10n/sk_SK/calendar.po
l10n/sk_SK/contacts.po
l10n/sk_SK/core.po
l10n/sk_SK/files.po
l10n/sk_SK/settings.po
l10n/sl/calendar.po
l10n/sl/contacts.po
l10n/sl/core.po
l10n/sl/files.po
l10n/sl/gallery.po
l10n/sl/settings.po
l10n/sr/calendar.po
l10n/sr/contacts.po
l10n/sr/core.po
l10n/sr/files.po
l10n/sr/settings.po
l10n/sr@latin/calendar.po
l10n/sr@latin/contacts.po
l10n/sr@latin/core.po
l10n/sr@latin/files.po
l10n/sr@latin/settings.po
l10n/sv/calendar.po
l10n/sv/contacts.po
l10n/sv/core.po
l10n/sv/files.po
l10n/sv/gallery.po
l10n/sv/media.po
l10n/sv/settings.po
l10n/templates/bookmarks.pot
l10n/templates/calendar.pot
l10n/templates/contacts.pot
l10n/templates/core.pot
l10n/templates/files.pot
l10n/templates/gallery.pot
l10n/templates/media.pot
l10n/templates/settings.pot
l10n/th_TH/calendar.po
l10n/th_TH/contacts.po
l10n/th_TH/core.po
l10n/th_TH/files.po
l10n/th_TH/gallery.po
l10n/th_TH/settings.po
l10n/tr/calendar.po
l10n/tr/contacts.po
l10n/tr/core.po
l10n/tr/files.po
l10n/tr/gallery.po
l10n/tr/settings.po
l10n/uk/calendar.po
l10n/uk/contacts.po
l10n/uk/core.po
l10n/uk/files.po
l10n/uk/media.po
l10n/uk/settings.po
l10n/zh_CN/calendar.po
l10n/zh_CN/contacts.po
l10n/zh_CN/core.po
l10n/zh_CN/files.po
l10n/zh_CN/gallery.po
l10n/zh_CN/settings.po
l10n/zh_TW/calendar.po
l10n/zh_TW/contacts.po
l10n/zh_TW/core.po
l10n/zh_TW/files.po
l10n/zh_TW/settings.po
lib/app.php
lib/base.php
lib/connector/sabre/file.php
lib/connector/sabre/locks.php
lib/connector/sabre/node.php
lib/db.php
lib/filecache.php
lib/fileproxy/quota.php
lib/files.php
lib/filestorage/local.php
lib/filesystemview.php
lib/group/database.php
lib/helper.php
lib/installer.php
lib/json.php
lib/l10n.php
lib/migrate.php
lib/mimetypes.fixlist.php
lib/ocs.php
lib/preferences.php
lib/public/json.php
lib/public/util.php
lib/template.php
lib/user.php
lib/user/database.php
lib/util.php
lib/vcategories.php
ocs/providers.php
settings/admin.php
settings/ajax/lostpassword.php
settings/ajax/removeuser.php
settings/ajax/setbackgroundjobsmode.php
settings/ajax/setlanguage.php
settings/ajax/setquota.php
settings/ajax/togglegroups.php
settings/apps.php
settings/css/settings.css
settings/js/apps.js
settings/js/users.js
settings/l10n/bg_BG.php
settings/l10n/ca.php
settings/l10n/cs_CZ.php
settings/l10n/da.php
settings/l10n/de.php
settings/l10n/el.php
settings/l10n/eo.php
settings/l10n/es.php
settings/l10n/et_EE.php
settings/l10n/eu.php
settings/l10n/fa.php
settings/l10n/fi_FI.php
settings/l10n/fr.php
settings/l10n/gl.php
settings/l10n/he.php
settings/l10n/hr.php
settings/l10n/hu_HU.php
settings/l10n/it.php
settings/l10n/ja_JP.php
settings/l10n/ko.php
settings/l10n/lt_LT.php
settings/l10n/mk.php
settings/l10n/ms_MY.php
settings/l10n/nb_NO.php
settings/l10n/nl.php
settings/l10n/nn_NO.php
settings/l10n/pl.php
settings/l10n/pt_BR.php
settings/l10n/pt_PT.php
settings/l10n/ru.php
settings/l10n/sk_SK.php
settings/l10n/sl.php
settings/l10n/sv.php
settings/l10n/th_TH.php
settings/l10n/tr.php
settings/l10n/zh_CN.php
settings/personal.php
settings/templates/admin.php
settings/templates/users.php
2012-08-25 00:05:07 +02:00
Georg Ehrke
4d3c45a826
backport 1bccc80996
2012-08-24 15:00:53 +02:00
Jenkins for ownCloud
07a889631e
[tx-robot] updated from transifex
2012-08-24 02:07:18 +02:00
Jenkins for ownCloud
082ed4ab71
[tx-robot] updated from transifex
2012-08-23 02:07:35 +02:00
Jenkins for ownCloud
e6d87b2c4b
[tx-robot] updated from transifex
2012-08-22 02:08:16 +02:00
Jenkins for ownCloud
b819aa33f7
[tx-robot] updated from transifex
2012-08-21 02:09:12 +02:00
Jenkins for ownCloud
f893d21660
[tx-robot] updated from transifex
2012-08-20 02:03:51 +02:00
Jenkins for ownCloud
36474e5681
[tx-robot] updated from transifex
2012-08-20 02:01:32 +02:00
Robin Appelman
eb42148210
fix error in check if app is installed
2012-08-18 23:15:38 +02:00
Lukas Reschke
d54390b1a0
Optimized image size
2012-08-18 13:56:04 +02:00
Jenkins for ownCloud
f1cabdd8e0
[tx-robot] updated from transifex
2012-08-18 02:04:07 +02:00
Georg Ehrke
ced234a81a
rename subadmin to group admin
2012-08-17 16:00:24 +02:00
Jenkins for ownCloud
1e6dc67517
[tx-robot] updated from transifex
2012-08-16 02:09:15 +02:00
Jenkins for ownCloud
da3896808a
[tx-robot] updated from transifex
2012-08-15 02:07:20 +02:00
Jenkins for ownCloud
355a1adb3a
[tx-robot] updated from transifex
2012-08-12 02:04:58 +02:00
Jakob Sack
0c69e64b86
Backgroundjobs: Fix template
2012-08-12 00:44:25 +02:00
Jakob Sack
2bc8d3e5d6
Backgroundjobs: interface improvements
2012-08-12 00:37:14 +02:00
Michael Gapczynski
a5a5ab2318
Add type text to new user, fixes display issue
2012-08-11 16:29:41 -04:00
Michael Gapczynski
651245effa
Use limit and offset for subadmin users
2012-08-11 16:25:28 -04:00
Michael Gapczynski
400533af2c
Start with 30 users, this fills my screen
2012-08-11 16:25:27 -04:00
Michael Gapczynski
9d2ae5fa1f
Add infinite scrolling to Settings -> Users, still a little buggy
2012-08-11 16:25:27 -04:00
Michael Gapczynski
baa0b4d530
Cast subadmin groups as strings
2012-08-11 16:25:27 -04:00
Jakob Sack
bd90b7eaca
Backgroundjobs: Fix bug in admin interface
2012-08-11 17:37:53 +02:00
Jenkins for ownCloud
39b9052c2f
[tx-robot] updated from transifex
2012-08-11 02:05:58 +02:00
Jakob Sack
9ad31e5f81
Backgroundjobs: use correct var name in template
2012-08-10 01:44:38 +02:00
Jakob Sack
7c766cdfe0
Backgroundjobs: fix bugs in template
2012-08-10 01:42:30 +02:00
Jakob Sack
7055d2aa2b
Backgroundjobs: improve admin form
2012-08-10 01:36:33 +02:00
Jakob Sack
2b5f005547
Backgroundjobs: Forgot to require lib/base.php
2012-08-09 21:29:45 +02:00
Jakob Sack
1ce2cd73ff
Add first version of backgroundjobs settings
2012-08-09 10:41:10 +02:00
Jenkins for ownCloud
a9f894ce11
[tx-robot] updated from transifex
2012-08-07 02:07:50 +02:00
Jenkins for ownCloud
9ca8d20a99
[tx-robot] updated from transifex
2012-08-06 02:02:50 +02:00
Jenkins for ownCloud
6fbc4f712a
[tx-robot] updated from transifex
2012-08-05 19:02:23 +02:00
Thomas Tanghus
07fd517fda
Make 3rd party label a bit smaller.
2012-08-05 02:54:18 +02:00
Thomas Tanghus
a138b4d04e
Some more pixel pushing.
2012-08-05 01:57:13 +02:00
Thomas Tanghus
ce866a5bdb
CSS tweaks for app settings.
2012-08-05 01:42:17 +02:00
Thomas Tanghus
c6b337c3dd
Return possibly changed appid.
2012-08-05 01:42:17 +02:00
Thomas Tanghus
97853a1ae5
Restructure JS code and small fixes.
2012-08-04 23:48:36 +02:00
Michael Gapczynski
f95ca36b49
Listen to correct undo click for undoing deleting users
2012-08-04 17:03:36 -04:00
Michael Gapczynski
1ec27399a7
Show delete tipsy for users
2012-08-04 17:00:16 -04:00
Michael Gapczynski
002ad4ba16
Tweak users delete notification
2012-08-04 16:44:26 -04:00
Thomas Tanghus
f17876d093
Remove unused code.
2012-08-04 21:25:41 +02:00
Alessandro Cosentino
95fc7f4cb7
Merge branch 'master' of gitorious.org:owncloud/owncloud
2012-08-04 14:35:27 -04:00
Alessandro Cosentino
84aa7c7b54
link of Add your app was broken
2012-08-04 14:34:57 -04:00
Thomas Tanghus
e1d4f85102
Wait with csrf check for now.
2012-08-04 20:26:28 +02:00
Thomas Tanghus
d19803654f
And add the file goddammit
2012-08-04 20:25:20 +02:00
Thomas Tanghus
24af2e8078
Load OCS apps in an ajax call to avoid blocking the WUI.
2012-08-04 20:16:32 +02:00
Alessandro Cosentino
226af11f33
reset version number when not specified - again bug oc-1433
2012-08-04 13:08:55 -04:00
Alessandro Cosentino
627ea9efe4
fixes bug oc-1433
2012-08-04 12:39:23 -04:00
Georg Ehrke
1bccc80996
hide morelog button if there are no more log entries - bugfix for oc-1398
2012-08-04 17:38:31 +02:00
Jenkins for ownCloud
d7e77f6426
[tx-robot] updated from transifex
2012-08-04 02:04:21 +02:00
Tom Needham
21f8646ffc
API: Fix merging of responses. Return 400 error when no OAuth operation sent.
2012-08-03 15:20:01 +00:00
Tom Needham
a7906d813a
Move OAuth classes into lib/oauth
2012-08-03 11:47:05 +00:00
Tom Needham
88c6928bad
API: Use OC_API::checkLoggedIn() and OAuth scopes are app_$appname
2012-08-03 11:36:01 +00:00
Michael Gapczynski
e3d88270cc
OAuth server implementation using oauth library
2012-08-02 20:02:31 -04:00
Jenkins for ownCloud
91e828c6ce
[tx-robot] updated from transifex
2012-08-02 02:06:16 +02:00
Georg Ehrke
47e4793c30
little fix for previous commit
2012-08-01 18:04:06 +02:00
Georg Ehrke
8766b3286b
fix a subadmin UI bug
2012-08-01 18:03:08 +02:00
Jenkins for ownCloud
36ccaf51ed
[tx-robot] updated from transifex
2012-07-31 22:57:24 +02:00
Tom Needham
91daf54d7c
Check if required apps are installed
2012-07-30 16:41:07 +00:00
Michael Gapczynski
41a74e3dd2
Check if size isset, try to fix used space calculation again, fixs bug oc-1331
...
Conflicts:
settings/personal.php
2012-07-30 10:07:19 -04:00
Michael Gapczynski
164fc1c981
Fix used space calculation if shared folder does not exist, fixes bug oc-1331
...
Conflicts:
settings/personal.php
2012-07-30 10:07:19 -04:00
Tom Needham
e47a8a9f09
Authorisation requires you to be logged in
2012-07-30 13:14:29 +00:00
Tom Needham
cbc0f0c1c5
Include the css for the OAuth page
2012-07-30 10:51:48 +00:00
Tom Needham
138c66a2ba
Improve styling of permission request page
2012-07-30 10:51:00 +00:00
Tom Needham
5933d43901
Basic template for authorising exernal apps with OAuth
2012-07-30 10:25:41 +00:00
Jenkins for ownCloud
3430dcd367
[tx-robot] updated from transifex
2012-07-30 02:05:41 +02:00
Jenkins for ownCloud
18f6552a08
[tx-robot] updated from transifex
2012-07-29 02:06:29 +02:00
Jenkins for ownCloud
fa4052d6f1
[tx-robot] updated from transifex
2012-07-28 02:05:38 +02:00
Michael Gapczynski
7050f0fa67
Cast groups as string, fixes bug oc-1309. Thanks to nderambure.
2012-07-26 23:54:25 -04:00
Michael Gapczynski
d1dee28437
Check if size isset, try to fix used space calculation again, fixs bug oc-1331
2012-07-26 20:45:58 -04:00
Jenkins for ownCloud
0a9c33e151
[tx-robot] updated from transifex
2012-07-27 02:04:26 +02:00
Georg Ehrke
ebe4d1f0ee
Merge branch 'subadmin'
2012-07-26 16:50:02 +02:00
Georg Ehrke
e1d14ab461
Merge branch 'master' into subadmin
2012-07-26 16:47:05 +02:00
Michael Gapczynski
0810f92894
Fix used space calculation if shared folder does not exist, fixes bug oc-1331
2012-07-26 10:30:33 -04:00
Jenkins for ownCloud
ba0ea21074
[tx-robot] updated from transifex
2012-07-26 08:04:12 +02:00
Jenkins for ownCloud
42c22bee36
[tx-robot] updated from transifex
2012-07-26 08:03:10 +02:00
Georg Ehrke
88f66460a3
some js improvements for subadmins
2012-07-21 13:10:51 +02:00
Lukas Reschke
93579d88dc
CSRF checks
2012-07-20 20:39:20 +02:00
Georg Ehrke
bf9b6e9ccc
don't show label 'add group' for subadmins and remove some debug code
2012-07-20 17:18:40 +02:00
Georg Ehrke
c3bd30cc6b
improve default qouta for subadmins
2012-07-20 15:20:48 +02:00
Georg Ehrke
7f08c84739
fix tooglegroup for subadmins
2012-07-20 15:13:51 +02:00
Georg Ehrke
e42f765697
simplify code of createuser.php
2012-07-20 15:04:50 +02:00
Georg Ehrke
9157888334
simplify code of changepassword.php
2012-07-19 19:32:59 +02:00
Georg Ehrke
6cf418f2fa
fix copy&paste fail and deny subadmins to set the default qouta
2012-07-19 18:00:33 +02:00
Georg Ehrke
2fc834230a
fix setqouta for subadmins
2012-07-19 16:37:41 +02:00
Georg Ehrke
ffc55f3510
simplify code of remoteuser.php
2012-07-19 16:35:14 +02:00
Georg Ehrke
fb6468936e
fix removeuser.php for subadmins
2012-07-18 17:23:40 +02:00
Georg Ehrke
f503aea099
remove unused code from togglesubadmins.php
2012-07-18 15:28:12 +02:00
Georg Ehrke
4490a88492
fix changepassword.php for subadmins
2012-07-18 15:27:31 +02:00
Georg Ehrke
4700222ea9
Merge branch 'master' into subadmin
2012-07-15 16:33:17 +02:00
Georg Ehrke
044134a289
add another file which was missing in the previous commit
2012-07-15 16:32:57 +02:00
Georg Ehrke
e707e94857
subadmins can now add users
2012-07-15 16:31:28 +02:00
Michael Gapczynski
b455149bae
Fix undo delete user
2012-07-14 16:57:16 -04:00
Michael Gapczynski
8890a41280
Fix setting custom quota size for users, bug fix for oc-1128
2012-07-11 18:25:08 -04:00
Georg Ehrke
0cb9f5e159
fix merge conflicts
2012-07-11 10:50:18 +02:00
Georg Ehrke
d0b625352c
some work on subadmins
2012-07-09 21:51:19 +02:00
Jörn Friedrich Dreyer
e59a1806cf
remove superfluous ?> at the end of .php files (left out apps/*/templates)
2012-07-09 16:51:16 +02:00
Lukas Reschke
777eb1d8b1
CSRF check in the settings
2012-07-07 15:27:04 +02:00
Sam Tuke
825d92d59c
Added undo functionality to delete user procedure on user settings page
2012-07-04 14:30:42 +01:00
Michael Gapczynski
ffadbfcef3
Prevent duplicate group showing in multiselect that added the group
2012-07-01 11:36:57 -04:00
Michael Gapczynski
949cab7ea1
Add new group to other user's group select forms
2012-07-01 11:36:31 -04:00
Michael Gapczynski
5121c262e2
Revert "bugfix for #1098 (assigning a group to a user, the group appears incrementally many times the more you assign it)"
...
This reverts commit 265d7e50f5
.
2012-07-01 11:35:58 -04:00
Michael Gapczynski
7ceba61413
Revert "bugfix for #1098 (assigning a group to a user, the group appears incrementally many times the more you assign it)"
...
This reverts commit 265d7e50f5
.
2012-07-01 11:29:02 -04:00
Michael Gapczynski
c992482e92
Prevent duplicate group showing in multiselect that added the group
2012-06-29 17:52:44 -04:00
Michael Gapczynski
05cb94801a
Add new group to other user's group select forms
2012-06-29 16:29:58 -04:00
Frank Karlitschek
6917d74193
move the ownCloud version to admin which makes more sense. A normal user can´t update ownCloud anyways.
2012-06-29 11:07:41 +02:00
Michael Gapczynski
9c083d3519
Fix setting custom quota size for users, bug fix for oc-1128
2012-06-28 21:26:39 -04:00
Bjoern Schiessle
265d7e50f5
bugfix for #1098 (assigning a group to a user, the group appears incrementally many times the more you assign it)
2012-06-26 12:54:09 +02:00
Bjoern Schiessle
72b365842f
bugfix for #1098 (assigning a group to a user, the group appears incrementally many times the more you assign it)
2012-06-26 12:51:32 +02:00
Sam Tuke
f374dae233
Added text ACS warning to admin's user settings page, and corresponding CSS styles
2012-06-25 18:04:10 +01:00
Thomas Tanghus
5ac4830e75
XSS fix.
2012-06-25 05:03:30 +02:00
Thomas Tanghus
c3130919c2
Allow direct link to app.
2012-06-25 05:02:01 +02:00
Bjoern Schiessle
036530b2fd
log messages are looking nicer if html code gets interpreted. (xss prevention happens on another place)
2012-06-22 17:00:56 +02:00
Bjoern Schiessle
e943f6c0c8
log messages are looking nicer if they are not escaped. (xss prevention happens on another place)
2012-06-22 16:53:45 +02:00
Bjoern Schiessle
1338279ca0
Merge branch 'master' of gitorious.org:owncloud/owncloud
2012-06-21 16:42:16 +02:00
Frank Karlitschek
5212fa3fa7
check if the data directory is accessible via http. Show a big security warning if yes
2012-06-21 14:18:43 +02:00
Frank Karlitschek
e95055b2bd
check if the data directory is accessible via http. Show a big security warning if yes
2012-06-21 14:07:04 +02:00
Bjoern Schiessle
34739b7ec5
use new sanitizeHTML() function
2012-06-21 13:57:18 +02:00
Bjoern Schiessle
902c649dad
use new sanitize HTML function backported
...
Conflicts:
lib/template.php
2012-06-20 16:59:51 +02:00
Bjoern Schiessle
089ae980c4
use new sanitize HTML function
2012-06-19 17:24:55 +02:00
Brice Maron
b31962fdc2
Hide image with no source (avoid placeholder img)
2012-06-18 20:15:20 +00:00
Bjoern Schiessle
ca41f2e96a
don't add the "Shared"-directory size to users quota
2012-06-18 15:38:38 +02:00
Bjoern Schiessle
2fd7df57d9
don't add the "Shared"-directory size to users quota
2012-06-18 15:35:22 +02:00