Sam Tuke
|
d9631aebfc
|
Merge branch 'master' into files_encryption
|
2013-02-06 16:05:14 +00:00 |
|
Sam Tuke
|
a8c0e3612c
|
Removed call to depreciated isUserVerified()
|
2013-02-06 16:01:43 +00:00 |
Jan-Christoph Borchardt
|
09a4424b1f
|
Merge pull request #1497 from owncloud/collapse-usermenu
collapse user menu when inside one of the settings sections
|
2013-02-06 07:33:59 -08:00 |
|
Jan-Christoph Borchardt
|
5f84f4b4fd
|
Merge pull request #1496 from owncloud/custom_clients
make it possible to modify the links to the clients
|
2013-02-06 07:25:16 -08:00 |
|
Sam Tuke
|
a3289d3991
|
Merge branch 'master' into files_encryption
|
2013-02-06 15:08:53 +00:00 |
|
Sam Tuke
|
6870add18f
|
Development snapshot
|
2013-02-06 15:08:36 +00:00 |
|
Jan-Christoph Borchardt
|
8ea6398e48
|
collapse user menu when inside one of the settings sections
|
2013-02-06 16:03:01 +01:00 |
Thomas Müller
|
efdaea4557
|
Merge pull request #1357 from owncloud/alternative-loging-master
add support for apps to register alternative login methods
|
2013-02-06 06:49:58 -08:00 |
|
Thomas Müller
|
58a3a6a573
|
Merge pull request #1487 from owncloud/fix-1420-master
Replace OC_FileCache usage in files_versions
|
2013-02-06 06:45:01 -08:00 |
|
Sam Tuke
|
16a5ace434
|
Fixed bug causing encrypted files to be doubly encrypted at login
Added comments and docblocks
|
2013-02-06 14:30:40 +00:00 |
Georg Ehrke
|
0a16d25724
|
make it possible to modify the links to the clients
|
2013-02-06 15:20:43 +01:00 |
|
Jan-Christoph Borchardt
|
964ff88f71
|
move inline style to CSS file, fix details
|
2013-02-06 15:15:20 +01:00 |
Björn Schießle
|
9e08f85c5e
|
port already approved bugfix to master, https://github.com/owncloud/core/pull/1479
|
2013-02-06 14:19:32 +01:00 |
Björn Schießle
|
2fdf8ff3e7
|
Merge pull request #1490 from schiesbn/user_displayname
let the user change his display name, if supported by the back-end
|
2013-02-06 02:56:01 -08:00 |
|
Björn Schießle
|
e68d0c7398
|
make strings translatable
|
2013-02-06 11:55:19 +01:00 |
|
Björn Schießle
|
9d73e7eb1e
|
let the user change his display name, if supported by the back-end
|
2013-02-06 11:38:03 +01:00 |
Bart Visscher
|
0e548283fc
|
Replace OC_FileCache usage in files_versions
|
2013-02-06 08:00:57 +01:00 |
|
Jenkins for ownCloud
|
335b6cd060
|
[tx-robot] updated from transifex
|
2013-02-06 00:06:28 +01:00 |
|
Thomas Müller
|
74157902d7
|
Merge pull request #1476 from owncloud/disable-error-handler-while-running-phpunit
disable error handler while running phpunit
|
2013-02-05 14:35:11 -08:00 |
|
Thomas Mueller
|
cbf6b28f45
|
uncomment failing calls to \OC\Files\Filesystem::file_put_contents
|
2013-02-05 20:21:29 +01:00 |
|
Thomas Mueller
|
c0263173d2
|
add phpunit configuration for autotest withou the json listener because this pollutes the console
|
2013-02-05 20:20:55 +01:00 |
|
Thomas Mueller
|
10ea45c916
|
fix failing test cases due to wrong typing
|
2013-02-05 20:19:54 +01:00 |
Arthur Schiwon
|
5221ee0c5a
|
offer change password only when the action is supported by the user backend
|
2013-02-05 19:26:00 +01:00 |
Lukas Reschke
|
e6400b3059
|
Merge pull request #1474 from samtuke/master
Improvements to files_encryption
|
2013-02-05 09:58:35 -08:00 |
|
Sam Tuke
|
20b1d12cbf
|
Fixed comment typo, wrapped return value conditional on var assignment in session{}
|
2013-02-05 17:28:26 +00:00 |
|
Sam Tuke
|
4ba0ab7f65
|
Added missing translation wrapping
|
2013-02-05 17:22:59 +00:00 |
|
Sam Tuke
|
b84e83261e
|
Added notice to personal settings indicating what filetypes are not encrypted
|
2013-02-05 17:06:15 +00:00 |
|
Sam Tuke
|
680c5b3dad
|
Removed debugging output
|
2013-02-05 16:11:50 +00:00 |
|
Sam Tuke
|
221b69dd0e
|
Fixed bug relating to Filesystem{} that prevented webdav logins with files_encryption
|
2013-02-05 16:09:01 +00:00 |
Michael Gapczynski
|
69fd3f42e5
|
Merge pull request #1471 from owncloud/temp-storage-call-parent-ctor-master
Temp storage call parent ctor master
|
2013-02-05 08:03:18 -08:00 |
|
Sam Tuke
|
a1f200c1e5
|
Cleaned up path formatting with new method stripUserFilesPath()
|
2013-02-05 15:59:28 +00:00 |
|
Thomas Mueller
|
77369d8164
|
disable error handler while running phpunit
|
2013-02-05 16:44:02 +01:00 |
|
Sam Tuke
|
50faddfa40
|
Minor improvement to comments
|
2013-02-05 15:37:40 +00:00 |
|
Sam Tuke
|
53248a9b60
|
Recryption of legacy encrypted files now working on login
|
2013-02-05 15:35:29 +00:00 |
|
Thomas Mueller
|
9446017821
|
spell check
|
2013-02-05 16:24:40 +01:00 |
|
Thomas Mueller
|
1fd807a7d6
|
pass the argument to the ctor
Conflicts:
lib/files/storage/temporary.php
|
2013-02-05 16:24:11 +01:00 |
|
Bart Visscher
|
86f4126d2c
|
Merge pull request #1469 from owncloud/no-setlocale-on-windows
No setlocale on windows
|
2013-02-05 07:16:14 -08:00 |
|
Michael Gapczynski
|
79e6e579e3
|
Merge pull request #1452 from owncloud/fix-breadcrumb
Remove undefined crumb variable from home breadcrumb
|
2013-02-05 06:56:15 -08:00 |
|
Thomas Mueller
|
ac11c842e6
|
setlocale test is pointless on Windows
|
2013-02-05 15:46:55 +01:00 |
|
Thomas Mueller
|
d8084c132e
|
new function \OC_Util::runningOnWindows()
|
2013-02-05 15:43:12 +01:00 |
|
Jan-Christoph Borchardt
|
9961235c7b
|
Merge pull request #1429 from owncloud/fix_addNavigation
Make app icon linkable when enabling app.
|
2013-02-05 05:47:14 -08:00 |
|
Jan-Christoph Borchardt
|
e61d21f40d
|
Merge pull request #1460 from owncloud/login-button
Login screen details
|
2013-02-05 05:46:38 -08:00 |
|
Sam Tuke
|
fd90b82acd
|
Merge github.com:owncloud/core
|
2013-02-05 13:44:45 +00:00 |
|
Thomas Müller
|
59ed0e6318
|
Merge pull request #1456 from owncloud/gitignore-apps
gitignore all apps except core ones
|
2013-02-05 05:18:58 -08:00 |
Thomas Tanghus
|
cda0780d4b
|
Remove superfluous append
|
2013-02-05 14:15:17 +01:00 |
|
Jan-Christoph Borchardt
|
8ae1205b95
|
line up 'remember' text with checkbox
|
2013-02-05 12:49:33 +01:00 |
|
Jan-Christoph Borchardt
|
7eaa2d0de1
|
form detail on log in button, better shape
|
2013-02-05 12:48:30 +01:00 |
|
Jan-Christoph Borchardt
|
2ec0c491d4
|
remove superfluous enabled-app class again
|
2013-02-05 11:30:18 +01:00 |
|
Jan-Christoph Borchardt
|
4059959c5f
|
Merge branch 'master' into fix_addNavigation
|
2013-02-05 11:09:38 +01:00 |
|
Jan-Christoph Borchardt
|
661da10dc5
|
gitignore all apps except core ones
|
2013-02-05 11:04:39 +01:00 |