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

1400 commits

Author SHA1 Message Date
Jenkins for ownCloud
6b1843d91b [tx-robot] updated from transifex 2013-09-18 11:50:02 -04:00
Jörn Friedrich Dreyer
7bd5e89f8c simplify conflict template handling, fix reopen after ESC 2013-09-18 17:22:29 +02:00
Jörn Friedrich Dreyer
12ff268e60 move upload dialog css to separate file 2013-09-18 17:20:14 +02:00
Jörn Friedrich Dreyer
715846626e hide excessive logging with a trace flag 2013-09-18 14:39:39 +02:00
Jörn Friedrich Dreyer
17337b22af Merge branch 'master' into fix_3728_with_file_exists_dialog 
Conflicts:
	apps/files/js/file-upload.js
 2013-09-18 14:19:58 +02:00
Thomas Müller
20a43d1982 remove file action elements before recreating them 2013-09-18 13:09:47 +02:00
Thomas Müller
6ed2df11fc store the permissions retrieved via ajax within the dom element 2013-09-18 13:09:04 +02:00
Thomas Müller
370ed814f7 add permissions of the file to the json response 2013-09-18 11:22:29 +02:00
Jörn Friedrich Dreyer
86c4c83b86 use exists 2013-09-17 19:11:18 +02:00
Jörn Friedrich Dreyer
b59ce403d8 Merge branch 'master' into fix_3728_with_file_exists_dialog 
Conflicts:
	apps/files/css/files.css
	apps/files/js/file-upload.js
	apps/files/js/filelist.js
	apps/files/js/files.js
	apps/files_sharing/js/public.js
	core/js/jquery.ocdialog.js
	core/js/oc-dialogs.js
 2013-09-17 19:10:46 +02:00
Jörn Friedrich Dreyer
b40925ae17 initial scrollto implementation: 
use places/folder icon,
move link construction to JS,
only show icon on hover,
use 'searchresult' as css class name,
add filter/unfilter methods,
highlight searched files in current filelist
only filter when correct FileList is present
 2013-09-17 18:40:51 +02:00
Thomas Müller
9b420e8660 use \OC::$server->getPreviewManager() instead of \OCP\Preview 2013-09-17 13:33:47 +02:00
Jörn Friedrich Dreyer
d41e722629 refactor upload progress 2013-09-16 14:14:46 +02:00
Bjoern Schiessle
82cbbb8ab8 Merge branch 'master' into encryption_improved_error_messages_4617 
Conflicts:
	apps/files/index.php
 2013-09-16 10:42:37 +02:00
Bjoern Schiessle
534d93d2d3 Merge branch 'master' into sharing_mail_notification_master 
Conflicts:
	apps/files/index.php
 2013-09-16 10:40:06 +02:00
Thomas Müller
46f59b165e Merge pull request #4838 from owncloud/refactor_upload_js 
refactor upload js & html to always use only js to fill form data
 2013-09-16 01:06:24 -07:00
Thomas Müller
db7e1dd877 Merge pull request #4853 from owncloud/external-shared_mimetype-icons 
Use external and shared icons in OC.Dialogs.filepicker()
 2013-09-15 02:42:14 -07:00
Thomas Müller
a0c2c2473a Merge pull request #4501 from owncloud/ajaxfilelist 
Ajax calls for "files" and "files_trashbin" apps
 2013-09-14 12:51:16 -07:00
kondou
c117e719da Use external and shared icons in OC.Dialogs.filepicker() 2013-09-14 14:35:23 +02:00
Jenkins for ownCloud
556bd1ef23 [tx-robot] updated from transifex 2013-09-13 21:49:24 -04:00
Vincent Petry
30a2f2f352 Use hash part of URL for IE8 in files app 
Before this fix, the URL wasn't updated in IE8 when navigating into
folders.

This fix makes use of the hash part of URLs to make this work in IE8,
since IE8 doesn't support the history API nor changing the URL without
redirecting.

From now, both the regular query URL "?dir=somedir" and "#?dir=somedir"
will work in both IE8 and non-IE8 browsers.

In IE8, query based URLs are automatically converted to hash URLs upon
page load. The conversion is done on the server side by redirecting the
user to the updated URL.

When loading a page directly using a hash URL in the form
"#?dir=somedir" in IE8, the server doesn't get the hash, so it will not
return any results in that case and rely on ajax to load the first page.
 2013-09-13 20:48:35 +02:00
