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

1735 commits

Author SHA1 Message Date
Jenkins for ownCloud
c591cf0836 [tx-robot] updated from transifex 2014-04-26 01:55:32 -04:00
Robin Appelman
6c20a014ea merge master into webdav-injection 2014-04-25 11:47:06 +02:00
Jenkins for ownCloud
3fc809dfd8 [tx-robot] updated from transifex 2014-04-25 01:56:28 -04:00
Björn Schießle
f520305848 Merge pull request #8026 from owncloud/remove_shared_folder 
remove the "Shared" folder
 2014-04-24 18:45:45 +02:00
Jenkins for ownCloud
435672feaa [tx-robot] updated from transifex 2014-04-24 01:55:33 -04:00
Thomas Müller
3aee23ee2b Merge pull request #8233 from owncloud/fix-newdialog-ie 
fix shift of icons in 'New' menu in IE8/9, fix #7987
 2014-04-23 16:17:24 +02:00
Robin McCorkell
c2f7848aeb Adjust renaming of directories, fixes #8280 
Directories will not be considered to have an extension, even if a dot is
found.

Stop Scrutinizer being annoyed

But the spaced version looked good!

Stop jsHint being annoyed

These code quality tools are really pestering
 2014-04-23 16:04:01 +02:00
Bjoern Schiessle
7ef8f6d352 always allow to rename the share mount point 2014-04-23 12:54:26 +02:00
Bjoern Schiessle
27c5a978f9 we no longer need to handle the Shared folder different from any other folder 2014-04-23 12:54:25 +02:00
Bjoern Schiessle
83d6810725 don't overwrite shared folder icon 2014-04-23 12:54:25 +02:00
Jenkins for ownCloud
3f453d1641 [tx-robot] updated from transifex 2014-04-23 01:56:35 -04:00
Robin Appelman
3821a09689 merge master into webdav-injection 2014-04-22 12:25:49 +02:00
Jörn Friedrich Dreyer
4d9ff49f61 Merge pull request #8283 from owncloud/translatable-max-in-upload 
make max. text translatable
 2014-04-22 10:23:08 +02:00
Jenkins for ownCloud
a9b4fba528 [tx-robot] updated from transifex 2014-04-22 01:54:58 -04:00
Jenkins for ownCloud
4fe5ca1908 [tx-robot] updated from transifex 2014-04-21 01:56:06 -04:00
Volkan Gezer
1aa7774178 make max. text translatable 2014-04-21 02:41:33 +02:00
Andreas Fischer
93ed6a695e Merge pull request #8169 from owncloud/change-to-show 
Change from showHTML to show

* owncloud/change-to-show:
  Change from showHTML to show
 2014-04-20 15:53:33 +02:00
Jenkins for ownCloud
a7d7ca2fb3 [tx-robot] updated from transifex 2014-04-17 01:56:06 -04:00
Jan-Christoph Borchardt
924aee718c fix shift of icons in 'New' menu in IE8/9, fix #7987 2014-04-16 14:58:27 +02:00
Thomas Müller
8bc7174bdc Merge pull request #8104 from owncloud/lukepolo-master 
Added the ability to Drag and Drop folders [chrome]
 2014-04-15 21:39:32 +02:00
Thomas Müller
83e8981e24 add link to further discussion about that folder check 2014-04-15 21:39:13 +02:00
Robin Appelman
c82adb8c5d merge master into webdav-injection 2014-04-15 20:03:00 +02:00
Lukas Reschke
6343391e58 Change from showHTML to show 
There is no need to use `showHTML` here.
 2014-04-11 20:38:27 +02:00
Björn Schießle
10dc1de644 Merge pull request #8069 from owncloud/fix-localization-issues-with-file-encrypt-app 
Fix some localization issues with file encryption/decryption strings
 2014-04-11 17:22:13 +02:00
Lukas Reschke
d229856fc5 Merge pull request #8076 from owncloud/enable-dav-browser 
Re-enable the sabredav browser plugin to fix sync client setup
 2014-04-10 21:47:03 +02:00
