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 |
|
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 |
|
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 |
|
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 |