Sam Tuke
|
9bf1f22d5f
|
Merge pull request #1383 from owncloud/files_encryption-style-fixes
first style fixes - @samtuke: I added some TODO regarding undefined vari...
|
2013-02-09 09:04:47 -08:00 |
|
Thomas Müller
|
7f58e27495
|
cleanup - more to come after
|
2013-02-09 18:01:38 +01:00 |
|
Jörn Friedrich Dreyer
|
bb656ca2fb
|
Merge pull request #1561 from Raydiation/master
Moved the iframe height and width fix from js to css
|
2013-02-09 08:56:12 -08:00 |
|
Thomas Tanghus
|
419eced65c
|
Remove hascontrols - use original positioning.
I couldn't get Chromium and FF to agree, so a working hack
is better than a non-working one ;)
|
2013-02-09 17:54:56 +01:00 |
|
Bernhard Posselt
|
62122148bf
|
Revert "moved iframe height and width fix from js to css"
This reverts commit 842fc85b9a.
|
2013-02-09 17:46:23 +01:00 |
|
Bernhard Posselt
|
43981e62e2
|
Revert "added exe and msi filetypes and icon"
This reverts commit aa1adf42c7.
|
2013-02-09 17:46:07 +01:00 |
|
Bernhard Posselt
|
aa1adf42c7
|
added exe and msi filetypes and icon
|
2013-02-09 17:41:17 +01:00 |
|
Bernhard Posselt
|
842fc85b9a
|
moved iframe height and width fix from js to css
|
2013-02-09 17:41:17 +01:00 |
|
Thomas Müller
|
2b0b6bb63c
|
Merge pull request #1566 from owncloud/fixing-1505-master
fixes zip download for folders containing a dot .....
|
2013-02-09 08:33:44 -08:00 |
|
Thomas Müller
|
d67d9566ce
|
Merge branch 'master' into clean-app-id
|
2013-02-09 17:28:30 +01:00 |
|
icewind1991
|
5a309c11ca
|
Merge pull request #1572 from owncloud/fix_empty_path_handling
fix empty path handling
|
2013-02-09 08:25:25 -08:00 |
|
Thomas Müller
|
e0da721a7d
|
adding ctor to Local and revert call to it within Temporary
|
2013-02-09 17:16:13 +01:00 |
|
Jan-Christoph Borchardt
|
79511f6d93
|
fixed database input group having two slightly thicker dividers
|
2013-02-09 17:14:20 +01:00 |
|
Frank Karlitschek
|
5a0a9564ce
|
alpha 1
|
2013-02-09 17:13:43 +01:00 |
|
Lukas Reschke
|
06bba59249
|
Merge pull request #1618 from owncloud/mapped-storage-unit-testing-linux-master
Mapped storage unit testing linux master
|
2013-02-12 22:58:37 -08:00 |
|
Thomas Mueller
|
92e6409f40
|
fixing mappedlocal storage to work on non-windows as well
this allows us to run unit tests on linux - necessary to enable easy regression testing
|
2013-02-11 13:53:10 +01:00 |
|
Thomas Mueller
|
f223ab796b
|
Merge branch 'master' into mapped-storage-unit-testing-linux-master
|
2013-02-11 12:59:23 +01:00 |
|
Thomas Müller
|
8174e5faf1
|
make MappedLocal available and testable within Linux as well
|
2013-02-09 19:03:03 +01:00 |
|
Jan-Christoph Borchardt
|
8ff20ac683
|
ellipsize infield labels when too long, specifically fix #871 for database labels on installation
|
2013-02-09 17:13:02 +01:00 |
|
Jörn Friedrich Dreyer
|
420b63cbe4
|
fix empty path handling
|
2013-02-09 16:58:55 +01:00 |
|
Bart Visscher
|
60411f7d3d
|
Remove unneeded __destruct call in OC\Files\Storage\Temporary
|
2013-02-09 16:18:30 +01:00 |
|
Henrik Kjölhede
|
3b029d551c
|
corrected namespace
|
2013-02-09 15:57:33 +01:00 |
|
Bart Visscher
|
9dddcae9ca
|
Remove invalid characters from app id to prevent loading of invalid resources
|
2013-02-09 15:10:40 +01:00 |
|
Lukas Reschke
|
18fa8e2753
|
json_encode the appid
|
2013-02-09 15:06:35 +01:00 |
|
Jörn Friedrich Dreyer
|
676f89bbdb
|
extract common code
|
2013-02-09 14:42:03 +01:00 |
|
Henrik Kjölhede
|
d6b4d25d1d
|
Merge branch 'master' of https://github.com/hkjolhede/owncloud_core
|
2013-02-09 14:13:54 +01:00 |
|
Thomas Müller
|
279cbeb001
|
Merge pull request #1481 from owncloud/fixing-1354-master
basic WebDAV test in place now
|
2013-02-09 05:13:33 -08:00 |
|
Henrik Kjölhede
|
81a281a140
|
Modified to new class structure
|
2013-02-09 14:12:17 +01:00 |
|
Henrik Kjölhede
|
2b4823d62d
|
Deleted phpseclib/tests
|
2013-02-09 14:07:18 +01:00 |
|
Henrik Kjölhede
|
41fa65e7be
|
Merge branch 'master' of https://github.com/owncloud/core
Conflicts:
apps/files_external/appinfo/app.php
|
2013-02-09 14:05:33 +01:00 |
|
Thomas Tanghus
|
60344bf1dd
|
Another attempt on the filelist heading.
|
2013-02-09 14:00:26 +01:00 |
|
Thomas Müller
|
ddc7af9a53
|
know your libraries ;-)
strrpos fails in cases the file in the path has no dot but the parent folder
|
2013-02-09 13:51:44 +01:00 |
|
icewind1991
|
ec829bd345
|
Merge pull request #1512 from owncloud/mapped-filename-storage
initial version of a local storage implementation which will use unique ...
|
2013-02-09 04:45:25 -08:00 |
|
Jörn Friedrich Dreyer
|
0c73cae77b
|
Merge pull request #1565 from owncloud/fix_replacing
remove code properly to make @DeepDiver1975 happy ;)
|
2013-02-09 03:58:06 -08:00 |
|
Sam Tuke
|
b95bc663af
|
Merge branch 'master' into files_encryption-style-fixes
Conflicts:
apps/files_encryption/lib/crypt.php
apps/files_encryption/lib/util.php
|
2013-02-09 11:52:11 +00:00 |
|
Björn Schießle
|
d5dc8ae726
|
initialize breadcrumbs array
|
2013-02-09 12:41:47 +01:00 |
|
Georg Ehrke
|
2137bbe330
|
remove code properly
|
2013-02-09 12:38:40 +01:00 |
|
Björn Schießle
|
7507b1ddd3
|
don't add a extra 'Trash' breadcrumb since we have the home-symbol now
|
2013-02-09 12:32:08 +01:00 |
|
Bernhard Posselt
|
ab4ae2b952
|
Merge pull request #1560 from owncloud/fix_replacing
remove (comment out) old code to fix replacing of files
|
2013-02-09 03:28:40 -08:00 |
|
Thomas Müller
|
800609aaeb
|
Merge pull request #1545 from owncloud/fix-oc_webroot
fixup oc_webroot correctly before and after setup
|
2013-02-09 03:27:22 -08:00 |
|
Thomas Müller
|
c91334c54a
|
Merge pull request #1537 from owncloud/fix_sharing_dropdown_event_handlers
attach handlers to document instead of filelist
|
2013-02-09 03:23:19 -08:00 |
|
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 |
|
Bernhard Posselt
|
f8335c4815
|
moved iframe height and width fix from js to css
|
2013-02-09 11:34:25 +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 |
|