wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
9664 commits 157 branches 562 tags 714 MiB
Commit graph

4727 commits

Author SHA1 Message Date
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
Arthur Schiwon
af2acadc66 LDAP: fix settings handling of homeFolderNamingRule option 2013-02-06 13:04:35 +01:00
Bart Visscher
0e548283fc Replace OC_FileCache usage in files_versions 2013-02-06 08:00:57 +01:00
Arthur Schiwon
993831b6df LDAP: version bump -> clean up database 2013-02-06 02:29:55 +01:00
Arthur Schiwon
c6aa370604 code style 2013-02-06 02:29:03 +01:00
Arthur Schiwon
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
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
Arthur Schiwon
a1dc24c9da LDAP: implement getDisplayName and getDisplayNames also for UserProxy (multiple server support) 2013-01-31 21:19:24 +01:00
Sam Tuke
06847f609b Improved support for detecting and recrypting legacy files. Bugs remain. 2013-01-31 19:40:51 +00:00
Jan-Christoph Borchardt
3d5c7ca245 Merge branch 'master' into navigation 2013-01-31 19:28:25 +01:00
Sam Tuke
c6b3bdd5a0 Fixed compatibility with filecache rewrite merge 2013-01-31 17:51:46 +00:00
Stefan Herbrechtsmeier
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
blizzz
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
Arthur Schiwon
afacaf8bc2 string fragment was added by accident and does not belong here 2013-01-31 18:00:07 +01:00
Robin Appelman
5417e44b2a Files: fix moving files by DnD 2013-01-31 17:56:44 +01:00
Thomas Mueller
19714151e2 spell check 2013-01-31 17:53:01 +01:00
Thomas Mueller
5862f3d140 spell check 2013-01-31 17:51:59 +01:00
Sam Tuke
2183f77527 Fixed incompatibilities with filecache rewrite merge 2013-01-31 16:49:07 +00:00
Thomas Mueller
7f2d7cdbe1 spell check 2013-01-31 17:44:25 +01:00
Thomas Mueller
a17a7f5cdb adding l10n support to user_ldap 2013-01-31 17:43:24 +01:00
Sam Tuke
31e723a907 Merge github.com:owncloud/core 
Conflicts:
	lib/public/share.php
 2013-01-31 16:30:37 +00:00
Jenkins for ownCloud
209d599ec5 [tx-robot] updated from transifex 2013-01-31 17:05:21 +01:00
Thomas Mueller
4162ba4d41 adding l10n support to files_trashbin 2013-01-31 16:48:41 +01:00
Jan-Christoph Borchardt
ad044eb888 Merge branch 'master' into navigation 2013-01-31 15:35:20 +01:00
Björn Schießle
8dd9dedee8 Merge pull request #1266 from schiesbn/trash_bin 
Trash bin
 2013-01-31 06:18:22 -08:00
Robin Appelman
54d46fe43c remove outdated line 2013-01-31 15:00:48 +01:00
Björn Schießle
c8a4878b77 is_writable() is now isUpdatable() with the new filesystem 2013-01-31 14:55:14 +01:00
Björn Schießle
dff5148f6d debug output removed 2013-01-31 14:48:57 +01:00
Björn Schießle
54eeb8b8fc fix merge conflict 2013-01-31 10:55:59 +01:00
Björn Schießle
9c83b307f6 keep mtime 2013-01-31 10:50:02 +01:00
Björn Schießle
2ddd40ed41 rename 'undelete' to 'restore' 2013-01-31 10:06:02 +01:00
Arthur Schiwon
2f11d7fe12 LDAP: adjust settings interface for custom search attributes 2013-01-31 02:10:13 +01:00
Arthur Schiwon
1a854454d6 LDAP: avoid attempts to save null as configvalue 2013-01-31 02:00:29 +01:00
Arthur Schiwon
0b98dc30b2 LDAP: remove unnecessary placeholders, fixes PHP warnings 2013-01-31 01:56:16 +01:00
Arthur Schiwon
b5ed8b2751 LDAP: fix wrong index 2013-01-31 01:46:54 +01:00
Arthur Schiwon
b3b0544e17 LDAP: make it possible to define attributes that should be considered on searches 2013-01-31 01:46:34 +01:00
Jenkins for ownCloud
00a30e6651 [tx-robot] updated from transifex 2013-01-31 00:31:28 +01:00
Sam Tuke
c7b1bdf00e Fixed handling of keyfile subdir creation 
Improved keyfile subdir deletion (1 bug remains here)
 2013-01-30 18:52:02 +00:00
