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 |
Robin Appelman
|
95057e727d
|
merge master into filesystem
|
2012-11-23 00:40:58 +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 |
|
Robin Appelman
|
97380f3485
|
merge master into filesystem
|
2012-11-21 22:37:14 +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 |
|
Robin Appelman
|
a922eb756e
|
merge master into filesystem
|
2012-11-18 14:07:52 +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 |
|
Robin Appelman
|
f4f00b4edb
|
Merge branch 'master' into filesystem
|
2012-11-16 12:13:03 +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 |
|
Robin Appelman
|
bf2ac9f113
|
merge master into filesystem
|
2012-11-15 00:37:54 +01: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 |
|
Robin Appelman
|
091ff02362
|
merge master into filesystem
|
2012-11-08 17:32:00 +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 |
|
Robin Appelman
|
961ff01a93
|
merge master into filesystem
|
2012-11-07 17:18:56 +01: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 |
|
Robin Appelman
|
4b940955dd
|
merge master into filesystem
|
2012-11-04 21:12:18 +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 |
|
Robin Appelman
|
4a5a36577e
|
merge master into filesystem
|
2012-11-02 21:42:29 +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 |
|
Robin Appelman
|
51ba12890d
|
Merge branch 'master' into filesystem
|
2012-11-01 16:16:02 +01:00 |
|
Jenkins for ownCloud
|
aca6d3252f
|
[tx-robot] updated from transifex
|
2012-10-31 00:02:32 +01:00 |
|
Robin Appelman
|
6e9e263497
|
merge master into filesystem
|
2012-10-30 22:59:55 +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 |
|
Robin Appelman
|
c4a793913c
|
Merge branch 'master' into filesystem
|
2012-10-28 10:28:25 +01:00 |
|
Jenkins for ownCloud
|
1a08ef6a06
|
[tx-robot] updated from transifex
|
2012-10-28 00:02:29 +02:00 |
|
Robin Appelman
|
38371d1275
|
Merge branch 'master' into filesystem
|
2012-10-27 14:28:24 +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 |
|
Robin Appelman
|
cbc71784c0
|
Merge branch 'master' into filesystem
|
2012-10-27 10:02:26 +02:00 |
|
Jenkins for ownCloud
|
3bef19c623
|
[tx-robot] updated from transifex
|
2012-10-27 00:02:05 +02:00 |
|
Robin Appelman
|
6db81afab9
|
move some stuff to the new api
|
2012-10-26 23:05:02 +02:00 |
|
Robin Appelman
|
4b616764e8
|
Merge branch 'master' into filesystem
|
2012-10-26 22:32:44 +02:00 |
|
Robin Appelman
|
da57fbc93a
|
show/hide navigation entries after enabling/disabling app
|
2012-10-26 20:13:24 +02:00 |
|
Robin Appelman
|
0e2bf8d373
|
Merge branch 'master' into filesystem
|
2012-10-26 10:42:41 +02:00 |
|
Jenkins for ownCloud
|
c7d64811d6
|
[tx-robot] updated from transifex
|
2012-10-26 02:05:56 +02:00 |
|
Robin Appelman
|
7b150dfa96
|
merge master into filesystem
|
2012-10-24 15:32:29 +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 |
|
Robin Appelman
|
7424f3aef6
|
merge master into filesystem
|
2012-10-23 16:16:46 +02:00 |
|
Jenkins for ownCloud
|
bc2a648f2d
|
[tx-robot] updated from transifex
|
2012-10-23 02:06:03 +02:00 |
|
Robin Appelman
|
5217ca219a
|
Merge branch 'master' into filesystem
|
2012-10-21 15:16:23 +02:00 |
|
Jenkins for ownCloud
|
16c4eb66d7
|
[tx-robot] updated from transifex
|
2012-10-21 02:06:44 +02:00 |
|
Robin Appelman
|
f7722abcb0
|
Merge branch 'master' into filesystem
|
2012-10-20 23:50:14 +02:00 |
|
Jenkins for ownCloud
|
cfbd310d34
|
[tx-robot] updated from transifex
|
2012-10-20 02:03:53 +02:00 |
|
Robin Appelman
|
9712a78559
|
merge master into filesystem
|
2012-10-18 23:24:28 +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 |
|
Robin Appelman
|
77cef5f514
|
merge master into filesystem
|
2012-10-17 13:14:17 +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 |
|
Robin Appelman
|
11e9ce25e6
|
merge master into filesystem
|
2012-10-13 04:29:20 +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 |
|
Robin Appelman
|
fb2d2bc201
|
merge master into filesystem
|
2012-10-11 22:54:39 +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 |
|
Robin Appelman
|
aaa1b73364
|
don't use depricated OC_Filesystem
|
2012-10-10 13:18:36 +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 |