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

1644 commits

Author SHA1 Message Date
Thomas Müller
f9279ac77a killing some more calls to OC_App::loadApps(); - because we load all apps in handleRequest() 2014-03-25 17:42:41 +01:00
Thomas Müller
6ff96b34ad Merge branch 'master' into load-apps-proper-master 
Conflicts:
	apps/files/ajax/rawlist.php
	cron.php
	ocs/v1.php
 2014-03-21 14:05:08 +01:00
Morris Jobke
5747e0e3f9 remove executable flag for file-upload.js 2014-03-20 13:26:21 +01:00
Morris Jobke
95a13e2690 Merge pull request #7814 from oskholl/master 
Fix: 'Upload button tooltip doesn't disappear'
 2014-03-20 13:25:21 +01:00
Thomas Müller
8a81df0f2c Merge pull request #7651 from owncloud/close-session-faster-master 
Close session faster
 2014-03-20 11:07:21 +01:00
Jenkins for ownCloud
3aa8647634 [tx-robot] updated from transifex 2014-03-20 01:56:42 -04:00
Oskar Hollmann
90839b784f Comment moved to prevent 'Line is too long' warning. 2014-03-19 23:05:03 +01:00
Oskar Hollmann
fa28c089fa Fix: 'Upload button tooltip doesn't disappear' 
Fixes issue #7461. Tipsy tooltip must be hidden when the upload starts. Otherwise it covers the progress bar and stays in DOM.
 2014-03-19 22:09:09 +01:00
Robin Appelman
214357ca68 Improve sorting performance of large lists of files 2014-03-19 13:53:59 +01:00
Thomas Müller
c216c4777b Merge branch 'master' into close-session-faster-master 
Conflicts:
	apps/files/ajax/upgrade.php
 2014-03-19 11:44:21 +01:00
Thomas Müller
33e96597d1 Merge pull request #7790 from owncloud/fix/7788 
drop file cache migration OC5 -> OC6
 2014-03-19 11:29:50 +01:00
Jenkins for ownCloud
7b1d52f5b9 [tx-robot] updated from transifex 2014-03-19 01:55:39 -04:00
Thomas Müller
6b9ae27b90 drop file cache migration OC5 -> OC6 2014-03-18 17:14:38 +01:00
Thomas Müller
153eadd753 Merge branch 'master' into close-session-faster-master 2014-03-17 21:57:48 +01:00
Morris Jobke
7ffaf0d70a Merge pull request #7734 from owncloud/icon-class-remove 
remove unneeded icon class
 2014-03-16 10:24:57 +01:00
Jenkins for ownCloud
c89aa6d5fe [tx-robot] updated from transifex 2014-03-16 03:13:21 -04:00
Jenkins for ownCloud
b2e929d580 [tx-robot] updated from transifex 2014-03-15 02:14:22 -04:00
Jan-Christoph Borchardt
55c630ea7d remove unneeded icon class 2014-03-14 14:47:40 +01:00
Jenkins for ownCloud
4b802aa7cb [tx-robot] updated from transifex 2014-03-13 17:12:37 -04:00
Vincent Petry
9fa9c791eb Merge pull request #7671 from fpiraneo/patch-1 
Update index.php
 2014-03-13 13:04:30 +01:00
Jenkins for ownCloud
1295e54173 [tx-robot] updated from transifex 2014-03-13 01:55:50 -04:00
Lukas Reschke
b506de6f08 Merge pull request #7681 from owncloud/remove-Sabre_DAV_Browser_Plugin-master 
remove Sabre_DAV_Browser_Plugin
 2014-03-12 22:28:01 +01:00
Jenkins for ownCloud
8320b8eb7a [tx-robot] updated from transifex 2014-03-12 01:57:17 -04:00
Thomas Müller
ae13ff112f remove Sabre_DAV_Browser_Plugin 2014-03-12 00:10:16 +01:00
Francesco Piraneo G.
3f4a0778c8 Update index.php 
On line #69 added id="selectedActionsList" to allow an easy adding of new actions customs apps wants to perform on selected files;
 2014-03-11 14:29:26 +01:00