Robin Appelman
207aa22d12 merge master into filesystem 2013-01-30 19:24:24 +01:00
Robin Appelman
95352fbc15 Files: Dont get maxUploadSize if the filecache needs to be upgraded 2013-01-30 19:19:19 +01:00
Sam Tuke
61b23ce6cc Working on support for deleting directories (removing all keyfiles) 2013-01-30 17:25:17 +00:00
Thomas Mueller
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
Jörn Friedrich Dreyer
263c3f3a42 attach on to filelist instead of individual td elements for file link behaviour 2013-01-30 17:10:40 +01:00
Jörn Friedrich Dreyer
22812c5f0d replace live() with on() in core js 2013-01-30 17:00:54 +01:00
Björn Schießle
9ca0a93847 make spinner title translatable 2013-01-30 16:20:13 +01:00
Björn Schießle
c62a38fcb1 add spinner for undelete operation for visualisation 2013-01-30 15:35:24 +01:00
Björn Schießle
1592764a60 show a spinner instead of the delete button while moving files to the trash bin 2013-01-30 14:32:20 +01:00
Jan-Christoph Borchardt
284e690737 Merge branch 'master' into navigation 2013-01-30 13:53:43 +01:00
Arthur Schiwon
8f388d9df4 LDAP: update link to online documentation 2013-01-30 13:48:59 +01:00
Jörn Friedrich Dreyer
81a398c22c use $.trim() for IE8 2013-01-30 13:29:24 +01:00
Björn Schießle
e6f1544f51 fix OC_Log::ERROR call 2013-01-30 13:04:32 +01:00
Björn Schießle
a6e5f4b85c some minor improvements 2013-01-30 13:01:53 +01:00
Jörn Friedrich Dreyer
99dfaee1f6 reset checkbox after getting selected files instead of ofter dragging, speed up revert 2013-01-30 12:59:35 +01:00
Jörn Friedrich Dreyer
1d0ee61f3a use post instead of get 2013-01-30 12:59:35 +01:00
Jörn Friedrich Dreyer
0089b17749 add multselect dnd 2013-01-30 12:59:34 +01:00
Thomas Müller
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
Björn Schießle
d6adab6734 improved message if trash bin is empty 2013-01-30 10:07:29 +01:00
Arthur Schiwon
8fd263ef63 LDAP: update quota on every uncached userExists, i.e. also on every isLoggedIn, fixes #1278 2013-01-30 03:57:46 +01:00
Arthur Schiwon
e8db1e884e LDAP: some inline documentation 2013-01-30 03:44:11 +01:00
Arthur Schiwon
14bc6f8c6c LDAP: working visual feedback on save. Save button will be highlighted green or red. 2013-01-30 03:34:51 +01:00
Arthur Schiwon
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
Arthur Schiwon
a557522037 LDAP: send back error message properly 2013-01-30 02:39:11 +01:00
Arthur Schiwon
9f7d780276 LDAP: use consolidated method for determining config prefix 2013-01-30 02:31:14 +01:00
Arthur Schiwon
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
Jenkins for ownCloud
68266e70f2 [tx-robot] updated from transifex 2013-01-30 00:25:41 +01:00
Lukas Reschke
250c565d2b Merge pull request #1360 from owncloud/display_name 
introduction of display names
 2013-01-29 14:05:54 -08:00
Sam Tuke
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
Arthur Schiwon
f33b72677b LDAP: implement support for ownCloud Display Names 2013-01-29 20:41:48 +01:00
Björn Schießle
0c8bcacdc8 added some additional error handling 2013-01-29 13:36:33 +01:00
Björn Schießle
eafd34684c seperate css no longer needed, use files app css instead 2013-01-29 10:08:41 +01:00
Björn Schießle
d10e137939 icons added; empty trash bin message added 2013-01-29 10:03:04 +01:00
Michael Gapczynski
5143660cd3 Merge pull request #1324 from owncloud/permanent-share-icons 
Permanently display shared status icons
 2013-01-28 20:17:40 -08:00
Jenkins for ownCloud
8c4931a645 [tx-robot] updated from transifex 2013-01-29 00:06:20 +01:00
Robin Appelman
a67f11c8af Sharing: partailly fix searchByMime 2013-01-28 21:25:19 +01:00
Robin Appelman
86e5a9cd73 Files: fix sharing newly uploaded files 2013-01-28 21:09:18 +01:00
Robin Appelman
929b8c3e69 fix files_version hooks 2013-01-28 20:04:10 +01:00
Robin Appelman
7207211f3a change required ownCloud version to 4.91 2013-01-28 19:58:24 +01:00
Jan-Christoph Borchardt
01b3c088a9 fix color change on click 2013-01-28 19:47:51 +01:00
Robin Appelman
74f6f85628 merge master into filesystem 2013-01-28 19:37:58 +01:00
Jan-Christoph Borchardt
3bafa87a12 merge styles 2013-01-28 19:36:21 +01:00
Robin Appelman
c9c919da57 Move streamwrappers to seperate files and put them in a namespace 2013-01-28 15:34:15 +01:00
Björn Schießle
320233ec3d merge conflict fixed 2013-01-28 15:10:00 +01:00
Björn Schießle
f28857377d use hidden input field to disable sharing 2013-01-28 11:28:16 +01:00
Björn Schießle
8067a1394e fix merge conflicts 2013-01-28 11:18:04 +01:00
Jan-Christoph Borchardt
329d965441 merge changes in navigation 2013-01-28 10:52:15 +01:00
Thomas Mueller
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
Thomas Mueller
47ce3c2160 include keyboardshortcuts.js 2013-01-28 09:47:21 +01:00
Thomas Mueller
03a1a20316 fixing href for folders 2013-01-28 09:46:52 +01:00
Thomas Müller
31d83fddc4 Merge pull request #1321 from owncloud/csp-fixes 
Files: CSP fixes
 2013-01-28 00:29:46 -08:00
Michael Gapczynski
10c428830e Add create permission, fixes #780 2013-01-27 23:31:31 -05:00