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

4628 commits

Author SHA1 Message Date
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
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