Vincent Petry
4d38441e72 Fixed loading mask/spinner to stay fixed on scroll 2013-09-13 19:59:15 +02:00
Vincent Petry
611075bf20 Fixed JS error in trashbin app 2013-09-13 19:59:15 +02:00
Vincent Petry
3cf0820d35 Changed breadcrumb event handling to not use delegate 
Using delegate might break apps that embed themselves in the files
container. When an app embeds itself and the user clicks a breadcrumb,
it will simply reload the whole browser page.
 2013-09-13 19:59:15 +02:00
Vincent Petry
364e7991a4 Fixed ajax support to also update the current dir permissions 2013-09-13 19:59:15 +02:00
Thomas Müller
4ab5e58e02 update file summary on ajax file list load 2013-09-13 19:59:15 +02:00
Thomas Müller
4e751cbb47 fixing breadcrumbs on ajax loading of files 2013-09-13 19:59:15 +02:00
Thomas Müller
ef955bae56 calling replaceSVG() to display breadcrumb images correctly on IE8 2013-09-13 19:59:15 +02:00
Thomas Müller
e6f21927d6 fixing no-repeat for IE8 2013-09-13 19:59:15 +02:00
Vincent Petry
1304b511e9 Ajax calls for "files" and "files_trashbin" apps 
Frontend:
- The files app list now uses ajax calls to refresh the list.
- Added support the browser back button (history API).
- Added mask + spinner while loading file list

Backend:
- Added utility function in core JS for parsing query strings.
- Moved file list + breadcrumb template data code to helper
  functions
- Fixed some file paths in trashbin app to be similar to the files app
 2013-09-13 19:59:14 +02:00
Bart Visscher
666bbbe060 Use appinfo/register_command.php to add commands to the console command 2013-09-13 18:10:04 +02:00
Jörn Friedrich Dreyer
7854cf04ee refactor upload js & html to always use only js to fill form data 2013-09-13 17:07:52 +02:00
Jan-Christoph Borchardt
c7ca86799b Merge pull request #4816 from owncloud/fixing-723-master 
Fixing 723 master
 2013-09-12 07:48:00 -07:00
Thomas Tanghus
b7205d97d7 Merge pull request #4735 from owncloud/multiple_mimetypes_rawlist 
Make it possible to pass rawlist.php an JSON array, to filter by more than one mimetype
 2013-09-11 17:18:04 -07:00
Thomas Müller
9d661eab23 adding calls to \OCA\files\lib\Helper::determineIcon($i) in files, trashbin and sharing 2013-09-12 00:40:35 +02:00
Thomas Müller
5af111b0de added determineIcon to \OCA\files\lib\Helper 2013-09-12 00:39:52 +02:00
Thomas Müller
3066b44928 remove unused $relativePath 2013-09-12 00:39:03 +02:00
kondou
4d62f747fa Clean up rawlist.php and fix non-array request 2013-09-12 00:21:01 +02:00
Thomas Müller
b49f43c3ae move icon generation logic out of the template 2013-09-12 00:13:19 +02:00
Jenkins for ownCloud
68015b2761 [tx-robot] updated from transifex 2013-09-11 06:50:06 -04:00
kondou
83d3df4111 Split some lines, use ===, avoid unnecessary operation 2013-09-11 12:12:40 +02:00
Jörn Friedrich Dreyer
2c9b3d32ef unify .original div to fix css in firefox, clear:left to fix filename wrapping in chrome, shrink width of columns and get rid of ie8 hack 2013-09-10 17:34:28 +02:00
Jörn Friedrich Dreyer
cec932f292 Merge branch 'master' into fix_3728_with_file_exists_dialog 
Conflicts:
	apps/files/js/file-upload.js
 2013-09-10 16:54:48 +02:00
Jenkins for ownCloud
72689f643b [tx-robot] updated from transifex 2013-09-10 10:42:16 -04:00
Thomas Müller
956a2335ad Merge pull request #4647 from owncloud/fix_4619 
Workaround for IE 9 & 10 for clicking filelist after adding new item
 2013-09-10 01:22:25 -07:00
Thomas Tanghus
2cdde7a56a Merge pull request #4726 from owncloud/files-ie8-missingfilecheckboxes 
Fixed missing checkboxes in IE8
 2013-09-09 18:25:37 -07:00
