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

1126 commits

Author SHA1 Message Date
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
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
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
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
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
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