Bernhard Posselt
|
c5fd9cc0c2
|
Merge pull request #1562 from schiesbn/fix_naming
rename trash to trash bin
|
2013-02-09 03:21:30 -08:00 |
Björn Schießle
|
ca243f3fac
|
Merge pull request #1521 from schiesbn/label_fixed
don't call the delete button unshare, unshare operation no longer available
|
2013-02-09 03:14:25 -08:00 |
Björn Schießle
|
6e9f434bda
|
rename trash to trash bin
|
2013-02-09 12:01:49 +01:00 |
Georg Ehrke
|
8961e675c7
|
remove (comment out) old code to fix replacing of files
|
2013-02-09 11:28:13 +01:00 |
Björn Schießle
|
60cc7d0ba2
|
debug output removed
|
2013-02-09 11:11:07 +01:00 |
Björn Schießle
|
b24e3f1d32
|
comment added
|
2013-02-09 11:07:47 +01:00 |
Jörn Friedrich Dreyer
|
5a15221910
|
Merge pull request #1550 from owncloud/fix-files-download-links
Fix files router download links
|
2013-02-09 01:28:25 -08:00 |
Jörn Friedrich Dreyer
|
3918325520
|
Merge pull request #1541 from owncloud/fixing-1540-master
remove undefined function FileList.finishDelete
|
2013-02-09 01:17:11 -08:00 |
Jenkins for ownCloud
|
e5c05e9674
|
[tx-robot] updated from transifex
|
2013-02-09 00:14:08 +01:00 |
Thomas Tanghus
|
680af2e6ca
|
Fix filelist shifting up one row on (multi)select
|
2013-02-08 22:30:27 +01:00 |
Bart Visscher
|
ed1dc3e064
|
Fix files router download links
|
2013-02-08 22:05:13 +01:00 |
Thomas Müller
|
ce8fc20e0b
|
remove unused code
|
2013-02-08 18:04:27 +01:00 |
Thomas Müller
|
1d3c1328fa
|
remove undefined function FileList.finishDelete
|
2013-02-08 15:51:28 +01:00 |
Thomas Müller
|
40f6e1eba0
|
Merge pull request #1534 from owncloud/files_l10n
Add translation support back to move/rename
|
2013-02-08 03:58:17 -08:00 |
Robin Appelman
|
9bdc43e1fc
|
Files: explicitly define
|
2013-02-08 12:03:28 +01:00 |
Jenkins for ownCloud
|
59249ebc0c
|
[tx-robot] updated from transifex
|
2013-02-08 00:13:16 +01:00 |
Robin Appelman
|
5ef9d96d10
|
Files: rename 'space' to 'storage' in upload.php
|
2013-02-07 23:59:14 +01:00 |
Robin Appelman
|
b67251b0ff
|
Files: add translation support back to move/rename
|
2013-02-07 23:57:18 +01:00 |
Bart Visscher
|
a93282ab16
|
Merge pull request #1507 from tripflex/master
remove float left from actions div class
fixes #1504
|
2013-02-07 12:49:14 -08:00 |
Lukas Reschke
|
c0154558c7
|
Merge pull request #1526 from owncloud/l10n-support-master
L10n support master
|
2013-02-07 12:38:36 -08:00 |
Björn Schießle
|
808de17aeb
|
use never more that 50% of available disc space for the trash bin
|
2013-02-07 17:37:46 +01:00 |
Thomas Mueller
|
e0212c1174
|
l10n support enhanced in files_versions
|
2013-02-07 16:34:57 +01:00 |
Thomas Mueller
|
18a288a3c3
|
l10n support enhanced in files_trashbin
|
2013-02-07 16:31:04 +01:00 |
Thomas Mueller
|
488ab0dba2
|
l10n support enhanced in files_version
|
2013-02-07 16:17:54 +01:00 |
blizzz
|
6cff5418a7
|
Merge pull request #1524 from owncloud/fix_ldaps_tls_setting
LDAP: don't try to put TLS on top of already secure connection (will fail).
|
2013-02-07 07:06:35 -08:00 |
Arthur Schiwon
|
15e383fd01
|
Typo
|
2013-02-07 16:05:45 +01:00 |
Björn Schießle
|
ca43e09276
|
keep track of trash bin size
|
2013-02-07 15:16:29 +01:00 |
blizzz
|
6299704dfd
|
Merge pull request #1518 from schiesbn/trash_layout_fix
add class hascontrols to trash bin file table
|
2013-02-07 04:40:51 -08:00 |
Björn Schießle
|
ce293b8efc
|
remove debug output
|
2013-02-07 13:16:15 +01:00 |
Björn Schießle
|
7e874af2c8
|
rename OCA_Trash to OCA\Files_Trashbin
|
2013-02-07 13:14:45 +01:00 |
Björn Schießle
|
c81d7b0b90
|
OCA_Versions is now known as OCA\Files_Versions
|
2013-02-07 12:45:27 +01:00 |
Björn Schießle
|
c72537cd85
|
don't call the delete button unshare, unshare operation no longer available
|
2013-02-07 12:42:09 +01:00 |
Björn Schießle
|
17384994d6
|
add class hascontrols to trash bin file table
|
2013-02-07 10:13:09 +01:00 |
Jenkins for ownCloud
|
35bd7a400d
|
[tx-robot] updated from transifex
|
2013-02-07 00:11:04 +01:00 |
Lukas Reschke
|
93b1597395
|
Merge pull request #1506 from owncloud/files_encryption
Files encryption
|
2013-02-06 11:47:55 -08:00 |
Lukas Reschke
|
e522872408
|
Merge pull request #1498 from schiesbn/delete_trash
delete files from trash bin permanently
|
2013-02-06 11:27:32 -08:00 |
Myles McNamara
|
ddd47978e1
|
Remove left float from actions div class
|
2013-02-06 13:44:41 -05:00 |
Sam Tuke
|
faf6cb0868
|
Merge branch 'master' into files_encryption
|
2013-02-06 18:26:44 +00:00 |
Sam Tuke
|
954a627483
|
Added comment
|
2013-02-06 18:24:35 +00:00 |
Michael Gapczynski
|
cc19df22a1
|
Remove old OC4 link compatibility
|
2013-02-06 13:09:04 -05:00 |
Sam Tuke
|
2b07afc8ab
|
Removed debugging code
|
2013-02-06 17:59:47 +00:00 |
Thomas Müller
|
81792448ae
|
Merge pull request #1472 from owncloud/files_versions-cleanup
files_versions cleanup
|
2013-02-06 08:53:20 -08:00 |
Thomas Tanghus
|
3879e5d9c5
|
Merge pull request #1428 from owncloud/content_positioning
Fix leftcontent positioning. Ref #1255
|
2013-02-06 08:13:45 -08:00 |
Björn Schießle
|
fd171a4f34
|
copy&paste bug, no fetchAll() needed here
|
2013-02-06 16:50:16 +01:00 |
Björn Schießle
|
8cc7bab0e5
|
delete debug code
|
2013-02-06 16:25:10 +01:00 |
Björn Schießle
|
e2516a2b65
|
allow to delete single files from the trash bin permanently
|
2013-02-06 16:23:22 +01: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 |
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 |
Arthur Schiwon
|
781d247b39
|
LDAP: better detect timeouts. do not try to reconnect. do not try to bind when connection failed. makes ownCloud more responsive, esp. with multiple server connections configured
|
2013-02-06 14:32:00 +01:00 |
Arthur Schiwon
|
e122fdbcb6
|
LDAP: when ldaps and tls are configured, disable the latter one - they do not work together. ldaps already creates a secure connection.
|
2013-02-06 14:30:17 +01:00 |
Arthur Schiwon
|
33ec26f6d6
|
LDAP: info string improved
|
2013-02-06 14:24:00 +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 |
Sam Tuke
|
3b9e2f1bab
|
Merge branch 'master' into files_encryption-style-fixes
Conflicts:
apps/files_encryption/lib/crypt.php
apps/files_encryption/lib/keymanager.php
|
2013-02-05 18:43:55 +00:00 |
Sam Tuke
|
a528f96b84
|
Merge branch 'master' into files_encryption-style-fixes
|
2013-02-05 18:23:03 +00: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 |
Bart Visscher
|
3e7ca373ec
|
Only calculate md5 of local file once
|
2013-02-05 17:56:51 +01:00 |
Bart Visscher
|
148e4facfa
|
Change files_versions namespace to OCA\Files_Versions
|
2013-02-05 17:46:39 +01: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 |
Sam Tuke
|
a1f200c1e5
|
Cleaned up path formatting with new method stripUserFilesPath()
|
2013-02-05 15:59:28 +00:00 |
Sam Tuke
|
53248a9b60
|
Recryption of legacy encrypted files now working on login
|
2013-02-05 15:35:29 +00:00 |
Sam Tuke
|
fd90b82acd
|
Merge github.com:owncloud/core
|
2013-02-05 13:44:45 +00:00 |
Sam Tuke
|
927d4c98a1
|
Fixed todos: undefined vars and unreachable code
|
2013-02-05 13:12:34 +00:00 |
Michael Gapczynski
|
65bd7af8df
|
Remove undefined crumb variable from home breadcrumb
|
2013-02-04 20:40:16 -05:00 |
Jenkins for ownCloud
|
98f37f4bed
|
[tx-robot] updated from transifex
|
2013-02-05 00:20:29 +01:00 |
Thomas Tanghus
|
68fe6d0077
|
Merge pull request #1432 from owncloud/add_requesttoken
[user_webdavauth] add requesttoken
|
2013-02-04 12:02:16 -08:00 |
Thomas Tanghus
|
b06ac67e07
|
Add 'hascontrols' class for content with fixed topbar.
|
2013-02-04 18:30:49 +01:00 |
Björn Schießle
|
fee3f80501
|
Merge pull request #1434 from owncloud/trashbin_CSRF
[files_trashbin] Add CSRF token
|
2013-02-04 02:14:52 -08:00 |
Lukas Reschke
|
8add89ced1
|
OCP\JSON instead of OCP\User
|
2013-02-04 09:15:11 +01:00 |
Thomas Müller
|
04b97a1906
|
Merge pull request #1229 from owncloud/from_live_to_on
replace live() with on() in core js
|
2013-02-03 21:55:54 -08:00 |
Thomas Müller
|
5ceddabaa6
|
Merge pull request #1340 from owncloud/fixing-js-errors-public-link-master
Fixing js errors public link master
|
2013-02-03 21:53:02 -08:00 |
Robin Appelman
|
9060c3bd83
|
Files: fix positioning of Trash button and upload progress bar
|
2013-02-04 01:05:59 +01:00 |
Jenkins for ownCloud
|
da6e79a381
|
[tx-robot] updated from transifex
|
2013-02-04 00:05:52 +01:00 |
Lukas Reschke
|
018c5f69c0
|
[files_trashbin] Add CSRF token
|
2013-02-03 22:49:12 +01:00 |
Lukas Reschke
|
bce59c3945
|
[user_webdavauth] add requesttoken
|
2013-02-03 19:58:55 +01:00 |
Thomas Tanghus
|
1557b6d99d
|
Fix leftcontent positioning. Ref #1255
|
2013-02-03 14:44:33 +01:00 |
Thomas Müller
|
743c330f03
|
Merge pull request #1422 from TheSFReader/master
Correct the Cache Scanner so that it doesn't try and scan subdirs of a non-dir path when renaming
|
2013-02-03 00:24:49 -08:00 |
Jenkins for ownCloud
|
2936140838
|
[tx-robot] updated from transifex
|
2013-02-03 00:06:15 +01:00 |
TheSFReader
|
7e3aa0de86
|
Merge remote-tracking branch 'refs/remotes/upstream/master'
|
2013-02-02 09:44:09 +01:00 |
Lukas Reschke
|
23166aa016
|
Merge pull request #1415 from owncloud/ldap_fix_settings
LDAP settings Advanced tab has grown too long by far. Structure it using accordion.
|
2013-02-01 16:35:55 -08:00 |
Jenkins for ownCloud
|
b29b55a332
|
[tx-robot] updated from transifex
|
2013-02-02 00:08:15 +01:00 |
Arthur Schiwon
|
10ad5f923a
|
remove ugly whitespace
|
2013-02-01 23:52:41 +01:00 |
Arthur Schiwon
|
a7d82ad0ee
|
LDAP: settings Advanced tab has grown too long by far. Structure it using accordion
|
2013-02-01 23:48:22 +01:00 |
TheSFReader
|
d8f6595c5e
|
Merge remote-tracking branch 'refs/remotes/upstream/master'
|
2013-02-01 23:28:20 +01:00 |
Sam Tuke
|
0677d56ee2
|
Added debugging output relating to recrypting legacy files
|
2013-02-01 19:31:15 +00:00 |
TheSFReader
|
469b1e8dd2
|
Correct it
|
2013-02-01 20:29:02 +01:00 |
Thomas Mueller
|
fb0a5f3224
|
undelete -> restore
|
2013-02-01 00:43:52 +01:00 |
Jenkins for ownCloud
|
94f7446724
|
[tx-robot] updated from transifex
|
2013-02-01 00:19:28 +01:00 |
Michael Gapczynski
|
a9e1c9bf6d
|
Merge pull request #1351 from owncloud/navigation
New navigation design
|
2013-01-31 14:37:39 -08:00 |
Thomas Mueller
|
b1da1db0eb
|
Merge branch 'master' into from_live_to_on
Conflicts:
apps/files_external/js/google.js
|
2013-01-31 23:34:12 +01:00 |
Thomas Mueller
|
c1072d0c09
|
call ajax scan only if a user is logged in - otherwise we'll get a 500
|
2013-01-31 23:26:40 +01:00 |
Thomas Mueller
|
2af6d74bc1
|
Merge branch 'master' into fixing-js-errors-public-link-master
Conflicts:
apps/files/js/files.js
apps/files/templates/part.list.php
|
2013-01-31 23:23:10 +01:00 |
Thomas Müller
|
317261d6df
|
Merge pull request #1099 from herbrechtsmeier/ssl-proxy
add multiple domains reverse SSL proxy support
|
2013-01-31 14:01:32 -08:00 |
Thomas Mueller
|
fc585623a5
|
spell check
👍
|
2013-01-31 22:49:07 +01:00 |