Jenkins for ownCloud
92f6c3bb10 [tx-robot] updated from transifex 2013-09-08 21:37:53 -04:00
Vincent Petry
5f67ccba00 Fixed missing checkboxes in IE8 
IE8 is not happy with the :checked CSS3 selector which causes it to
ignore the whole rule.

Replace it with a more compatible selector.
 2013-09-08 22:21:07 +02:00
Jörn Friedrich Dreyer
03c90e968f whitespace and indentation fixes 2013-09-08 17:29:43 +02:00
Jörn Friedrich Dreyer
577e3f22b2 remove unused hooks 2013-09-08 10:43:52 +02:00
Jörn Friedrich Dreyer
8828fafd36 cleanup comments 2013-09-08 10:41:20 +02:00
Jenkins for ownCloud
e895cf9188 [tx-robot] updated from transifex 2013-09-07 04:46:57 -04:00
Jörn Friedrich Dreyer
ce03501646 fine ie8 compatability 2013-09-06 23:44:40 +02:00
Jörn Friedrich Dreyer
673e0c01a7 fix page leaving checks 2013-09-06 22:40:10 +02:00
Jörn Friedrich Dreyer
796e137e82 fix upload to folder 2013-09-06 18:51:27 +02:00
Jörn Friedrich Dreyer
e2c0fe8296 fix upload of multiple files 2013-09-06 18:16:40 +02:00
Jörn Friedrich Dreyer
238d92b11c refactor replace and autorename resolution in upload.php 2013-09-06 17:53:58 +02:00
Jörn Friedrich Dreyer
4d04dd9c4c Merge branch 'master' into fix_3728_with_file_exists_dialog 2013-09-06 13:42:05 +02:00
Bjoern Schiessle
fb462e83cc no longer enforce log out, but provide useful errors/warnings instead 2013-09-06 12:27:40 +02:00
Pete McFarlane
83afba5070 prefix #filestable to tbody tr 2013-09-06 10:01:11 +01:00
kondou
226c205631 Use usort() instead of uasort() to not maintain keys 2013-09-06 06:45:16 +02:00
kondou
85e41d9500 Sort files by name, not by mimetype 2013-09-05 23:17:53 +02:00
kondou
f84fe479a5 Only use mimetype_list and clean up a bit 2013-09-05 18:40:55 +02:00
Jörn Friedrich Dreyer
8a7e26b268 cleanup dead code 2013-09-05 17:46:19 +02:00
kondou
992b59f70b Make it possible to pass rawlist.php an JSON array, to filter by more than one mimetype 2013-09-05 16:54:12 +02:00
Bjoern Schiessle
f8563ec583 Merge branch 'master' into sharing_mail_notification_master 
increased version number to trigger db update

Conflicts:
	lib/util.php
 2013-09-05 13:39:45 +02:00
Jenkins for ownCloud
0527fb05ad [tx-robot] updated from transifex 2013-09-05 07:37:32 -04:00
Jörn Friedrich Dreyer
03ddf8da80 Merge branch 'master' into fix_3728_with_file_exists_dialog 
Conflicts:
	apps/files/js/file-upload.js
 2013-09-05 10:31:43 +02:00
Jörn Friedrich Dreyer
bbf8acb383 separate uploading code from progress code, add progress capability detection 2013-09-05 10:19:54 +02:00
Thomas Müller
3b25babe35 Merge pull request #4683 from owncloud/publicuploadjserror 
Fixed public upload error that prevents upload
 2013-09-04 11:50:38 -07:00
Jörn Friedrich Dreyer
49fd7e9f1e refactor dialog creation 2013-09-04 16:42:18 +02:00
Jörn Friedrich Dreyer
4af5a8c483 Merge branch 'master' into fix_3728_with_file_exists_dialog 
Conflicts:
	apps/files/ajax/upload.php
	apps/files/js/file-upload.js
	apps/files/js/filelist.js
	apps/files/js/files.js
	apps/files/templates/part.list.php
 2013-09-04 14:11:40 +02:00
Jörn Friedrich Dreyer
85758f3d7d Merge pull request #4473 from owncloud/texteditor_polishing 
Texteditor polishing
 2013-09-03 05:38:59 -07:00
Jenkins for ownCloud
fe0b8ac2c0 [tx-robot] updated from transifex 2013-09-03 07:46:55 -04:00
Jörn Friedrich Dreyer
449fe8c75e Revert "remove editor div in filelist", add "is deprecated" comment 
This reverts commit 64d09452f5.
 2013-09-03 13:20:20 +02:00
