16a5ace434
Fixed bug causing encrypted files to be doubly encrypted at login
...
Added comments and docblocks
2013-02-06 14:30:40 +00:00
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
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
33ec26f6d6
LDAP: info string improved
2013-02-06 14:24:00 +01:00
af2acadc66
LDAP: fix settings handling of homeFolderNamingRule option
2013-02-06 13:04:35 +01:00
0e548283fc
Replace OC_FileCache usage in files_versions
2013-02-06 08:00:57 +01:00
993831b6df
LDAP: version bump -> clean up database
2013-02-06 02:29:55 +01:00
c6aa370604
code style
2013-02-06 02:29:03 +01:00
3cef8f1216
LDAP: do not store user home as it destroys configurability. always fetch it. use of cache is save however, it is cleared when settings are saved
2013-02-06 02:28:09 +01:00
335b6cd060
[tx-robot] updated from transifex
2013-02-06 00:06:28 +01:00
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
a528f96b84
Merge branch 'master' into files_encryption-style-fixes
2013-02-05 18:23:03 +00:00
e6400b3059
Merge pull request #1474 from samtuke/master
...
Improvements to files_encryption
2013-02-05 09:58:35 -08:00
20b1d12cbf
Fixed comment typo, wrapped return value conditional on var assignment in session{}
2013-02-05 17:28:26 +00:00
4ba0ab7f65
Added missing translation wrapping
2013-02-05 17:22:59 +00:00
b84e83261e
Added notice to personal settings indicating what filetypes are not encrypted
2013-02-05 17:06:15 +00:00
3e7ca373ec
Only calculate md5 of local file once
2013-02-05 17:56:51 +01:00
148e4facfa
Change files_versions namespace to OCA\Files_Versions
2013-02-05 17:46:39 +01:00
680c5b3dad
Removed debugging output
2013-02-05 16:11:50 +00:00
221b69dd0e
Fixed bug relating to Filesystem{} that prevented webdav logins with files_encryption
2013-02-05 16:09:01 +00:00
a1f200c1e5
Cleaned up path formatting with new method stripUserFilesPath()
2013-02-05 15:59:28 +00:00
53248a9b60
Recryption of legacy encrypted files now working on login
2013-02-05 15:35:29 +00:00
fd90b82acd
Merge github.com:owncloud/core
2013-02-05 13:44:45 +00:00
927d4c98a1
Fixed todos: undefined vars and unreachable code
2013-02-05 13:12:34 +00:00
65bd7af8df
Remove undefined crumb variable from home breadcrumb
2013-02-04 20:40:16 -05:00
98f37f4bed
[tx-robot] updated from transifex
2013-02-05 00:20:29 +01:00
68fe6d0077
Merge pull request #1432 from owncloud/add_requesttoken
...
[user_webdavauth] add requesttoken
2013-02-04 12:02:16 -08:00
b06ac67e07
Add 'hascontrols' class for content with fixed topbar.
2013-02-04 18:30:49 +01:00
fee3f80501
Merge pull request #1434 from owncloud/trashbin_CSRF
...
[files_trashbin] Add CSRF token
2013-02-04 02:14:52 -08:00
8add89ced1
OCP\JSON instead of OCP\User
2013-02-04 09:15:11 +01:00
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
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
9060c3bd83
Files: fix positioning of Trash button and upload progress bar
2013-02-04 01:05:59 +01:00
da6e79a381
[tx-robot] updated from transifex
2013-02-04 00:05:52 +01:00
018c5f69c0
[files_trashbin] Add CSRF token
2013-02-03 22:49:12 +01:00
bce59c3945
[user_webdavauth] add requesttoken
2013-02-03 19:58:55 +01:00
1557b6d99d
Fix leftcontent positioning. Ref #1255
2013-02-03 14:44:33 +01:00
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
2936140838
[tx-robot] updated from transifex
2013-02-03 00:06:15 +01:00
7e3aa0de86
Merge remote-tracking branch 'refs/remotes/upstream/master'
2013-02-02 09:44:09 +01:00
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
b29b55a332
[tx-robot] updated from transifex
2013-02-02 00:08:15 +01:00
10ad5f923a
remove ugly whitespace
2013-02-01 23:52:41 +01:00
a7d82ad0ee
LDAP: settings Advanced tab has grown too long by far. Structure it using accordion
2013-02-01 23:48:22 +01:00
d8f6595c5e
Merge remote-tracking branch 'refs/remotes/upstream/master'
2013-02-01 23:28:20 +01:00
0677d56ee2
Added debugging output relating to recrypting legacy files
2013-02-01 19:31:15 +00:00
469b1e8dd2
Correct it
2013-02-01 20:29:02 +01:00
fb0a5f3224
undelete -> restore
2013-02-01 00:43:52 +01:00
94f7446724
[tx-robot] updated from transifex
2013-02-01 00:19:28 +01:00
a9e1c9bf6d
Merge pull request #1351 from owncloud/navigation
...
New navigation design
2013-01-31 14:37:39 -08:00
b1da1db0eb
Merge branch 'master' into from_live_to_on
...
Conflicts:
apps/files_external/js/google.js
2013-01-31 23:34:12 +01:00
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
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
317261d6df
Merge pull request #1099 from herbrechtsmeier/ssl-proxy
...
add multiple domains reverse SSL proxy support
2013-01-31 14:01:32 -08:00
fc585623a5
spell check
...
👍
2013-01-31 22:49:07 +01:00
a1dc24c9da
LDAP: implement getDisplayName and getDisplayNames also for UserProxy (multiple server support)
2013-01-31 21:19:24 +01:00
06847f609b
Improved support for detecting and recrypting legacy files. Bugs remain.
2013-01-31 19:40:51 +00:00
3d5c7ca245
Merge branch 'master' into navigation
2013-01-31 19:28:25 +01:00
c6b3bdd5a0
Fixed compatibility with filecache rewrite merge
2013-01-31 17:51:46 +00:00
ab2b79cda6
add multiple domains reverse proxy support
...
Add support for a reverse proxy that handles multiple domains via different
web roots (http[s]://proxy.tld/domain.tld/owncloud).
As the reverse proxy web root is transparent for the web server the
REQUEST_URI and SCRIPT_NAME need manual adjustments. This patch replace
the direct use of this _SERVER variables with function calls and extend
this functions to overwrite the web root. Additionally it adds a Sabre
request backend that extends the Sabre_HTTP_Request to use the same
functions.
2013-01-31 18:42:31 +01:00
411e8e5218
Merge pull request #1365 from owncloud/ldap_multiple_server
...
LDAP: support for multiple LDAP/AD servers
2013-01-31 09:24:45 -08:00
afacaf8bc2
string fragment was added by accident and does not belong here
2013-01-31 18:00:07 +01:00
5417e44b2a
Files: fix moving files by DnD
2013-01-31 17:56:44 +01:00
19714151e2
spell check
2013-01-31 17:53:01 +01:00
5862f3d140
spell check
2013-01-31 17:51:59 +01:00
2183f77527
Fixed incompatibilities with filecache rewrite merge
2013-01-31 16:49:07 +00:00
7f2d7cdbe1
spell check
2013-01-31 17:44:25 +01:00
a17a7f5cdb
adding l10n support to user_ldap
2013-01-31 17:43:24 +01:00
31e723a907
Merge github.com:owncloud/core
...
Conflicts:
lib/public/share.php
2013-01-31 16:30:37 +00:00
209d599ec5
[tx-robot] updated from transifex
2013-01-31 17:05:21 +01:00
4162ba4d41
adding l10n support to files_trashbin
2013-01-31 16:48:41 +01:00
ad044eb888
Merge branch 'master' into navigation
2013-01-31 15:35:20 +01:00
8dd9dedee8
Merge pull request #1266 from schiesbn/trash_bin
...
Trash bin
2013-01-31 06:18:22 -08:00
54d46fe43c
remove outdated line
2013-01-31 15:00:48 +01:00
c8a4878b77
is_writable() is now isUpdatable() with the new filesystem
2013-01-31 14:55:14 +01:00
dff5148f6d
debug output removed
2013-01-31 14:48:57 +01:00
54eeb8b8fc
fix merge conflict
2013-01-31 10:55:59 +01:00
9c83b307f6
keep mtime
2013-01-31 10:50:02 +01:00
2ddd40ed41
rename 'undelete' to 'restore'
2013-01-31 10:06:02 +01:00
2f11d7fe12
LDAP: adjust settings interface for custom search attributes
2013-01-31 02:10:13 +01:00
1a854454d6
LDAP: avoid attempts to save null as configvalue
2013-01-31 02:00:29 +01:00
0b98dc30b2
LDAP: remove unnecessary placeholders, fixes PHP warnings
2013-01-31 01:56:16 +01:00
b5ed8b2751
LDAP: fix wrong index
2013-01-31 01:46:54 +01:00
b3b0544e17
LDAP: make it possible to define attributes that should be considered on searches
2013-01-31 01:46:34 +01:00
00a30e6651
[tx-robot] updated from transifex
2013-01-31 00:31:28 +01:00
c7b1bdf00e
Fixed handling of keyfile subdir creation
...
Improved keyfile subdir deletion (1 bug remains here)
2013-01-30 18:52:02 +00:00
207aa22d12
merge master into filesystem
2013-01-30 19:24:24 +01:00
95352fbc15
Files: Dont get maxUploadSize if the filecache needs to be upgraded
2013-01-30 19:19:19 +01:00
61b23ce6cc
Working on support for deleting directories (removing all keyfiles)
2013-01-30 17:25:17 +00:00
8ded07dd5c
first style fixes - @samtuke: I added some TODO regarding undefined variables and unreachable code - please review
2013-01-30 17:49:05 +01:00
263c3f3a42
attach on to filelist instead of individual td elements for file link behaviour
2013-01-30 17:10:40 +01:00
22812c5f0d
replace live() with on() in core js
2013-01-30 17:00:54 +01:00
9ca0a93847
make spinner title translatable
2013-01-30 16:20:13 +01:00
c62a38fcb1
add spinner for undelete operation for visualisation
2013-01-30 15:35:24 +01:00
1592764a60
show a spinner instead of the delete button while moving files to the trash bin
2013-01-30 14:32:20 +01:00
284e690737
Merge branch 'master' into navigation
2013-01-30 13:53:43 +01:00
8f388d9df4
LDAP: update link to online documentation
2013-01-30 13:48:59 +01:00
81a398c22c
use $.trim() for IE8
2013-01-30 13:29:24 +01:00
e6f1544f51
fix OC_Log::ERROR call
2013-01-30 13:04:32 +01:00
a6e5f4b85c
some minor improvements
2013-01-30 13:01:53 +01:00
99dfaee1f6
reset checkbox after getting selected files instead of ofter dragging, speed up revert
2013-01-30 12:59:35 +01:00
1d0ee61f3a
use post instead of get
2013-01-30 12:59:35 +01:00
0089b17749
add multselect dnd
2013-01-30 12:59:34 +01:00
5761bd771f
Merge pull request #1227 from owncloud/hideuploadprogresscancelinielt10
...
hide upload progress bar and cancel action in IE < 10
2013-01-30 02:48:12 -08:00
d6adab6734
improved message if trash bin is empty
2013-01-30 10:07:29 +01:00
8fd263ef63
LDAP: update quota on every uncached userExists, i.e. also on every isLoggedIn, fixes #1278
2013-01-30 03:57:46 +01:00
e8db1e884e
LDAP: some inline documentation
2013-01-30 03:44:11 +01:00
14bc6f8c6c
LDAP: working visual feedback on save. Save button will be highlighted green or red.
2013-01-30 03:34:51 +01:00
19867b1d08
LDAP: make sure app meta data is not deleted from database when deleting configuration with empty prefix
2013-01-30 02:39:44 +01:00
a557522037
LDAP: send back error message properly
2013-01-30 02:39:11 +01:00
9f7d780276
LDAP: use consolidated method for determining config prefix
2013-01-30 02:31:14 +01:00
a8ac4bdf79
LDAP: Always preset configuration prefix when no configuratin is stored or all remaining ones are deleted
2013-01-30 02:30:24 +01:00
68266e70f2
[tx-robot] updated from transifex
2013-01-30 00:25:41 +01:00
250c565d2b
Merge pull request #1360 from owncloud/display_name
...
introduction of display names
2013-01-29 14:05:54 -08:00
c1f20fe37a
Made encyrption keyfiles be deleted when their parents are
...
Made encryption keyfiles be renamed when their parents are
Fixed bugs with encryptAll() execution on login
2013-01-29 19:54:40 +00:00
f33b72677b
LDAP: implement support for ownCloud Display Names
2013-01-29 20:41:48 +01:00
0c8bcacdc8
added some additional error handling
2013-01-29 13:36:33 +01:00
eafd34684c
seperate css no longer needed, use files app css instead
2013-01-29 10:08:41 +01:00
d10e137939
icons added; empty trash bin message added
2013-01-29 10:03:04 +01:00
5143660cd3
Merge pull request #1324 from owncloud/permanent-share-icons
...
Permanently display shared status icons
2013-01-28 20:17:40 -08:00
8c4931a645
[tx-robot] updated from transifex
2013-01-29 00:06:20 +01:00
a67f11c8af
Sharing: partailly fix searchByMime
2013-01-28 21:25:19 +01:00
86e5a9cd73
Files: fix sharing newly uploaded files
2013-01-28 21:09:18 +01:00
929b8c3e69
fix files_version hooks
2013-01-28 20:04:10 +01:00
7207211f3a
change required ownCloud version to 4.91
2013-01-28 19:58:24 +01:00
01b3c088a9
fix color change on click
2013-01-28 19:47:51 +01:00
74f6f85628
merge master into filesystem
2013-01-28 19:37:58 +01:00
3bafa87a12
merge styles
2013-01-28 19:36:21 +01:00
c9c919da57
Move streamwrappers to seperate files and put them in a namespace
2013-01-28 15:34:15 +01:00
320233ec3d
merge conflict fixed
2013-01-28 15:10:00 +01:00
f28857377d
use hidden input field to disable sharing
2013-01-28 11:28:16 +01:00
8067a1394e
fix merge conflicts
2013-01-28 11:18:04 +01:00
329d965441
merge changes in navigation
2013-01-28 10:52:15 +01:00
11e88f4939
call ajax scan only if a user is logged in - otherwise we'll get a 500
2013-01-28 09:48:03 +01:00
47ce3c2160
include keyboardshortcuts.js
2013-01-28 09:47:21 +01:00
03a1a20316
fixing href for folders
2013-01-28 09:46:52 +01:00
31d83fddc4
Merge pull request #1321 from owncloud/csp-fixes
...
Files: CSP fixes
2013-01-28 00:29:46 -08:00
10c428830e
Add create permission, fixes #780
2013-01-27 23:31:31 -05:00
bca5ce724e
Merge branch 'master' into filesystem
2013-01-28 02:35:51 +01:00
b655444709
[tx-robot] updated from transifex
2013-01-28 00:05:43 +01:00
00a28062e1
[tx-robot] updated from transifex
2013-01-27 00:06:21 +01:00
b1b2eafa50
Merge remote-tracking branch 'upstream/master'
...
Conflicts:
apps/files_external/lib/config.php
2013-01-26 21:51:18 +01:00
a26d50640f
Update apps/files_external/lib/sftp.php
...
Added cleaning the root path
2013-01-26 19:46:23 +01:00
930b9b9cd0
merge master into filesystem
2013-01-26 18:49:45 +01:00
2e42c6f54f
Use HTML5 data attribute + fix undefined variable
2013-01-26 14:07:35 +01:00
6c882d9806
Remove outdated comments
2013-01-26 14:03:17 +01:00
276d98b9dd
Merge pull request #1059 from owncloud/fixing-998-master
...
Fixing 998 master
2013-01-26 04:15:40 -08:00
af4411e33d
[tx-robot] updated from transifex
2013-01-26 00:10:07 +01:00
a86da16a10
More Style Fixes
...
Remove Repeating Background behind folder names in files app
part.breadcrumb.php
2013-01-25 20:50:55 +05:30
047f1988c3
Merge branch 'master' into no-inline-js
2013-01-25 16:11:07 +01:00
839f4bd949
show display name instead of uid in the public shared files view
2013-01-25 13:01:53 +01:00
6832dddf39
[tx-robot] updated from transifex
2013-01-25 00:05:56 +01:00
3e99f12120
LDAP: make settings strings in JS translatable
2013-01-24 22:47:25 +01:00
2749a14171
LDAP: make it possible to enable/disable server configurations
2013-01-24 22:39:05 +01:00
094213e231
Fixed many coding guidelines issues
...
Continued work on upgrade path via login hook listener
New spec file with notes
2013-01-24 18:37:34 +00:00
ef88ceba8c
drop SimpleTest compatibility
2013-01-24 16:47:17 +01:00
dbb0d04073
restore file in the root folder if the origin folder is not writable
2013-01-24 15:29:22 +01:00
6bc7256966
LDAP: forgotten file for deleteConfig feature
2013-01-24 14:12:12 +01:00
5b9e181198
LDAP: implement deleteConfiguration feature
2013-01-24 14:11:53 +01:00
3bf38c7a84
LDAP: add missing new LDAP Helper
2013-01-24 13:01:43 +01:00
fccfdb2a52
LPAP: cleanup settings.php, it's already ajaxified
2013-01-24 13:01:20 +01:00
b2ea78c00d
LDAP: improve and cleanup settings JS
2013-01-24 13:00:40 +01:00
b084ed6a42
LDAP: clean up, save configuration is now handled by Ajax
2013-01-24 12:46:10 +01:00
319dcd45e1
LDAP: Clear cache on saving settings
2013-01-24 12:44:30 +01:00
96949fc9dd
LDAP: consolidate config prefix determination, autofill combo box in settings
2013-01-24 12:42:28 +01:00
3ff32eba25
[tx-robot] updated from transifex
2013-01-24 00:07:38 +01:00
b979bf6f1c
LDAP: fix default
2013-01-23 23:46:55 +01:00
06c284f6cc
LDAP settings: read configuration when another server config is chosen
2013-01-23 23:41:35 +01:00
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
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
cd832935e8
Merge branch 'files_encryption'
2013-01-23 12:54:09 +00:00
6ab95e8e33
code clean-up
2013-01-23 11:30:42 +01:00
c8bbbb48d3
Merge master...
2013-01-23 11:30:40 +01:00
5fadd53088
missing renames of publicListView to disableSharing
2013-01-23 09:18:26 +01:00
c986dbe573
[tx-robot] updated from transifex
2013-01-23 00:06:18 +01:00
f858381775
merge master into filesystem
2013-01-22 23:27:04 +01:00
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
aa648fca75
Merge branch 'master' into files_encryption
...
Conflicts:
apps/files_encryption/templates/settings.php
2013-01-22 17:31:05 +00:00
47592657d7
Added localisation for encryption settings
2013-01-22 17:15:03 +00:00
f919230f63
remove inline JavaScript
2013-01-22 17:59:33 +01:00
619780a67d
Merge branch 'master' into files_encryption
2013-01-22 16:50:20 +00:00
16ae902e31
no undo notification for deleted file, we use the trash bin instead
2013-01-22 17:43:46 +01:00
b694f996d9
allow admin to change retention obligation for the trash bin, default value is 180 days
2013-01-22 15:33:54 +01:00
16d7716dee
calculate correct relative date for trashbin file list
2013-01-22 15:33:54 +01:00
97e69e5374
remove table row in trash bin view after undelete
2013-01-22 15:33:54 +01:00
81ab0affef
allow to restore single files/folder from a deleted folder
2013-01-22 15:33:54 +01:00
1817c7895b
allow to look into deleted directories
2013-01-22 15:33:54 +01:00
1255791ef2
handle group restore
2013-01-22 15:33:54 +01:00
655a20f963
expire files in trash bin after 30 days
2013-01-22 15:33:54 +01:00
8e57fe1a08
remove unneeded function
2013-01-22 15:33:54 +01:00
a3da82261b
remove item in the trash bin view after successful undelete
2013-01-22 15:33:53 +01:00
d605228937
first version of the trash bin app
2013-01-22 15:33:53 +01:00
8259768732
introduce option to disable download action
2013-01-22 15:33:53 +01:00
dfab3d3d7f
call the trash bin view
2013-01-22 15:33:53 +01:00
9bacb0e179
rename "publicListView" option to "disableSharing", this is more meaningful also because it is not only useful for the public list view
2013-01-22 15:33:53 +01:00
f15deaf556
listen to post delete event to allow the trash bin to create a copy of the version first
2013-01-22 15:32:57 +01:00
9d77317de8
add trash button to web interface
2013-01-22 15:32:57 +01:00
bd5ff29716
Merge branch 'master' into no-inline-js
2013-01-22 11:50:33 +01:00
e666ce3622
Fix external storage UI for new storage namespaces
2013-01-21 23:57:26 -05:00
f2d0eeae83
Merge branch 'master' into filesystem
2013-01-22 00:19:44 +01:00
8223117569
Remove closing tag
2013-01-21 22:29:27 +01:00
1762378f67
Files: don't load fileactions.js when upgrading filecache
2013-01-21 22:07:55 +01:00
9bc8df3649
Move publicListView to external JS
2013-01-21 20:36:19 +01:00
0d02caa684
No inline JS in apps
2013-01-21 20:34:28 +01:00
aede26d996
[tx-robot] updated from transifex
2013-01-21 00:05:34 +01:00
10876aba89
fix more config keys for save settings handling
2013-01-20 18:30:14 +01:00
0c3466325b
fix continue in switch, add another key to skip
2013-01-20 18:27:39 +01:00
6d84aa93d3
Ajaxifiy Settings Save
2013-01-20 18:02:44 +01:00
83d6221322
merge master into filesytem
2013-01-20 03:11:04 +01:00
ebc0c4b85b
[tx-robot] updated from transifex
2013-01-20 00:06:40 +01:00
5d6c1d52bd
replace #notification with OC.Notification call
2013-01-19 21:37:05 +01:00
b8318e6df4
Merge branch 'master' into fixing-998-master
...
Conflicts:
apps/files/js/files.js
2013-01-19 15:58:15 +01:00
53b95cb8fd
Merge pull request #1230 from owncloud/remove-unused-autocomplete.php
...
Remove uneeded file
2013-01-19 05:56:27 -08:00
ae244972cb
Merge pull request #1228 from owncloud/generating_zip_message
...
Make the ZIP download information friendlier
2013-01-19 04:33:39 -08:00
02bd8dd45a
Change the second part of the notification
2013-01-19 13:12:27 +01:00
8ca30d244c
Implement getETag() in shared storage
2013-01-19 00:02:40 -05:00
1dd70ac506
update used space percent after each ajax call and display the notification
2013-01-19 00:31:49 +01:00
cdd07b3339
introducing class OCA/files/lib/Helper with new function to build an array with storage stats
...
DRYing the code by using \OCA\files\lib\Helper::buildFileStorageStatistics()
now returning used space percent on each ajax call
2013-01-19 00:31:09 +01:00
a17ca3a69a
[tx-robot] updated from transifex
2013-01-19 00:05:38 +01:00
afb5de955e
Merge branch 'master' into fixing-998-master
...
Conflicts:
apps/files/ajax/upload.php
apps/files/js/files.js
2013-01-18 23:22:34 +01:00
f447e6469f
Remove uneeded file
...
I don't saw any usage of this file through the code, I assume it can
safely be removed.
2013-01-18 23:07:11 +01:00
31cc9aa80d
Merge pull request #986 from owncloud/fixing-784-master
...
the maximum upload size is now part of the response of the upload and de...
2013-01-18 14:06:00 -08:00
ad57db3e87
Make the message friendlier
2013-01-18 22:35:26 +01:00
5e16510a53
hide upload progress bar and cancel action in IE < 10
2013-01-18 22:06:42 +01:00
5ff29b4348
fixing indent
2013-01-18 20:09:03 +01:00
b81a7aa078
fix up content and content-wrapper merge ...
2013-01-18 19:58:50 +07:00
229a25f41a
fix mixed key and value
2013-01-18 13:53:26 +01:00
805f900b19
LDAP: pass defaults to settings form, and restore them on creating a new configuration if wanted
2013-01-18 13:45:39 +01:00
229d484200
LDAP: gather defaults in one place, simplify readConfiguration
2013-01-18 13:35:40 +01:00
1c19e66712
coding style
2013-01-18 11:42:34 +01:00
a53addf825
LDAP: first basics for multiserver config ui
2013-01-18 01:23:15 +01:00
824fcf6624
[tx-robot] updated from transifex
2013-01-18 00:04:36 +01:00
130c9cad03
relative storage info without decimals
2013-01-17 16:52:57 +01:00
b7d3bf5f81
rename space -> storage
2013-01-17 16:49:10 +01:00
d8be83029b
make sure port is used as backup port if not specified. documentation. determine connection error earlier.
2013-01-17 13:56:37 +01:00
59a6068246
fix undeclared variable
2013-01-17 13:46:32 +01:00
3d56cf3a5b
LDAP: add support for backup/replica servers
2013-01-17 13:31:14 +01:00
433fa19268
[tx-robot] updated from transifex
2013-01-17 00:27:40 +01:00
bb43cf378b
Files: make sure keybinds js is loaded after files js
2013-01-16 21:36:25 +01:00
5445b94416
merge master into filesystem
2013-01-16 19:04:50 +01:00
5bfe4adbaa
Whitespace cleanup
2013-01-16 18:09:16 +01:00
a8f963d9cf
Spaces to tabs
2013-01-16 18:09:16 +01:00
6063ce9c8d
LDAP: enable support for multiple LDAP/AD servers
2013-01-16 14:59:41 +01:00
4699f36e44
LDAP: fix read configuration, remove unnecessary debug output
2013-01-16 14:58:49 +01:00
ad1113c2cb
LDAP: fix parameter passed not as expected
2013-01-16 14:56:57 +01:00
2b9c925a2b
Merge pull request #1192 from schiesbn/versioning_history_issue_1189
...
fix for issue #1186 , missing variables added
2013-01-16 01:26:43 -08:00
73c4d0faff
initialize $versionCreated
2013-01-16 10:20:09 +01:00
0398bfffca
[tx-robot] updated from transifex
2013-01-16 00:21:21 +01:00
7debfac0dc
Cache: more efficient upgrading
2013-01-15 19:11:12 +01:00
94068e5d08
Cache: show upgrade progress
2013-01-15 18:13:50 +01:00
0da06187f6
Merge pull request #1187 from owncloud/fixing-unused-and-undefined-in-master
...
Fixing unused and undefined in master
2013-01-15 07:45:51 -08:00
9bf367e7f8
merge master into filesystem
2013-01-15 14:57:23 +01:00
6182b1353b
merge master into navigation
2013-01-15 20:40:38 +07:00
60d5d5f636
fix for issue #1186 , missing variables added
2013-01-15 14:34:15 +01:00
bb9cc227c2
Merge pull request #1087 from owncloud/ldap_multiple_dns
...
LDAP: ability to configure more than one base DN
2013-01-15 04:01:57 -08:00
fdd667a83c
[tx-robot] updated from transifex
2013-01-15 00:05:10 +01:00
388bb6a5e1
Merge branch 'master' into fixing-unused-and-undefined-in-master
2013-01-14 23:41:34 +01:00
7455056d2d
Merge pull request #1169 from owncloud/webdav_L10n
...
user_webdavauth - l10n - Trivial
2013-01-14 12:28:51 -08:00
9eb16e06f7
Merge pull request #1135 from owncloud/allow_default_click_behaviour
...
allow default click behaviour
2013-01-14 11:24:02 -08:00
d95fc4e1e3
Adding sharing support: added new method in Keymanager setShareKey()
...
Added notes in proxy{} and stream{} pointing to share support
2013-01-14 19:07:28 +00:00
1641ed8ac7
Merge branch 'master' into files_encryption
2013-01-14 16:54:25 +00:00
e9f3c5feea
Added creation of dir for shared file env encryption keys
...
Added comment to use multiKeyEncrypt
2013-01-14 15:39:04 +00:00
51a4240051
Merge pull request #1170 from owncloud/correctIndention
...
Remove ugly indentation - Trivial
2013-01-14 04:59:53 -08:00
3fbf362ba2
Removed debugging comments
2013-01-14 12:36:46 +00:00
cd802ed45b
Merge branch 'master' of github.com:owncloud/core
2013-01-14 10:33:17 +01:00
e0173303e6
merge conflict fixed, settings-personal.php is no longer needed
...
Conflicts:
apps/files_versions/templates/settings-personal.php
2013-01-14 10:24:40 +01:00
c29310aaef
[tx-robot] updated from transifex
2013-01-14 00:18:21 +01:00
2a7e5faa37
Remove ugly indentation
2013-01-13 01:02:11 +01:00
9cfc195b7c
The => This
...
Sounds better for me.
2013-01-13 00:45:45 +01:00
90d0d08826
Improved the help text
2013-01-13 00:37:58 +01:00
fb7f9e25c3
legend - l10n
2013-01-13 00:32:44 +01:00
981fd5e424
[tx-robot] updated from transifex
2013-01-13 00:08:40 +01:00
ad64ce189d
[tx-robot] updated from transifex
2013-01-12 00:10:58 +01:00
d276d21c76
- code clean-up
...
- some more code comments
- fixed bug in the expire function, cleanup all_versions array during run. Otherwise it could happen that we try to delete already deleted versions
2013-01-11 19:33:54 +01:00
09c54722a8
add LDAP User and Group proxies to suppoer multiple servers
2013-01-11 18:13:22 +01:00
e560cba76b
adding a ajax call to get the current file storage stats like free space
...
logic to call it every 5 minutes
make use of visibility API/jquery-visibility to perform the ajax call only if the browser is visible/in use
2013-01-11 16:47:28 +01:00
938254a1c0
load jquery-visibility
2013-01-11 16:45:32 +01:00
362860c5b5
adding jquery-visibility
...
https://github.com/mathiasbynens/jquery-visibility
MIT and GPL licensed
2013-01-11 16:44:25 +01:00
3d33e8f845
fixing indent - sorryy wrong setting on the IDE :-(
...
replace missing calls to OC.Notification.show
2013-01-11 15:02:34 +01:00
9afdc14d40
adding accidentally removed line - THX @bartv2
2013-01-11 14:55:49 +01:00
99a0ea44ee
function description fixed
2013-01-11 14:24:00 +01:00
67d00bc6bb
some more clean-up, isVersioned() is no longer needed; rename hook fixed if a complete folder gets renamed
2013-01-11 14:23:28 +01:00
508b6a9fc7
displaying notification now centered
...
The notification div has been moved to the user templates.
Correct display of the notification will only work with the use of OC.Notification.show() as on fadeIn() the css needs to be changed as this style required display: inline.
2013-01-11 11:52:07 +01:00
6be9c0a974
some code clean-up
2013-01-11 11:12:32 +01:00
364b1cd391
Merge branch 'master' into fixing-998-master
...
Conflicts:
apps/files/js/files.js
2013-01-11 10:00:12 +01:00
23896a7290
Merge branch 'master' into fixing-784-master
...
Conflicts:
apps/files/js/files.js
2013-01-11 09:53:12 +01:00
36cac7f924
Return NOT_FOUND in shared cache
2013-01-10 22:29:47 -05:00
60489764f3
Merge pull request #1133 from owncloud/add_linebreaks_in_sharing
...
add more linebreaks, replace SQL LIMIT with param
2013-01-10 15:14:14 -08:00
d03dce1283
[tx-robot] updated from transifex
2013-01-11 00:06:14 +01:00
fab5817f67
documentation for the Connection constructor
2013-01-10 23:34:24 +01:00
0784bcb8d7
introduce configPrefix to allow settings for multiple LDAP servers
2013-01-10 23:30:26 +01:00
fed74eda1c
Removed old and unnecessary comments
2013-01-10 18:48:40 +00:00
2e30641caa
Removed misleading crypto gen comment
2013-01-10 18:19:37 +00:00
9ca9124dc1
Merge branch 'master' into files_encryption
2013-01-10 18:07:15 +00:00
61104d1441
Re-added 'checkAdminUser'
...
Improved code formatting
2013-01-10 18:04:52 +00:00
dca0fda2ad
keep track of the size of the versions directory
2013-01-10 18:04:30 +01:00
23dd7f1bea
Merge pull request #1127 from owncloud/fixing-641-for-webdav-master
...
webdav returns "503 Service Unavailable" in case the ownCloud server is ...
2013-01-10 02:27:00 -08:00
417498d519
add complete size of versions to array
2013-01-10 10:36:55 +01:00
464dafd7d2
Make Google Drive storage id unique, before it was anonymousanonymous
2013-01-09 22:17:39 -05:00
fbcf62389c
Merge branch 'master' into external_storage_ui_feedback
...
Conflicts:
apps/files_external/lib/webdav.php
2013-01-09 21:49:21 -05:00
78043d73e8
Set status to waiting for Dropbox and Google Drive while authenticating
2013-01-09 21:47:24 -05:00
912050afa0
[tx-robot] updated from transifex
2013-01-10 00:05:53 +01:00
fda1ada4f0
Merge pull request #1131 from owncloud/more_translations
...
translate move and rename error messages
2013-01-09 12:07:39 -08:00
ca027f3749
Merge pull request #1124 from schiesbn/sabredav2
...
OC_Connector_Sabre_Client no longer needed
2013-01-09 12:06:25 -08:00
d51fba7781
every 1000s run reduce the number of versions for all files, not only for the currently edited file
2013-01-09 17:11:46 +01:00
780fb37758
allow default click behaviour
2013-01-09 15:21:55 +01:00
42e3eaf45a
add more linebreaks, replace SQL LIMIT with param
2013-01-09 13:57:51 +01:00
a40c95242f
more translations
2013-01-09 12:48:57 +01:00
ccdaec6296
webdav returns "503 Service Unavailable" in case the ownCloud server is currently in maintenance mode.
2013-01-09 00:37:50 +01:00
533f0e8e25
[tx-robot] updated from transifex
2013-01-09 00:05:49 +01:00
dae8f15f9f
Merge pull request #938 from owncloud/fix_minor_files_annoyances
...
Fix minor files annoyances
2013-01-08 15:02:06 -08:00
4a8c25eef5
dechex not necessary, do not waste time with it
2013-01-08 19:25:19 +01:00
19fa78d1ee
Code style
2013-01-08 19:00:49 +01:00
43415386a8
Upstream merged my patch to add additional ssl root certificates to the webdav client.
...
This means that OC_Connector_Sabre_Client is no longer needed
2013-01-08 17:44:28 +01:00
e8b195bf10
Almost fix Shared scanner...
2013-01-07 20:52:51 -05:00
7b9e6d2f2c
fixing string concatenation in javascript
...
refs ae54364d7c
2013-01-08 00:32:41 +01:00
b69328e1d1
[tx-robot] updated from transifex
2013-01-08 00:31:36 +01:00
8f8a5bbfb7
Maked Shared_Permissions extend Permissions class
2013-01-07 18:17:14 -05:00
a7d4d04223
Fix mimetypes in shared cache
2013-01-07 15:27:22 -05:00
e475c26f1a
fixing <input> tag
2013-01-07 21:23:14 +01:00
861f32a22b
Update apps/user_webdavauth/user_webdavauth.php
...
Fixing wrong documentation. Fixes https://github.com/owncloud/core/issues/1110
2013-01-07 16:45:03 +01:00
a0b0a1d294
adjust timestamp of the file copied from the version history
2013-01-07 15:13:32 +01:00
3bb7ee521f
attach max upload tipsy to div instead of a to fix tooltip not showing due to new z-index
2013-01-07 12:23:29 +01:00
619c3ef56d
use limits defined in issue https://github.com/owncloud/core/issues/860
2013-01-07 12:06:31 +01:00
da442b024c
remove aborted uploads
2013-01-07 11:11:21 +01:00
cbb118d4a3
adapt to isFileNameValid, whitespace cleanup
2013-01-07 10:39:35 +01:00
e8d08d4930
merge master into filesystem
2013-01-07 00:16:10 +01:00
0b007235b9
[tx-robot] updated from transifex
2013-01-07 00:06:32 +01:00
7042b5bf1f
remove silly assignment
2013-01-06 23:53:05 +01:00
a0d6f0e127
fixing undefined $eventSource
2013-01-06 23:36:31 +01:00
4a345fd911
removing undefined $response
2013-01-06 23:28:58 +01:00
9671ace32e
Merge branch 'master' into fix_minor_files_annoyances
...
Conflicts:
apps/files/js/files.js
2013-01-06 22:46:40 +01:00
bae1755184
Merge branch 'master' into fixing-784-master
...
Conflicts:
apps/files/ajax/upload.php
apps/files/js/files.js
lib/helper.php
2013-01-06 22:40:35 +01:00
07b3b23a39
Merge branch 'master' into fixing-998-master
...
Conflicts:
apps/files/js/files.js
2013-01-06 22:28:21 +01:00
a68b597e83
Merge branch 'master' into files_encryption
2013-01-06 18:53:32 +00:00
015787fbb3
All in-use unit tests now passing after merge
2013-01-06 18:38:35 +00:00
2d98afa1ea
Removed debugging line
2013-01-06 14:06:22 +00:00
b024db9f98
Made Keymanager::getFileKey() dependencies explicit, fixed client code and tests accordingly
2013-01-06 13:56:45 +00:00
b4191b7da5
rename containsInvalidCharacters() to isFileNameValid() - NOTE: semantic has changed!
...
adding file name checks and notifications to isFileNameValid() for . and empty file name
2013-01-06 12:52:00 +01:00
7ebfcab49b
Merge branch 'master' into fixing-998-master
...
Conflicts:
lib/helper.php
2013-01-06 12:18:21 +01:00
6806484c16
Merge branch 'master' into fixing-998-master
2013-01-06 10:36:14 +01:00
69e86c0213
Merge branch 'master' into files_encryption
2013-01-05 17:22:01 +00:00
7fe9245636
Development snapshot
...
Crypt{} & Util{} unit tests now passing locally
Added keymanager unit tests
2013-01-05 17:12:23 +00:00
a5dcbc3d8a
Files: prevent people from renaming files to '.'
2013-01-05 03:30:05 +01:00
0b13b41189
Merge pull request #1053 from owncloud/ocs_api
...
External API for ownCloud based on OCS
2013-01-04 17:18:58 -08:00
934d9dcc42
[tx-robot] updated from transifex
2013-01-05 00:03:58 +01:00
ec1caa7d35
support LDAP search using multiple base DNs also with paged results, implements #395
2013-01-04 23:57:55 +01:00
ba475d4862
javascript notification functions have been moved to js.js for common use
2013-01-04 23:34:09 +01:00
9cd7bb2c8d
reverse z-index of a and input to make upload work again in ie8/9
2013-01-04 13:48:29 +01:00
de496ed16d
remove initial iframe, is added automatically by jquery upload mechanism
2013-01-04 13:47:47 +01:00
Sam Tuke
Arthur Schiwon
Bart Visscher
Jenkins for ownCloud
Lukas Reschke
Michael Gapczynski
Thomas Tanghus
Björn Schießle
Robin Appelman
TheSFReader
Jan-Christoph Borchardt
Stefan Herbrechtsmeier
Björn Schießle
Jörn Friedrich Dreyer
Henrik Kjölhede
raghunayyar
Frank Karlitschek