Commit Graph

9740 Commits

Author SHA1 Message Date
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
Frank Karlitschek 4a130d106c I'm an evil bastard and I commit this 3 letter text fix without a pull request. 2013-02-09 10:09:37 +01:00
Frank Karlitschek 764409117a Merge pull request #1493 from owncloud/fix_ldap_stored_homedir
Fix ldap stored homedir
2013-02-11 02:20:03 -08:00
Arthur Schiwon 1c94ec71ef LDAP: fix database cleanup in update script 2013-02-09 13:10:53 +01:00
Frank Karlitschek c14f0b5637 add in new window 2013-02-09 09:30:59 +01:00
Frank Karlitschek 9bd45b26a5 add the buttons for the clients to the personal page.
Useful and prettier
2013-02-09 09:13:11 +01:00
raghunayyar e8d17e4e8e Personal Page Password Toggle Also Loads Well. 2013-02-09 11:40:07 +05:30
Jenkins for ownCloud e5c05e9674 [tx-robot] updated from transifex 2013-02-09 00:14:08 +01:00
Thomas Tanghus 680af2e6ca Fix filelist shifting up one row on (multi)select 2013-02-08 22:30:27 +01:00
Thomas Müller f42ac97045 Merge pull request #1547 from owncloud/navigation-color
brighter grey for the navigation bar
2013-02-08 13:30:25 -08:00
Thomas Müller 84657cbdab Merge pull request #1548 from owncloud/installation-improvements
Installation improvements
2013-02-08 13:27:15 -08:00
Bart Visscher ed1dc3e064 Fix files router download links 2013-02-08 22:05:13 +01:00
Jan-Christoph Borchardt bebdd113f5 use proper HTML for other security warning too 2013-02-08 19:59:42 +01:00
Jan-Christoph Borchardt c73f525050 brighter grey for the navigation bar, hopefully solves the weird similarity to the header 2013-02-08 19:33:22 +01:00
Thomas Müller 12bdc6ddb6 Merge pull request #1439 from owncloud/fix-archive-tar-on-win32-master
quick fixing this require_once.
2013-02-08 10:18:49 -08:00
Bart Visscher fba9739448 Always load the apps before trying to match a route 2013-02-08 19:06:59 +01:00
Bart Visscher 340d6fce11 Better way of getting the navigation entries for an app 2013-02-08 18:53:43 +01:00
Bart Visscher d5f98a82aa fix-oc_webroot 2013-02-08 18:44:52 +01:00
Thomas Müller ce8fc20e0b remove unused code 2013-02-08 18:04:27 +01:00
Thomas Müller 232a98524c some systems use en_US.UTF8 instead of en_US.UTF-8 2013-02-08 17:49:54 +01:00
Thomas Müller 05b46f7828 on creation only test for existing users if the backend supports user creation
this solves the issue where no users can be created any more if backends are active which always return true on userExists() like WebDAV Auth
2013-02-08 17:16:18 +01:00
Thomas Müller 1d3c1328fa remove undefined function FileList.finishDelete 2013-02-08 15:51:28 +01:00
Thomas Müller ea42014ba4 in case curl is not present we cannot test 2013-02-08 15:23:26 +01:00
Thomas Mueller 4c3d4f7d36 quick fixing this require_once.
On windows the wrong file will be required: lib/archive/tar.php and not Archive/Tar.php.

Best would be to rename the lib/archive/tar.php or put it into a different folder
2013-02-08 15:23:07 +01:00
Bart Visscher 96042f1e5b Merge pull request #1539 from owncloud/fixing-1508-master
missing comma in sql statement
2013-02-08 05:25:00 -08:00
Thomas Müller 1158447499 missing comma in sql statement 2013-02-08 13:49:26 +01:00
Jan-Christoph Borchardt a26e66b232 improve and shorten security warning, add link to docs, fix #1342 2013-02-08 13:38:50 +01:00
raghunayyar eea4864c70 Removed whitespace from installation.php 2013-02-08 17:35:41 +05:30
Thomas Müller 40f6e1eba0 Merge pull request #1534 from owncloud/files_l10n
Add translation support back to move/rename
2013-02-08 03:58:17 -08:00