Bart Visscher
cafc8cb223 Change Files Scan command to use OC\User\Manager 2013-09-02 18:18:12 +02:00
Bjoern Schiessle
b918c06be6 Merge branch 'master' into sharing_mail_notification_master 
Conflicts:
	lib/util.php
 2013-09-02 14:41:46 +02:00
Bernhard Posselt
f038cb9aea Merge pull request #4671 from owncloud/emptycontent 
centers text message in empty-content page (files and files_trashbin apps)
 2013-09-01 17:47:55 -07:00
Jenkins for ownCloud
e68b5f8b0d [tx-robot] updated from transifex 2013-09-01 13:30:40 -04:00
Bart Visscher
0aba549e7f Use more object oriented way for console commands 2013-09-01 16:40:50 +02:00
Vincent Petry
307b673b79 Fixed public upload error that prevents upload 
Public upload is broken because the file_upload_param variable expected
to exist by public.js didn't.

This fix sets the variable scope to the window to make it accessible
outside.
 2013-09-01 16:14:46 +02:00
Alessandro Cosentino
b10a646bc8 rename emptyfolder to emptycontent 2013-08-31 11:25:11 -04:00
Alessandro Cosentino
4b32d84314 text centered horizontally and vertically in emptycontent div 2013-08-31 11:12:07 -04:00
Georg Ehrke
668c4c2652 fix issue with filetable background 2013-08-30 22:05:44 +02:00
Georg Ehrke
8ef40277b2 Merge master into oc_preview 2013-08-30 18:11:18 +02:00
Georg Ehrke
40cee5639e use gerMimeTypeDetector detectPath instead of getMimeType 2013-08-30 18:07:49 +02:00
Jenkins for ownCloud
dbc78b1a58 [tx-robot] updated from transifex 2013-08-30 09:38:20 -04:00
Bjoern Schiessle
77adaee645 enable user to inform recipients about a shared file by mail 2013-08-30 13:53:49 +02:00
petemcfarlane
ab1f78eac3 prefix 'tbody tr' to separate app/core css errors 
For specific details see:
https://github.com/owncloud/core/pull/4536/files#r6082305
 2013-08-30 10:48:04 +01:00
ringmaster
f4ec5182bd Workaround for IE 9 & 10 for clicking filelist after adding new item 2013-08-29 12:06:07 -04:00
Georg Ehrke
b7758d0f8d Merge master into oc_preview 2013-08-29 10:50:55 +02:00
kondou
6bd0f3cba7 Reimplement filesummary in JS 
Fix #993
 2013-08-28 15:10:17 +02:00
Thomas Müller
3eed060ec9 backport of #4357 to master 2013-08-27 23:53:04 +02:00
Morris Jobke
34a32d862c Merge pull request #4572 from NCTU-NBA/pr-checkbox-displacement 
Fix "select all" checkbox displacement when checked, fix #4571
 2013-08-27 14:21:34 -07:00
Jenkins for ownCloud
d5062b9e0e [tx-robot] updated from transifex 2013-08-27 11:23:18 -04:00
Morris Jobke
ea446544ef Merge pull request #4586 from owncloud/fixing-3431-master 
kill zh_CN.GB2312
 2013-08-27 02:00:48 -07:00
Thomas Müller
c9123263ab kill zh_CN.GB2312 2013-08-27 01:27:05 +02:00
Thomas Müller
8cf9336bcb storage information is path specific 2013-08-27 00:59:58 +02:00
Georg Ehrke
b16a018da9 use random string as id for checkbox 2013-08-26 16:33:51 +02:00
Georg Ehrke
d538a566ac fix background size in filelist.js 2013-08-26 14:36:18 +02:00
Georg Ehrke
6f0c1e8d45 Merge master into oc_preview 2013-08-26 12:24:33 +02:00
Georg Ehrke
46cbd7cd3b fix preview issue when uploading a file with parentheses 2013-08-26 12:16:51 +02:00
Morris Jobke
a5873a96fa Merge pull request #4542 from owncloud/fixing-4504-master 
remove duplicate code
 2013-08-26 02:19:32 -07:00
