Jan-Christoph Borchardt
329d965441
merge changes in navigation
2013-01-28 10:52:15 +01:00
Jenkins for ownCloud
b655444709
[tx-robot] updated from transifex
2013-01-28 00:05:43 +01:00
Jenkins for ownCloud
00a28062e1
[tx-robot] updated from transifex
2013-01-27 00:06:21 +01:00
Thomas Müller
276d98b9dd
Merge pull request #1059 from owncloud/fixing-998-master
...
Fixing 998 master
2013-01-26 04:15:40 -08:00
Jenkins for ownCloud
af4411e33d
[tx-robot] updated from transifex
2013-01-26 00:10:07 +01:00
Björn Schießle
19024de988
typo fixed
2013-01-25 17:44:40 +01:00
Lukas Reschke
047f1988c3
Merge branch 'master' into no-inline-js
2013-01-25 16:11:07 +01:00
raghunayyar
aed204d420
Defined height for #leftcontent
2013-01-25 20:39:07 +05:30
Björn Schießle
64e853394c
compare the correct uids
2013-01-25 12:46:32 +01:00
Björn Schießle
4271430e60
get all display names from users in a given group
2013-01-25 11:48:03 +01:00
Björn Schießle
9bb8e05839
get all display names
2013-01-25 11:05:00 +01:00
Jenkins for ownCloud
6832dddf39
[tx-robot] updated from transifex
2013-01-25 00:05:56 +01:00
Lukas Reschke
c8bbbb48d3
Merge master...
2013-01-23 11:30:40 +01:00
Lukas Reschke
48949ba04a
Move appid to external file
2013-01-23 11:21:34 +01:00
Jenkins for ownCloud
c986dbe573
[tx-robot] updated from transifex
2013-01-23 00:06:18 +01:00
Lukas Reschke
8907bdaf7f
Remove uneeded JS
2013-01-22 12:15:46 +01:00
Lukas Reschke
bd5ff29716
Merge branch 'master' into no-inline-js
2013-01-22 11:50:33 +01:00
Lukas Reschke
d2383338de
External JSON for the Apps
2013-01-21 22:18:42 +01:00
Lukas Reschke
30274ee33e
Move to OC_App
2013-01-21 22:18:11 +01:00
Lukas Reschke
3ed7d5d521
Move isadmin to external file
2013-01-21 21:25:38 +01:00
Frank Karlitschek
a27f92a17a
we are getting closer. updating is not working yet.
2013-01-21 20:40:23 +01:00
Jenkins for ownCloud
aede26d996
[tx-robot] updated from transifex
2013-01-21 00:05:34 +01:00
Jenkins for ownCloud
ebc0c4b85b
[tx-robot] updated from transifex
2013-01-20 00:06:40 +01:00
Thomas Mueller
afb5de955e
Merge branch 'master' into fixing-998-master
...
Conflicts:
apps/files/ajax/upload.php
apps/files/js/files.js
2013-01-18 23:22:34 +01:00
Jan-Christoph Borchardt
b81a7aa078
fix up content and content-wrapper merge ...
2013-01-18 19:58:50 +07:00
Jenkins for ownCloud
824fcf6624
[tx-robot] updated from transifex
2013-01-18 00:04:36 +01:00
Jan-Christoph Borchardt
09d3db5eb7
new settings menu for new design
2013-01-17 12:45:33 +07:00
Bart Visscher
a8f963d9cf
Spaces to tabs
2013-01-16 18:09:16 +01:00
Daniel Molkentin
65ef780ed6
Fix regression caused by 31b1a73e1f
2013-01-15 22:44:40 +01:00
Bart Visscher
0da06187f6
Merge pull request #1187 from owncloud/fixing-unused-and-undefined-in-master
...
Fixing unused and undefined in master
2013-01-15 07:45:51 -08:00
Jenkins for ownCloud
fdd667a83c
[tx-robot] updated from transifex
2013-01-15 00:05:10 +01:00
Thomas Mueller
388bb6a5e1
Merge branch 'master' into fixing-unused-and-undefined-in-master
2013-01-14 23:41:34 +01:00
Lukas Reschke
eab6d7eb23
Enhanced auth is totally unmaintained and broken
...
Let's remove it, it's also not secure anymore with the introduction of
our API etc...
(And doesn't work with ldap etc…)
2013-01-14 21:39:49 +01:00
Lukas Reschke
0810d80f8a
Add a closing )
...
Thanks Jenkins!
2013-01-14 20:10:10 +01:00
Lukas Reschke
fef73d96d1
CP fail
2013-01-14 19:51:16 +01:00
Lukas Reschke
31b1a73e1f
Check if user is admin - bool
...
There was no "isAdminUser()" function which returned bool. This is
irritiating as there were a loooooooot of places in the code which
checked this itself with `OC_Group::inGroup($uid, 'admin)` - why not
use a function for this?
(Especially if you consider that we might change the group name in the
future, which would lead to problems then)
Additionally, @Raydiation needed such a method for his AppFramework :)
2013-01-14 19:45:17 +01:00
Jenkins for ownCloud
981fd5e424
[tx-robot] updated from transifex
2013-01-13 00:08:40 +01:00
Jenkins for ownCloud
ad64ce189d
[tx-robot] updated from transifex
2013-01-12 00:10:58 +01:00
Bart Visscher
b608675938
Merge pull request #1157 owncloud/move-OpenID
...
Move openid.php to apps repo
Conflicts:
settings/routes.php
2013-01-11 22:57:40 +01:00
Lukas Reschke
954b559d48
Merge pull request #994 from owncloud/enhanced_multiSelect
...
Enhanced multiSelect
2013-01-11 10:23:04 -08:00
Lukas Reschke
1f6eb68ef9
Merge pull request #1150 from owncloud/EnableSSL-AdminMenu
...
Add security section to admin settings to enable the HTTPS enforcement
2013-01-11 09:21:08 -08:00
Lukas Reschke
e11b650d2e
Remove OpenID from the router
2013-01-11 17:24:10 +01:00
Lukas Reschke
1631ee4d60
Move to apps repo
...
This belongs to the apps repo.
2013-01-11 17:22:15 +01:00
Lukas Reschke
9b9f5b1a8a
Remove setContentTypeHeader()
...
`OC_JSON::success` and `OC_JSON::error` are calling
`OC_JSON::encodedPrint`, which already sets these headers. So this two
calls are uneeded duplicates.
2013-01-11 17:09:36 +01:00
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