Thomas Tanghus
|
72f2f53e24
|
Merge branch 'master' of github.com:owncloud/core into vcategories_db
|
2012-10-17 22:36:58 +02:00 |
Thomas Müller
|
9f01cd05fb
|
Merge pull request #37 from scambra/js-interpolation-l10n
use interpolation for some translations in js
|
2012-10-17 13:28:46 -07:00 |
Sam Tuke
|
265f3654af
|
all unit files_encryption crypt unit tests now passing after merge
|
2012-10-17 16:35:19 +01:00 |
Bart Visscher
|
a8d0f84829
|
Resetting the password should also invalidate the token login cookies
|
2012-10-17 17:26:12 +02:00 |
|
Bart Visscher
|
0a614429af
|
Change the lostpassword flow to a controller
|
2012-10-17 17:24:49 +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 |
Susinthiran Sithamparanathan
|
b2b84f3a6f
|
Update Sabre to version 1.7.1
|
2012-10-17 16:17:36 +02:00 |
|
Bart Visscher
|
44287d680b
|
Check for file exists before loading app version file
|
2012-10-17 14:06:25 +02:00 |
Robin Appelman
|
77cef5f514
|
merge master into filesystem
|
2012-10-17 13:14:17 +02:00 |
|
Thomas Tanghus
|
26e92094a6
|
Merge branch 'master' of github.com:owncloud/core into vcategories_db
|
2012-10-17 12:30:14 +02:00 |
|
Bart Visscher
|
04824162d9
|
core.js and core.css don't need to be absolute
|
2012-10-17 10:52:16 +02:00 |
|
Jenkins for ownCloud
|
d5e91216b5
|
[tx-robot] updated from transifex
|
2012-10-17 02:05:23 +02:00 |
|
Thomas Tanghus
|
8cd268fc82
|
Merge branch 'master' of github.com:owncloud/core into vcategories_db
|
2012-10-17 00:16:37 +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 |
|
Thomas Mueller
|
45dec77d92
|
remove apps translations - they live in owncloud/apps now
|
2012-10-16 22:42:39 +02:00 |
Michael Gapczynski
|
c00f5d164f
|
Fix unshareAll()
|
2012-10-16 16:27:23 -04:00 |
Lukas Reschke
|
379b775a56
|
Delete user files in /data/ after deleting a user
|
2012-10-16 22:05:06 +02:00 |
|
Michael Gapczynski
|
012ea1ed83
|
Add unshareAll() function to Share API
|
2012-10-16 15:38:52 -04:00 |
scambra
|
c814a7a841
|
use interpolation for some translations in js
|
2012-10-16 20:53:31 +02:00 |
icewind1991
|
247626b5c2
|
Merge pull request #36 from scambra/filecache-fixes
delete fscache on deleting user
|
2012-10-16 11:46:50 -07:00 |
|
scambra
|
d8eb62232e
|
don't duplicate locales with country code
|
2012-10-16 20:31:46 +02:00 |
|
scambra
|
5ecce8bfb7
|
Translate modification date when file is created/uploaded, use same strings as lib/template.php
|
2012-10-16 20:25:11 +02:00 |
|
scambra
|
ec253f1354
|
Use strftime to format date with translated month names
|
2012-10-16 20:19:35 +02:00 |
|
Lukas Reschke
|
de7b46c66a
|
Use `get_magic_quotes_gpc()` to determine if magic_quotes is enabled
set_magic_quotes_runtime gives a PHP warning
|
2012-10-16 19:42:17 +02:00 |
|
Sam Tuke
|
8b01286a5d
|
Merged branch 'master'
|
2012-10-16 16:57:07 +01:00 |
|
scambra
|
e8441becdb
|
delete fscache on deleting user
|
2012-10-16 17:34:35 +02:00 |
|
Thomas Tanghus
|
102dd1242e
|
Merge branch 'master' of github.com:owncloud/core into vcategories_db
|
2012-10-16 16:57:25 +02:00 |
|
Sam Tuke
|
06ea9c18f8
|
Development snapshot
Stream reading and writing of small and large files working, using write cache
|
2012-10-16 15:02:51 +01:00 |
|
Lukas Reschke
|
e7c9d5fe54
|
Set oc_token to httponly
|
2012-10-16 13:53:40 +02:00 |
|
Lukas Reschke
|
59404b5675
|
Merge pull request #31 from visit1985/persistentcookies
reresubmit: improved persistent cookies :)
|
2012-10-16 04:46:22 -07:00 |
Björn Schießle
|
b08a1696f5
|
normalize path to avoid problems with trailing slashes, double-slashes, etc.
|
2012-10-16 12:48:56 +02:00 |
|
Jenkins for ownCloud
|
c3823aa864
|
[tx-robot] updated from transifex
|
2012-10-16 02:08:21 +02:00 |
|
Lukas Reschke
|
e299c241df
|
Make enhanced auth configurable
|
2012-10-16 01:08:05 +02:00 |
|
Lukas Reschke
|
c85c35dfae
|
Don't add the enhanced auth time to the configuration
|
2012-10-16 01:04:34 +02:00 |
|
Lukas Reschke
|
5c0407306c
|
Set a standard value for enhanced auth time
|
2012-10-16 01:04:20 +02:00 |
|
Lukas Reschke
|
6f2e8788ca
|
Make enhanced auth time configurable
|
2012-10-16 01:02:03 +02:00 |
|
Lukas Reschke
|
f4142bd2a8
|
Move isUserVerified to OC_Util
|
2012-10-16 00:47:38 +02:00 |
|
Lukas Reschke
|
77e18b01ba
|
Move the ( to the right position
|
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
|
91d4b23efe
|
Fix PHP notice
|
2012-10-16 00:47:38 +02:00 |
|
Lukas Reschke
|
1a187d1ca5
|
Fix PHP notice
|
2012-10-16 00:47:38 +02:00 |
|
Lukas Reschke
|
097f429816
|
Add isUserVerified()
|
2012-10-16 00:47:38 +02:00 |
|
Lukas Reschke
|
c83a2a5517
|
Correct check for admin
|
2012-10-16 00:47:38 +02:00 |
Victor Dubiniuk
|
ddcd738357
|
Merge branch 'extended_log'
PHP errors logging into the owncloud log
|
2012-10-16 01:30:45 +03: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
|
c9ac1364d1
|
"deny from all" instead directory
|
2012-10-15 23:35:27 +02:00 |