Pellaeon Lin
cd41de839f Fix "select all" checkbox displacement when checked 2013-08-26 10:57:14 +08:00
Jenkins for ownCloud
d587146a5a [tx-robot] updated from transifex 2013-08-25 19:21:52 -04:00
Jenkins for ownCloud
596ac40b7f [tx-robot] updated from transifex 2013-08-23 20:17:08 -04:00
Georg Ehrke
13e34649bf move path generation for previews to dedicated function 2013-08-23 23:19:21 +02:00
Georg Ehrke
6ffa2a28d0 Merge branch 'master' into oc_preview 2013-08-23 23:10:37 +02:00
Jenkins for ownCloud
02b2b5a808 [tx-robot] updated from transifex 2013-08-22 10:37:23 -04:00
Jörn Friedrich Dreyer
7c9d999243 reduced complexity, added listing conflicts to dialog 2013-08-22 14:29:00 +02:00
Thomas Müller
101cfa2359 remove duplicate code 2013-08-22 00:09:43 +02:00
Georg Ehrke
224b80f906 move isMimeSupported out of template files 2013-08-21 15:55:59 +02:00
Jörn Friedrich Dreyer
bf04daff82 architecture too complex 2013-08-21 14:58:28 +02:00
Jenkins for ownCloud
a89199cc7b [tx-robot] updated from transifex 2013-08-21 08:14:27 -04:00
Christopher
90da518e3e Merge pull request #4262 from owncloud/fix_jslint_kondou 
Fix some JSLint warnings
 2013-08-20 12:45:10 -07:00
Jenkins for ownCloud
e9644c2f52 [tx-robot] updated from transifex 2013-08-19 15:14:38 -04:00
Georg Ehrke
48f0c54261 style fixes for preview lib 2013-08-19 12:16:55 +02:00
Georg Ehrke
f2702ff1ca Merge master into oc_preview 2013-08-19 11:24:17 +02:00
Thomas Müller
0890a915b3 adding file templates for ods, odt and odp 2013-08-18 21:11:11 +02:00
Björn Schießle
9be836814c Merge pull request #4239 from owncloud/decrypt_files_again 
Enable user to decrypt files again after encryption app was disabled
 2013-08-18 09:51:48 -07:00
Christopher
c620c5840a Merge pull request #4498 from owncloud/uploadprogress-near-uploadbutton 
move upload progress bar near upload button, more contextual
 2013-08-18 09:30:47 -07:00
Kondou
c7af26ec84 Merge pull request #4497 from owncloud/newlines_at_eof_kondou 
Add newlines at the end of files
 2013-08-18 07:16:15 -07:00
Bart Visscher
eb97818519 Merge pull request #4483 from owncloud/compare-true-false 
Compare result are already true/false
 2013-08-18 03:26:35 -07:00
Jan-Christoph Borchardt
dce7cdaaec remove unneeded extra ID selectors 2013-08-18 11:27:51 +02:00
Jan-Christoph Borchardt
bf4efd5290 move upload progress bar near upload button, more contextual 2013-08-18 11:18:16 +02:00
kondou
9e8a6b704d Add _many_ newlines at the end of files 2013-08-18 11:06:59 +02:00
kondou
edd92e4c09 Merge branch 'master' into fix_jslint_kondou 
Conflicts:
	apps/files/js/file-upload.js
 2013-08-18 00:38:52 +02:00
Andreas Fischer
d38929fb10 Fix spacing of all touched lines. 2013-08-17 23:38:26 +02:00
Thomas Müller
12f4494de0 Merge pull request #4339 from owncloud/mimetype-defaults 
Add the option to provide templates for newly created files
 2013-08-17 08:42:49 -07:00
Bjoern Schiessle
cabe92ef12 Merge branch 'master' into decrypt_files_again 
Conflicts:
	apps/files_encryption/tests/keymanager.php
 2013-08-17 13:15:22 +02:00
Bart Visscher
29b6dd53a0 Compare result are already true/false 2013-08-17 12:58:10 +02:00
Thomas Müller
de52157e76 remove ru_RU - fixes #3135 2013-08-17 11:43:37 +02:00
Jan-Christoph Borchardt
7e4dcd268f vertically center rename input box 2013-08-17 10:46:03 +02:00
Georg Ehrke
164502477d use jQuery.get instead of jQuery.ajax 2013-08-16 17:25:38 +02:00
Jörn Friedrich Dreyer
64d09452f5 remove editor div in filelist 2013-08-16 17:19:48 +02:00
Jörn Friedrich Dreyer
f94e603698 progress fixes 2013-08-16 11:40:55 +02:00
Jenkins for ownCloud
6bd0ba79df [tx-robot] updated from transifex 2013-08-16 01:32:30 -04:00
Jan-Christoph Borchardt
d2767faf61 Merge pull request #4113 from owncloud/delete-fix 
Delete icon fix
 2013-08-15 15:31:42 -07:00