Jenkins for ownCloud
b0ec38e202 [tx-robot] updated from transifex 2014-03-11 01:59:39 -04:00
Thomas Müller
58c216d0e8 close the session on all file operations 2014-03-10 14:39:27 +01:00
Vincent Petry
0ffd32a1ae Merge pull request #7629 from owncloud/files-allfileswarningtypo 
Fixed log warning when deleting a single file
 2014-03-10 11:40:28 +01:00
IchEben
e7d5715114 only initialise upload dropZone if public upload is allowed 2014-03-07 17:45:24 +01:00
Vincent Petry
5671aac5ca Fixed log warning when deleting a single file 2014-03-07 15:03:35 +01:00
Vincent Petry
536c33895f Merge pull request #7592 from owncloud/fixstoragefreespace 
Fixed upload issue when free space is not known (ex: FTP)
 2014-03-06 17:22:40 +01:00
Vincent Petry
0dcac65aa1 Fixed upload issue when free space is not known 2014-03-06 13:53:55 +01:00
Vincent Petry
07f78c8248 Added unit tests for "add()" method for file upload 
- Added OC.Upload.init() to make the code testable
- Added unit tests for the add() method of the uploader with some error
  cases
 2014-03-06 13:53:34 +01:00
Thomas Müller
32b29c9d73 Merge branch 'master' into fix-7307 
Conflicts:
	core/js/router.js
	settings/js/admin.js
 2014-03-06 00:15:08 +01:00
Vincent Petry
1785c0c9b9 Merge pull request #7575 from owncloud/issue/7571 
Do not set #dir when on public.php
 2014-03-05 19:57:25 +01:00
Joas Schilling
1ab10cb4f7 Do not set #dir when on public.php 
Fix #7571
 2014-03-05 18:46:55 +01:00
Björn Schießle
9111af0478 Merge pull request #7531 from owncloud/dont_create_shared_folder 
don't allow to create a file or folder named 'Shared' in the root folder
 2014-03-05 18:13:31 +01:00
Bjoern Schiessle
2e73c957e5 don't allow to create a file or folder named 'Shared' in the root folder, also exclude all combinations of lower and upper case letters 2014-03-05 13:16:25 +01:00
Thomas Müller
9f087a2070 fixing download url in files app 2014-03-02 23:41:14 +01:00
Thomas Müller
1291303c5a Replace OC.Router.generate() with OC.generateUrl() 2014-03-02 22:30:24 +01:00
Thomas Müller
15d1df055b Merge branch 'master' into display-share-owner-master 
Conflicts:
	apps/files_sharing/lib/cache.php
 2014-02-28 14:54:10 +01:00
Robin Appelman
7c92e2e3ad Update rawlist to work with new fileinfo object 2014-02-27 14:04:19 +01:00
Jan-Christoph Borchardt
2b423e5a44 coding style fixes, cut long lines, comments not on same lines, curly braces 2014-02-26 10:16:54 +01:00
Morris Jobke
5fb1374b0f Merge pull request #7285 from owncloud/mimeicons-svg 
Show svg mime icons when no preview is available
 2014-02-24 14:12:10 +01:00
Morris Jobke
8d17f6d675 Merge pull request #7320 from owncloud/GuillaumeAmat-patch-1 
Update page title when navigating through directories (local)
 2014-02-24 13:34:07 +01:00
Robin Appelman
7c4f81bd78 rename url parameter 2014-02-24 13:24:10 +01:00
Jan-Christoph Borchardt
6f56fd99a6 fix too much distance between text and icon 2014-02-21 14:10:13 +01:00
Jan-Christoph Borchardt
877cfb963a use SVG icons from icons.css for New file menu 2014-02-21 14:07:25 +01:00
Robin Appelman
4715fb12c8 Add url parameter to control whether previews should return 404 when the mimetype is unsupported 2014-02-21 14:06:15 +01:00
Jan-Christoph Borchardt
b22d82f941 code style: else on same line 2014-02-21 09:42:19 +01:00