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 |
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 |
Thomas Müller
|
934f2e94a3
|
Merge branch 'master' into disable-anon-upload-master
|
2013-07-22 11:36:52 +02:00 |
Jan-Christoph Borchardt
|
dba4111aa0
|
fix delete button not showing in IE8
|
2013-07-22 11:18:51 +02:00 |
Jenkins for ownCloud
|
01f3f8e0cc
|
[tx-robot] updated from transifex
|
2013-07-22 02:03:23 -04:00 |
Bart Visscher
|
37a731bcad
|
Merge pull request #4131 from owncloud/scanner-split
Remove scanner logic from ajax file and place it in it's own class
|
2013-07-21 11:32:11 -07:00 |
Morris Jobke
|
647e0a0cba
|
Merge pull request #4118 from owncloud/remove-size-experiment
finally remove the file size obfuscation as it had more disadvantages.
|
2013-07-21 01:25:39 -07:00 |
Jenkins for ownCloud
|
9a13b687cc
|
[tx-robot] updated from transifex
|
2013-07-21 02:02:41 -04:00 |
Robin Appelman
|
2b89b7c880
|
Split scanning logic from ajax file
|
2013-07-19 16:44:47 +02:00 |
Jenkins for ownCloud
|
ae82f7fd17
|
[tx-robot] updated from transifex
|
2013-07-19 02:03:14 -04:00 |
Jan-Christoph Borchardt
|
48948ccf5f
|
finally remove the file size obfuscation as it had more disadvantages. I was wrong, sorry.
|
2013-07-18 22:15:26 +02:00 |
Jan-Christoph Borchardt
|
4bfd61fb7f
|
use new delete icon for deleted files as well
|
2013-07-18 18:46:37 +02:00 |
Jan-Christoph Borchardt
|
8a25d1ad06
|
remove unnecessary tipsy for Files delete
|
2013-07-18 18:41:01 +02:00 |
Jan-Christoph Borchardt
|
197c979d26
|
use background image instead of img for Files delete icon
|
2013-07-18 18:40:09 +02:00 |
Jenkins for ownCloud
|
279a71acb3
|
[tx-robot] updated from transifex
|
2013-07-18 02:02:51 -04:00 |
Jenkins for ownCloud
|
210006c4a6
|
[tx-robot] updated from transifex
|
2013-07-17 02:28:02 -04:00 |
Jenkins for ownCloud
|
a8acbfdf7b
|
[tx-robot] updated from transifex
|
2013-07-16 02:06:21 -04:00 |
Jenkins for ownCloud
|
29d8ae2f95
|
[tx-robot] updated from transifex
|
2013-07-14 02:10:41 +02:00 |
Jenkins for ownCloud
|
583addaea1
|
[tx-robot] updated from transifex
|
2013-07-13 02:07:35 +02:00 |
Thomas Müller
|
5f5700e353
|
in case the encryption app is enabled we cannot yet allow anonymous upload
|
2013-07-12 17:05:58 +02:00 |
Thomas Müller
|
fc2d538311
|
new admin setting added which allows to turn off anonymous uploads
|
2013-07-12 17:03:51 +02:00 |
Björn Schießle
|
cb81ceb31d
|
add new file above summary if it is the first file in the list
|
2013-07-12 10:40:24 +02:00 |
Jenkins for ownCloud
|
3fbf7ab189
|
[tx-robot] updated from transifex
|
2013-07-12 02:12:25 +02:00 |
Georg Ehrke
|
53830f2f75
|
implement use of previews in sharing app
|
2013-07-11 11:58:52 +02:00 |
Jenkins for ownCloud
|
f74659f3f6
|
[tx-robot] updated from transifex
|
2013-07-11 02:26:22 +02:00 |
Jan-Christoph Borchardt
|
a9072056a0
|
Merge pull request #3990 from owncloud/size-mb
add MB indicator to size heading, fix #3987
|
2013-07-10 08:42:05 -07:00 |
Jan-Christoph Borchardt
|
3fb3a7baa8
|
add MB indicator to size heading, fix #3987
|
2013-07-10 13:52:55 +02:00 |
Georg Ehrke
|
a357e5b284
|
merge conflicts ...
|
2013-07-10 12:41:53 +02:00 |
Georg Ehrke
|
cf449d42e8
|
properly encode path
|
2013-07-10 12:30:20 +02:00 |
Georg Ehrke
|
8eefaba719
|
some style adjustments
|
2013-07-10 12:30:11 +02:00 |
Jenkins for ownCloud
|
7ec6f3bde9
|
[tx-robot] updated from transifex
|
2013-07-10 02:20:59 +02:00 |
Victor Dubiniuk
|
582631323a
|
Migrate to encodePath
|
2013-07-09 17:46:11 +03:00 |
kondou
|
4818e0062e
|
General CSS cleanup
|
2013-07-09 16:08:32 +02:00 |
Jenkins for ownCloud
|
439cad07b5
|
[tx-robot] updated from transifex
|
2013-07-09 02:12:22 +02:00 |
Thomas Müller
|
0365d244e0
|
Merge pull request #3946 from owncloud/fixing-3942-master
handle anonymous upload to reshared folder
|
2013-07-08 02:27:21 -07:00 |
Jenkins for ownCloud
|
3cb4a72960
|
[tx-robot] updated from transifex
|
2013-07-08 02:09:41 +02:00 |
Jenkins for ownCloud
|
096d7674fc
|
[tx-robot] updated from transifex
|
2013-07-07 02:06:06 +02:00 |
Jenkins for ownCloud
|
c8ad3df1fa
|
[tx-robot] updated from transifex
|
2013-07-06 02:08:38 +02:00 |
Thomas Müller
|
dad91c156f
|
Merge branch 'master' into fixing-3942-master
Conflicts:
apps/files/ajax/upload.php
|
2013-07-06 00:02:11 +02:00 |
Thomas Müller
|
e159cbf527
|
on reshares we now recursively move to the root of all reshares - therefore some code has been refactured and added as a new public function
|
2013-07-05 17:39:41 +02:00 |
Thomas Müller
|
352c1415be
|
proper fix for getting the shared item if no user is logged in
|
2013-07-05 13:45:21 +02:00 |
Thomas Müller
|
d1d6885585
|
php 5.3 compliant now
|
2013-07-05 13:22:38 +02:00 |
Thomas Müller
|
0c32f66899
|
get the real physical folder name for anonymous upload
|
2013-07-05 12:15:47 +02:00 |
Thomas Müller
|
0202d47f7a
|
fixing Notice: Undefined index: isPublic
|
2013-07-05 11:30:53 +02:00 |
Thomas Müller
|
11172db55b
|
handle anonymous upload to reshared folder
|
2013-07-05 09:58:41 +02:00 |
Jenkins for ownCloud
|
955646c461
|
[tx-robot] updated from transifex
|
2013-07-05 02:21:23 +02:00 |
Jenkins for ownCloud
|
51cfacd789
|
[tx-robot] updated from transifex
|
2013-07-04 09:33:58 +02:00 |
Morris Jobke
|
56e91aa7b3
|
Merge pull request #3915 from owncloud/summary_as_last_filelist_entry
Show a summary as the last filelist entry
|
2013-07-03 04:17:17 -07:00 |
Jenkins for ownCloud
|
811cf02675
|
[tx-robot] updated from transifex
|
2013-07-03 02:04:16 +02:00 |
Georg Ehrke
|
6e864e6599
|
fix size of icons in 'new' dropdown menu - I hope @jancborchardt knows a better solution coz this won't work in most IE versions ...
|
2013-07-02 16:30:58 +02:00 |
Jenkins for ownCloud
|
cec8384b1a
|
[tx-robot] updated from transifex
|
2013-07-02 15:35:55 +02:00 |
kondou
|
063b0a2d17
|
Don't escape filesize (can contain a '<')
|
2013-07-02 13:09:07 +02:00 |
Georg Ehrke
|
d332b1d4a2
|
implement preview loading after upload
|
2013-07-02 11:13:22 +02:00 |
kondou
|
b1d0de95a9
|
Show a summary as the last filelist entry
Fix #993
|
2013-07-02 04:28:52 +02:00 |
Thomas Müller
|
5fff4e0d08
|
Merge pull request #3903 from owncloud/nonpublic-uploading
Fix upload regressions
|
2013-07-01 12:35:32 -07:00 |
Robin Appelman
|
492c0571a0
|
fix detection of public upload in filelist.js
|
2013-07-01 15:47:40 +02:00 |
Robin Appelman
|
86342224da
|
fix uploading when ['dirtoken'] is not set
|
2013-07-01 15:39:11 +02:00 |
Robin Appelman
|
e55ed10b0d
|
code style
|
2013-07-01 15:37:52 +02:00 |
Morris Jobke
|
b19033b353
|
Merge pull request #3223 from owncloud/fix-2820
if rename of file fails, the rename is undone in the view - fix 2820
|
2013-07-01 01:28:17 -07:00 |
Jenkins for ownCloud
|
80a8b9c995
|
[tx-robot] updated from transifex
|
2013-07-01 03:28:25 +02:00 |
Robin Appelman
|
1e0810e807
|
use new ObjectTree in sabredav
|
2013-06-30 18:37:47 +02:00 |
Jenkins for ownCloud
|
4d74e8955f
|
[tx-robot] updated from transifex
|
2013-06-30 02:13:07 +02:00 |
Jenkins for ownCloud
|
d2f50bc089
|
[tx-robot] updated from transifex
|
2013-06-29 02:09:10 +02:00 |
Bart Visscher
|
e3df2b8c87
|
Merge pull request #1044 from owncloud/fix_extra_slash
Remove duplicate / for first folder in root
|
2013-06-28 12:00:35 -07:00 |
Bart Visscher
|
89dc8be9f5
|
update to !==
|
2013-06-28 21:00:09 +02:00 |
Jörn Friedrich Dreyer
|
7d3490036c
|
Merge pull request #3838 from rgeber/master
Public Upload Feature
|
2013-06-28 07:30:41 -07:00 |
Jenkins for ownCloud
|
29caae3491
|
[tx-robot] updated from transifex
|
2013-06-27 02:12:00 +02:00 |
Roman Geber
|
da0caadf4e
|
Added file-upload to GIT repo
Optimized CSS identifiers
|
2013-06-26 22:51:38 +02:00 |
Georg Ehrke
|
806f3bddec
|
increase size of preview to size of row
|
2013-06-26 18:19:13 +02:00 |
Georg Ehrke
|
39c387eed4
|
implement server side use of previews
|
2013-06-26 18:04:22 +02:00 |
Jenkins for ownCloud
|
afc3d9314a
|
[tx-robot] updated from transifex
|
2013-06-26 02:07:04 +02:00 |
Jan-Christoph Borchardt
|
1a8e4399b0
|
increase Files row height to tappable 44px, more breathing space
|
2013-06-25 15:09:48 +02:00 |
Roman Geber
|
ddb0ff346d
|
Public upload feature
|
2013-06-25 12:24:14 +02:00 |
Jenkins for ownCloud
|
c3b8f2bf64
|
[tx-robot] updated from transifex
|
2013-06-25 02:13:40 +02:00 |
Robin Appelman
|
909d279e55
|
Add a CLI script for manually triggering checking a folder for updates
|
2013-06-23 17:49:38 +02:00 |
Robin Appelman
|
6778a45d45
|
use json to encode user list
|
2013-06-19 15:02:18 +02:00 |