Thomas Müller
57f7ff2dbd communicate size of newly created file back and update UI 2013-08-16 00:31:27 +02:00
Thomas Müller
7279a07ca2 Merge branch 'master' into mimetype-defaults 
Conflicts:
	apps/files/ajax/newfile.php
 2013-08-16 00:13:10 +02:00
Thomas Müller
bd1895bdf8 Merge pull request #4354 from owncloud/fix_2711_shared_icon_disappears_on_firefox 
fix #2711 using a custom event, also use css selectors over filterAttr
 2013-08-15 14:08:01 -07:00
Jan-Christoph Borchardt
e7c0693570 checkstyle double quotes in HTML 2013-08-15 19:40:39 +02:00
Thomas Müller
ada13a4d40 fixing all broken translation files 2013-08-15 15:41:45 +02:00
Bjoern Schiessle
7adfc27caf remove whitespaces and some leftover code from testing 2013-08-15 13:13:16 +02:00
Jan-Christoph Borchardt
2fd5178a00 adjust New file dialog for new styles 2013-08-15 12:50:26 +02:00
Jenkins for ownCloud
680ac48856 [tx-robot] updated from transifex 2013-08-15 04:53:54 -04:00
Jan-Christoph Borchardt
b2f666c98f fix file summary position 2013-08-14 21:26:06 +02:00
Georg Ehrke
4b5fb08c2c Merge master into oc_preview 2013-08-14 20:56:44 +02:00
Jan-Christoph Borchardt
137d644963 Merge branch 'oc_preview' of github.com:owncloud/core into oc_preview 2013-08-14 20:41:49 +02:00
Jan-Christoph Borchardt
cba0f69622 increase row height to 50px, properly position everything, checkboxes, actions etc 2013-08-14 20:41:20 +02:00
Jörn Friedrich Dreyer
8f3f47e868 Merge pull request #4376 from owncloud/use_plurals 
Use plural translations
 2013-08-14 10:23:19 -07:00
Georg Ehrke
a255cc6007 fix adding preview-icon to clss attribute 2013-08-14 18:52:53 +02:00
Thomas Müller
b3b2b2d64c Merge pull request #4363 from owncloud/fix-4355 
Send mime-type for new files
 2013-08-14 09:46:10 -07:00
Jörn Friedrich Dreyer
9da49264ea change filelist ui updates 2013-08-14 17:49:45 +02:00
Jan-Christoph Borchardt
320bf0e8c1 fix breaking error due to ... a wrong icon link. Seriously? 2013-08-14 16:19:02 +02:00
Georg Ehrke
4f525c864d lazy load preview icons 2013-08-14 13:27:01 +02:00
Georg Ehrke
e704c8e4dc use web.svg instead of web.png 2013-08-14 11:51:54 +02:00
Georg Ehrke
3cbbe395eb don't use hardcoded size for preview 2013-08-14 11:38:52 +02:00
Jörn Friedrich Dreyer
e1927d5bee fix whitespace, check selected files before starting upload 2013-08-14 10:55:12 +02:00
kondou
4002491947 Reword a phrase 2013-08-14 06:29:19 +02:00
Bjoern Schiessle
53bb89824d check if some encrypted files are left after the app was disabled and warn the user 2013-08-12 17:25:27 +02:00
Jenkins for ownCloud
5ebff8cfc4 [tx-robot] updated from transifex 2013-08-11 08:11:03 -04:00
kondou
9549bd3e68 Use plural translations 2013-08-09 20:37:18 +02:00
Jenkins for ownCloud
98f836363a [tx-robot] updated from transifex 2013-08-09 08:06:31 -04:00
Andreas Fischer
beb27168de Use multiple lines for the JSON data array. 2013-08-08 22:14:21 +02:00
Andreas Fischer
0ab8850478 Adjust JSON code to stable5. 2013-08-08 22:14:21 +02:00
Andreas Fischer
1ed049a682 Do not repeat JSON success code. 2013-08-08 22:14:21 +02:00
Andreas Fischer
0718c92dc8 Do not repeat definition of $target. 2013-08-08 22:13:53 +02:00
Jan-Christoph Borchardt
8652137ad6 Merge pull request #3912 from owncloud/css_cleanup_kondou 
General CSS cleanup
 2013-08-08 07:31:01 -07:00
