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
35bd7a400d
[tx-robot] updated from transifex
2013-02-07 00:11:04 +01:00
e522872408
Merge pull request #1498 from schiesbn/delete_trash
...
delete files from trash bin permanently
2013-02-06 11:27:32 -08:00
ddd47978e1
Remove left float from actions div class
2013-02-06 13:44:41 -05:00
3879e5d9c5
Merge pull request #1428 from owncloud/content_positioning
...
Fix leftcontent positioning. Ref #1255
2013-02-06 08:13:45 -08:00
e2516a2b65
allow to delete single files from the trash bin permanently
2013-02-06 16:23:22 +01:00
335b6cd060
[tx-robot] updated from transifex
2013-02-06 00:06:28 +01: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
b06ac67e07
Add 'hascontrols' class for content with fixed topbar.
2013-02-04 18:30:49 +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
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
b29b55a332
[tx-robot] updated from transifex
2013-02-02 00:08:15 +01:00
d8f6595c5e
Merge remote-tracking branch 'refs/remotes/upstream/master'
2013-02-01 23:28:20 +01:00
469b1e8dd2
Correct it
2013-02-01 20:29:02 +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
3d5c7ca245
Merge branch 'master' into navigation
2013-01-31 19:28:25 +01: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
5417e44b2a
Files: fix moving files by DnD
2013-01-31 17:56:44 +01:00
209d599ec5
[tx-robot] updated from transifex
2013-01-31 17:05:21 +01:00
ad044eb888
Merge branch 'master' into navigation
2013-01-31 15:35:20 +01:00
54eeb8b8fc
fix merge conflict
2013-01-31 10:55:59 +01:00
00a30e6651
[tx-robot] updated from transifex
2013-01-31 00:31:28 +01: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
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
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
81a398c22c
use $.trim() for IE8
2013-01-30 13:29:24 +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
68266e70f2
[tx-robot] updated from transifex
2013-01-30 00:25: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
86e5a9cd73
Files: fix sharing newly uploaded files
2013-01-28 21:09:18 +01:00
Bart Visscher
Jenkins for ownCloud
Lukas Reschke
Myles McNamara
Thomas Tanghus
Björn Schießle
Michael Gapczynski
Robin Appelman
TheSFReader
Jan-Christoph Borchardt
Stefan Herbrechtsmeier
Jörn Friedrich Dreyer