upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-06-11 01:30:50 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 57
9606 commits 1039 branches 1221 tags 8.3 GiB
Commit graph

4701 commits

Author SHA1 Message Date
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
Jenkins for ownCloud
04146f2059 [tx-robot] updated from transifex 2013-02-11 00:04:49 +01:00
Björn Schießle
046ede8e46 Merge pull request #1558 from schiesbn/trashbin_sizelimit 
Trashbin sizelimit
 2013-02-10 09:02:05 -08:00
Lukas Reschke
980c197fbf Merge pull request #1594 from hkjolhede/master 
Corrected namespace path for files_external SFTP backend
 2013-02-10 06:47:22 -08:00
Lukas Reschke
72a33e01e6 Merge pull request #1585 from owncloud/fix_breadcrumb_resizing 
count divs in actions instead of action div itself (is set to 100%)
 2013-02-10 06:38:19 -08:00
hkjolhede
513bf0b999 Update apps/files_external/lib/config.php 
Corrected minor error
 2013-02-10 15:37:05 +01:00
Lukas Reschke
6f785e211b Merge pull request #1030 from hkjolhede/master 
SFTP support in files_external app
 2013-02-10 05:06:00 -08:00
Henrik Kjölhede
421bacc33a Final changes from icewind1991 2013-02-10 13:11:29 +01:00
Jörn Friedrich Dreyer
bf4a073dca count divs in actions instead of action div itself (is set to 100%) 2013-02-10 12:38:16 +01:00
Henrik Kjölhede
1df8a5a774 Updated phpseclib from git + requested style changes 2013-02-10 12:35:49 +01:00
Jörn Friedrich Dreyer
1c56539c01 Merge pull request #1551 from owncloud/fix_files_multiselect 
Fix filelist shifting up one row on (multi)select
 2013-02-10 02:54:12 -08:00
Robin Appelman
b44c18d164 Don't run external storage tests on default 2013-02-10 11:39:32 +01:00
Björn Schießle
b7b50f8082 remove hascontrols from trash bin file list table 2013-02-10 11:14:03 +01:00
Bernhard Posselt
76a6209c8e Merge pull request #1564 from schiesbn/trash_bin_breadcrumbs 
don't add a extra 'Trash' breadcrumb since we have the home-symbol now
 2013-02-10 01:56:11 -08:00
Jenkins for ownCloud
f7d898d835 [tx-robot] updated from transifex 2013-02-10 00:10:29 +01:00
Henrik Kjölhede
c6622301e5 Security bug 2013-02-09 23:49:21 +01:00
Henrik Kjölhede
bcf98879cb Just a little cleaner in touch 2013-02-09 23:33:01 +01:00
Henrik Kjölhede
9e42a36fd8 Update to touch 2013-02-09 23:29:58 +01:00
Henrik Kjölhede
674955d1b6 Spelling mistake 2013-02-09 20:35:48 +01:00
Henrik Kjölhede
71d3903cfd Added unittest 2013-02-09 20:34:21 +01:00
Henrik Kjölhede
96cfe37587 Update to conform to API changes 2013-02-09 19:08:39 +01:00
Thomas Müller
2a650bcbe9 Merge pull request #1570 from owncloud/refactor_filelist_addFile_addDir 
extract common code
 2013-02-09 09:57:23 -08:00
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
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
Henrik Kjölhede
3b029d551c corrected namespace 2013-02-09 15:57:33 +01:00
Jörn Friedrich Dreyer
676f89bbdb extract common code 2013-02-09 14:42:03 +01: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
Arthur Schiwon
1c94ec71ef LDAP: fix database cleanup in update script 2013-02-09 13:10:53 +01: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
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
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
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
Bart Visscher
ed1dc3e064 Fix files router download links 2013-02-08 22:05:13 +01:00
Thomas Müller
ce8fc20e0b remove unused code 2013-02-08 18:04:27 +01:00