Tom Needham
|
b26279546c
|
Simpler method for getting the first char
|
2013-01-24 10:49:48 +00:00 |
|
Tom Needham
|
d89be72972
|
Remove some whitespace
|
2013-01-24 10:40:47 +00:00 |
|
Tom Needham
|
02f8c941f4
|
API: If key begins with '@' treat it as an xml attribute
|
2013-01-24 10:39:33 +00:00 |
Thomas Müller
|
1dac2ba496
|
Merge pull request #1286 from owncloud/ocs_api
Check that external api methods return instances of OC_OCS_Result
|
2013-01-24 02:37:40 -08:00 |
Lukas Reschke
|
f9a9fc5670
|
Merge pull request #1265 from j-ed/master
add additional mail_smtp.. parameters to fix possible SMTP connection problems.
|
2013-01-24 00:11:03 -08:00 |
|
Tom Needham
|
8f9d3cd01d
|
Code style update
|
2013-01-23 23:39:29 +00:00 |
|
Jenkins for ownCloud
|
3ff32eba25
|
[tx-robot] updated from transifex
|
2013-01-24 00:07:38 +01:00 |
Arthur Schiwon
|
b979bf6f1c
|
LDAP: fix default
|
2013-01-23 23:46:55 +01:00 |
|
Arthur Schiwon
|
06c284f6cc
|
LDAP settings: read configuration when another server config is chosen
|
2013-01-23 23:41:35 +01:00 |
|
Arthur Schiwon
|
83d9e1e2f0
|
make sure that Configuration is read when getConfiguration is called. And give back the appropriate result.
|
2013-01-23 23:40:21 +01:00 |
Sam Tuke
|
59ca312263
|
Work on util: findFiles() and encryptAll(); both close to working
Ecnryption unit tests are failing, recursion in filecache{}
|
2013-01-23 19:24:26 +00:00 |
|
Sam Tuke
|
cd832935e8
|
Merge branch 'files_encryption'
|
2013-01-23 12:54:09 +00:00 |
|
Sam Tuke
|
14d0903a28
|
Merge branch 'master' of github.com:owncloud/core
|
2013-01-23 12:52:53 +00:00 |
|
Lukas Reschke
|
293e7bdcf0
|
Notice about changing the standard policy
|
2013-01-23 13:44:43 +01:00 |
|
Lukas Reschke
|
0517465f4d
|
Allow admins to change the CSP policy in the config file
|
2013-01-23 13:42:52 +01:00 |
|
Thomas Mueller
|
b4c3dd84b4
|
update to jquery-ui 1.10.0
|
2013-01-23 11:37:52 +01:00 |
|
Lukas Reschke
|
846971ec11
|
Fix merge conflict
|
2013-01-23 11:33:25 +01:00 |
|
Lukas Reschke
|
fe56e4df7d
|
Fix merge conflict
|
2013-01-23 11:32:14 +01:00 |
Björn Schießle
|
6ab95e8e33
|
code clean-up
|
2013-01-23 11:30:42 +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 |
|
Thomas Mueller
|
5fadd53088
|
missing renames of publicListView to disableSharing
|
2013-01-23 09:18:26 +01:00 |
|
Jenkins for ownCloud
|
c986dbe573
|
[tx-robot] updated from transifex
|
2013-01-23 00:06:18 +01:00 |
Michael Gapczynski
|
9eecb91338
|
Merge pull request #1113 from owncloud/fix-issue-1085
Fix rendering of database connection error page
|
2013-01-22 14:38:44 -08:00 |
Robin Appelman
|
f858381775
|
merge master into filesystem
|
2013-01-22 23:27:04 +01:00 |
|
Thomas Müller
|
ec8609fa21
|
Merge pull request #1259 from TheSFReader/master
Add two specific mimetype extensions (ebooks): for epub and mobi files
|
2013-01-22 14:06:50 -08:00 |
j-ed
|
dcda792fbc
|
Update config/config.sample.php
fixed an other typo.
|
2013-01-22 21:42:39 +01:00 |
|
j-ed
|
dfa5f2de4d
|
Update config/config.sample.php
Fixed type in line 70. Thank you for pointing me to that typo.
|
2013-01-22 21:33:01 +01:00 |
|
Robin Appelman
|
9a1f65aab1
|
Some style fixes
|
2013-01-22 20:58:09 +01:00 |
|
Robin Appelman
|
7330fcf5e8
|
Cache: make mounts overwrite existing folders, prevents duplicate entries
|
2013-01-22 20:57:15 +01:00 |
icewind1991
|
12e286b21c
|
Merge pull request #1237 from owncloud/fix-template-tests
Remove unnecessary ob_end_clean() from template tests
|
2013-01-22 11:12:40 -08:00 |
Sam Tuke
|
c18aec56e2
|
Merge pull request #1105 from owncloud/files_encryption
Files encryption
|
2013-01-22 09:51:19 -08:00 |
|
Björn Schießle
|
367aadb3b7
|
rename 'publicListView' switch to 'disableSharing' because this is not only used for the public list view
|
2013-01-22 18:34:59 +01:00 |
|
Sam Tuke
|
aa648fca75
|
Merge branch 'master' into files_encryption
Conflicts:
apps/files_encryption/templates/settings.php
|
2013-01-22 17:31:05 +00:00 |
|
Sam Tuke
|
ca454f0228
|
Removed depreciated file
|
2013-01-22 17:15:51 +00:00 |
|
Sam Tuke
|
47592657d7
|
Added localisation for encryption settings
|
2013-01-22 17:15:03 +00:00 |
|
Björn Schießle
|
f919230f63
|
remove inline JavaScript
|
2013-01-22 17:59:33 +01:00 |
|
Sam Tuke
|
619780a67d
|
Merge branch 'master' into files_encryption
|
2013-01-22 16:50:20 +00:00 |
|
Björn Schießle
|
039bc91597
|
fix typo in comment
|
2013-01-22 17:46:35 +01:00 |
|
Björn Schießle
|
16ae902e31
|
no undo notification for deleted file, we use the trash bin instead
|
2013-01-22 17:43:46 +01:00 |
|
Robin Appelman
|
db2b485b96
|
Cache: fix test case Updater::testRename
|
2013-01-22 16:36:03 +01:00 |
|
Björn Schießle
|
0245ec16a8
|
rebase to current master; merge conflicts resolved
|
2013-01-22 15:36:23 +01:00 |
|
Björn Schießle
|
b694f996d9
|
allow admin to change retention obligation for the trash bin, default value is 180 days
|
2013-01-22 15:33:54 +01:00 |
|
Björn Schießle
|
16d7716dee
|
calculate correct relative date for trashbin file list
|
2013-01-22 15:33:54 +01:00 |
|
Björn Schießle
|
97e69e5374
|
remove table row in trash bin view after undelete
|
2013-01-22 15:33:54 +01:00 |
|
Björn Schießle
|
81ab0affef
|
allow to restore single files/folder from a deleted folder
|
2013-01-22 15:33:54 +01:00 |
|
Björn Schießle
|
1817c7895b
|
allow to look into deleted directories
|
2013-01-22 15:33:54 +01:00 |
|
Björn Schießle
|
1255791ef2
|
handle group restore
|
2013-01-22 15:33:54 +01:00 |
|
Björn Schießle
|
655a20f963
|
expire files in trash bin after 30 days
|
2013-01-22 15:33:54 +01:00 |
|
Björn Schießle
|
8e57fe1a08
|
remove unneeded function
|
2013-01-22 15:33:54 +01:00 |