Thomas Müller
0edacf372c fix single file upload in firefox 2014-04-10 18:07:36 +02:00
Jenkins for ownCloud
7c072510d3 [tx-robot] updated from transifex 2014-04-10 01:55:39 -04:00
Thomas Müller
e8be2ac554 In cases folder drag and drop is not supported a proper message is displayed 2014-04-09 23:32:12 +02:00
Thomas Müller
2fc9e27ced use FileList.findFileEl 2014-04-09 22:16:41 +02:00
Thomas Müller
d2961dcf11 Merge branch 'master' into lukepolo-master 
Conflicts:
	apps/files/js/filelist.js
 2014-04-09 22:00:25 +02:00
Morris Jobke
d8f56e3c00 Merge pull request #8049 from owncloud/filepickersvg 
Fix file picker SVG issues
 2014-04-09 15:05:40 +02:00
Jenkins for ownCloud
796f719548 [tx-robot] updated from transifex 2014-04-09 01:56:49 -04:00
Jenkins for ownCloud
4ad4b9768c [tx-robot] updated from transifex 2014-04-08 01:57:51 -04:00
Thomas Müller
68b7822cf5 js style fixes according to our jshintrc rules 2014-04-07 23:45:35 +02:00
Thomas Müller
d15a4719d2 fix folder upload in js 2014-04-07 23:04:08 +02:00
Thomas Müller
971a311fee adding parentId to file info array 2014-04-07 23:03:19 +02:00
Thomas Müller
6d373e97c3 remove unused exit() 2014-04-07 23:02:49 +02:00
Thomas Müller
3587c88fe9 Merge branch 'master' of https://github.com/lukepolo/core-1 into lukepolo-master 
Conflicts:
	apps/files/js/file-upload.js
 2014-04-07 22:28:16 +02:00
Jörn Friedrich Dreyer
c90b0ac00b Fix copy conflict dialog translation 2014-04-07 11:46:47 +02:00
Robin Appelman
593977f016 Re-enable the sabredav browser plugin 2014-04-06 14:49:39 +02:00
Jenkins for ownCloud
a9d49de465 [tx-robot] updated from transifex 2014-04-06 01:56:11 -04:00
Volkan Gezer
286323f7a4 Fix some localization issues with file encryption/decription strings 2014-04-05 19:28:53 +02:00
Robin Appelman
01d93f81f6 Show higher resolution previews for high dpi screens 2014-04-04 17:10:46 +02:00
Vincent Petry
a4eafca77f Moved code to replace svg with png to OC.Util 
- Moved code that replaces the "svg" extension for the given file to
core as OC.Util.replaceSVGIcon.
- Added unit test for OC.Util.replaceSVGIcon
- Moved "replaceSVG" to OC.Util.replaceSVG and deprecated the global
"replaceSVG" function.
- Added alias for SVGSupport() as OC.Util.hasSVGSupport() (for now)
 2014-04-04 11:34:26 +02:00
Vincent Petry
8a10c44eb3 Merge pull request #8015 from owncloud/storageinfo-reuse 
Allow reusing FileInfo for getStorageInfo
 2014-04-04 10:18:02 +02:00
Jenkins for ownCloud
0805f678cc [tx-robot] updated from transifex 2014-04-04 01:57:01 -04:00
Morris Jobke
bf7624fb25 Merge pull request #6968 from owncloud/files-ajaxload 
Ajaxify files list for files + trashbin + public page
 2014-04-03 22:02:05 +02:00
Vincent Petry
d1e78d7a6b Correctly set svg for crumb divider 2014-04-03 17:08:06 +02:00
Vincent Petry
7c9537f33a Fixed dirInfo check for non existing dir in files ajax call 2014-04-03 17:04:13 +02:00
Jenkins for ownCloud
54783550e8 [tx-robot] updated from transifex 2014-04-03 01:56:12 -04:00