Jörn Friedrich Dreyer
ff67f115d4 fix #2711 using a custom event, also use css selectors over filterAttr 2013-08-08 13:50:04 +02:00
Thomas Müller
f7915d745a Merge pull request #4340 from owncloud/true-false-as-filename 
Allow true and false as filenames.
 2013-08-08 00:03:50 -07:00
Robin Appelman
d91104e120 actually register html template 2013-08-07 23:48:44 +02:00
Andreas Fischer
67df0a60fb Check expected type after JSON decode instead of checking what is not expected. 
This will also allow "true" and "false" as filenames instead of only "null".
 2013-08-07 17:01:14 +02:00
Robin Appelman
9321eceed6 add the option to have templates for newly created files 2013-08-07 16:53:09 +02:00
Jenkins for ownCloud
0deae7b86f [tx-robot] updated from transifex 2013-08-07 09:04:32 -04:00
Georg Ehrke
af983b843d fix merge conflicts 2013-08-05 14:27:38 +02:00
Thomas Müller
bf1a9dfae3 Merge pull request #4285 from owncloud/scan-files-script-master 
adding new cli script to rescan files
 2013-08-05 01:09:15 -07:00
Thomas Müller
010c4e0b83 remove cli check 2013-08-02 21:28:04 +02:00
Thomas Müller
5e1a775016 adjust usage text 2013-08-02 21:23:26 +02:00
Bart Visscher
a7a05b321a Use console.php entry point for file scanning from console 2013-08-02 15:36:54 +02:00
Jenkins for ownCloud
16726ab793 [tx-robot] updated from transifex 2013-08-02 02:00:45 -04:00
kondou
1348330c7d Fix a syntax error & have if-conds in an own line 2013-08-01 18:44:01 +02:00
kondou
aaf0fec9f5 Fix some JSLint warnings 2013-07-31 21:21:02 +02:00
Jenkins for ownCloud
761f40328c [tx-robot] updated from transifex 2013-07-31 02:01:45 -04:00
Georg Ehrke
ac6a3133ec style fixes 2013-07-30 12:33:54 +02:00
Jan-Christoph Borchardt
1a1c100719 fix loading.gif size for both upload and deletion, force visiblity 2013-07-30 10:44:01 +02:00
Thomas Müller
7425efade7 Merge branch 'master' into oc_preview 
Conflicts:
	3rdparty
	lib/template.php
 2013-07-30 00:34:36 +02:00
Victor Dubiniuk
33fe24dc3d Replace delete icon with spinner 2013-07-29 19:27:11 +03:00
Björn Schießle
7f9795cc3d Merge pull request #4203 from owncloud/trashbin_improvements 
Trashbin improvements
 2013-07-29 08:15:53 -07:00
Bjoern Schiessle
4a9f5f64da remove whitespaces 2013-07-29 17:15:20 +02:00
Georg Ehrke
1e4ec2ac27 add class='preview-icon' to rows in file app that make use of previews 2013-07-29 15:47:17 +02:00
Jenkins for ownCloud
0fde473cb7 [tx-robot] updated from transifex 2013-07-29 01:57:04 -04:00
Jenkins for ownCloud
fa35650e0a [tx-robot] updated from transifex 2013-07-27 02:03:03 -04:00
Björn Schießle
3354249691 fix typo 2013-07-26 11:51:18 +02:00
Björn Schießle
a00cff7c05 disable "deleted files" button if trash bin is empty 2013-07-26 11:14:29 +02:00
kondou
92af840a51 Merge branch 'master' into css_cleanup_kondou 
Conflicts:
	core/css/styles.css
	settings/templates/personal.php
 2013-07-24 20:35:00 +02:00
Robin Appelman
ad266a4253 Merge branch 'master' into sabre-objecttree 2013-07-24 15:53:48 +02:00
Thomas Müller
1a73e607bd Merge branch 'master' into more-themable-strings 
Conflicts:
	lib/template.php
 2013-07-24 09:35:33 +02:00
Jörn Friedrich Dreyer
7242480049 use $defaults->getName() as webdav REALM 2013-07-23 18:14:05 +02:00
Thomas Müller
2a42021815 Merge branch 'master' into delete-fix 
Conflicts:
	core/css/styles.css
 2013-07-23 16:24:34 +02:00