Thomas Müller
39d874cd90
the maximum upload size is now part of the response of the upload and delete operation.
...
the maximum upload size is updated within the browser once an upload or delete operation has been finished
2012-12-20 17:16:53 +01:00
Jan-Christoph Borchardt
bdc8d0098a
Merge pull request #869 from owncloud/files-styles
...
Files styles
2012-12-20 05:39:09 -08:00
Jan-Christoph Borchardt
86d510ba28
fix switched values from previous commit
2012-12-20 13:30:57 +01:00
Jan-Christoph Borchardt
373b69d835
Merge pull request #974 from owncloud/fixing-120-master
...
setting the timezone is now part of the login process
2012-12-20 04:02:22 -08:00
Bart Visscher
8e44404ae0
Merge pull request #925 from owncloud/fix_issue_918
...
Trigger the last action before continuing with a file upload
2012-12-20 03:30:50 -08:00
Jan-Christoph Borchardt
babc0e4ac6
fix Firefox issues with file actions position and multiselect bar width
2012-12-20 12:02:19 +01:00
Jan-Christoph Borchardt
aa5f726f14
use slightly darker color for file actions background, fix fugly look for selected rows
2012-12-20 11:24:25 +01:00
Jan-Christoph Borchardt
c05ea8cfc3
fix file actions messing with file row height on narrower screens
2012-12-20 11:14:27 +01:00
Thomas Müller
a1bf6b54e6
remove timezone.js
2012-12-20 11:14:21 +01:00
Thomas Müller
7d811e57e6
setting the timezone is now part of the login process and true part of the core.
2012-12-20 11:10:45 +01:00
Jan-Christoph Borchardt
5107ccbeda
move CSS from JS to CSS
2012-12-20 10:53:50 +01:00
Frank Karlitschek
7c5150ce32
Merge pull request #913 from owncloud/fix_settings
...
cleaning up the settings
2012-12-18 15:27:52 -08:00
Jenkins for ownCloud
982e46cd29
[tx-robot] updated from transifex
2012-12-19 00:04:14 +01:00
Jan-Christoph Borchardt
586cc9a83b
merge master into navigation
2012-12-18 15:41:58 +01:00
Jenkins for ownCloud
a4b0df419e
[tx-robot] updated from transifex
2012-12-18 00:14:58 +01:00
Thomas Müller
b8f749420b
Merge pull request #929 from owncloud/fix_utf8_filenames_in_ie_download
...
fix utf8 filenames in ie download response header according to rfc5987, ...
2012-12-17 14:53:15 -08:00
Jörn Friedrich Dreyer
b6eb95349e
fix utf8 filenames in ie download response header according to rfc5987, see http://stackoverflow.com/questions/93551/how-to-encode-the-filename-parameter-of-content-disposition-header-in-http
2012-12-17 16:46:07 +01:00
Thomas Müller
d085fdf8ea
Merge pull request #842 from owncloud/restrict_keyboard_shortcuts
...
prevent keyboardshortcuts from catching events outside the main doc - e....
2012-12-17 07:38:53 -08:00
Michael Gapczynski
915126cae8
Trigger last action before continuing with creating a new file/folder/from link
2012-12-16 16:25:08 -05:00
Michael Gapczynski
2607c565b0
Trigger the last action before continuing with a file upload, fixes issue #918
2012-12-16 16:19:51 -05:00
Frank Karlitschek
30b0e8b70c
cleaning up the settings. standardize the format, add missing I10N and other small things. Yes. This is not perfect. But way better than before ;-)
2012-12-15 20:02:16 +01:00
Robin Appelman
946d58eaa8
merge master into filesystem
2012-12-15 02:21:26 +01:00
Bart Visscher
6ff38624a7
Merge pull request #875 from owncloud/multiplefiles_json
...
use json when deleting multiply files instead of using ; as delimiter
2012-12-14 16:26:09 -08:00
Jenkins for ownCloud
6d7ae463df
[tx-robot] updated from transifex
2012-12-14 00:17:42 +01:00
Robin Appelman
1443d6c3ef
fix mimetype icons for new files
2012-12-13 22:31:43 +01:00
Robin Appelman
fda7d932ef
remove unneeded line
2012-12-13 22:12:27 +01:00
Jan-Christoph Borchardt
e0ada2c24f
bring back fixed multiselect bar so it’s visible when scrolled down, fix #746
2012-12-13 19:44:55 +01:00
Jan-Christoph Borchardt
316a29f7ac
fix new button popup looking blurry
2012-12-13 19:04:27 +01:00
Robin Appelman
6a2b41e5e8
use json encoding when deleting multiply files instead of using ; as delimiter
2012-12-13 18:11:00 +01:00
Jan-Christoph Borchardt
e7c4a2c8e1
ungreenify new & upload buttons
2012-12-13 00:12:21 +01:00
Thomas Mueller
e8897c2b7e
prevent keyboardshortcuts from catching events outside the main doc - e.g. the share popup
2012-12-12 12:55:29 +01:00
Jenkins for ownCloud
bac4e011dc
[tx-robot] updated from transifex
2012-12-12 00:14:08 +01:00
Robin Appelman
7969d6e646
Merge branch 'master' into filesystem
2012-12-11 23:57:59 +01:00
Jenkins for ownCloud
f7f462f273
[tx-robot] updated from transifex
2012-12-11 00:04:40 +01:00
Jenkins for ownCloud
a444999a8c
[tx-robot] updated from transifex
2012-12-10 00:12:32 +01:00
Thomas Müller
9a3a83e16a
Merge pull request #282 from butonic/fix_new_and_upload_button_html_css
...
fix_new_and_upload_button_html_css
2012-12-09 01:25:50 -08:00
Jenkins for ownCloud
e3e4dcf77b
[tx-robot] updated from transifex
2012-12-09 00:12:41 +01:00
Jörn Friedrich Dreyer
787e8b86d9
cleanup CSS whitespace and remove extra input[type='checkbok']
2012-12-07 17:41:52 +01:00
Jörn Friedrich Dreyer
80d8ca24ec
fix svg -> png replacement for android, cleanup and remove obsolete css
2012-12-07 17:21:26 +01:00
Jörn Friedrich Dreyer
2ec96c7a63
fix new li icons jumping when replacing p with input
2012-12-07 17:21:26 +01:00
Jörn Friedrich Dreyer
8cf1e560bb
add IE9 CSS checkbox fixes
2012-12-07 17:21:26 +01:00
Jörn Friedrich Dreyer
810e02099e
upload button HTML, CSS & JS cleanup
2012-12-07 15:32:24 +01:00
Jörn Friedrich Dreyer
6864b28e47
rmeove vendor prefix for box-shadow
2012-12-07 15:32:24 +01:00
Jörn Friedrich Dreyer
76395057d4
fix_new_and_upload_button_html_css
2012-12-07 15:32:24 +01:00
Thomas Müller
380db4a29e
Merge pull request #640 from esthepiking/master
...
Keyboard Shortcuts
2012-12-06 13:42:14 -08:00
Robin Appelman
98f42d314c
merge master into filesystem
2012-12-06 17:47:28 +01:00
Erik Sargent
f0213735fc
Code clean up
2012-12-05 08:23:28 -07:00
Jenkins for ownCloud
524f3c3c0b
[tx-robot] updated from transifex
2012-12-05 00:04:55 +01:00
Erik Sargent
93208d0fe9
Remove rename
2012-12-04 09:40:17 -07:00
Jenkins for ownCloud
a53a946c20
[tx-robot] updated from transifex
2012-12-04 00:07:11 +01:00
Robin Appelman
be30b1a8de
merge master into filesystem
2012-12-03 18:02:22 +01:00
Jenkins for ownCloud
f4d7955fe6
[tx-robot] updated from transifex
2012-12-03 00:05:40 +01:00
Robin Appelman
72b6faa69d
merge master into filesystem
2012-12-02 03:03:48 +01:00
Jenkins for ownCloud
401c56ce7b
[tx-robot] updated from transifex
2012-12-02 00:03:12 +01:00
Jenkins for ownCloud
c7c5e2a2e2
[tx-robot] updated from transifex
2012-12-01 00:03:27 +01:00
Erik Sargent
47fa3a8fe0
event.ctrlKey
2012-11-30 10:11:25 -07:00
Erik Sargent
5d13b0533d
event.ctrlKey
2012-11-30 10:10:00 -07:00
Erik Sargent
2160663309
ctrl issue fix
2012-11-30 08:43:24 -07:00
Bart Visscher
8aba5874db
Merge pull request #644 from butonic/checkstyle_fixes
...
fix checkstyle for files app
2012-11-30 04:10:31 -08:00
Robin Appelman
dbbb357f62
add upgrade path from old cache to preserve file id's
2012-11-30 01:41:30 +01:00
Erik Sargent
6060d063a9
Cleanup
2012-11-29 16:52:41 -07:00
Robin Appelman
d33f697a5f
merge master into filesystem
2012-11-30 00:18:42 +01:00
Jenkins for ownCloud
16a630024c
[tx-robot] updated from transifex
2012-11-30 00:05:16 +01:00
Jörn Friedrich Dreyer
3b83fe1530
fix checkstyle for files app
2012-11-29 18:33:15 +01:00
Erik Sargent
b6e3460871
documentation
2012-11-29 10:21:20 -07:00
Erik Sargent
fd4aecf525
cleanup
2012-11-29 10:18:34 -07:00
Robin Appelman
bcb27c81d4
use new obEnd function instead of ob_end_clean
2012-11-29 18:01:21 +01:00
Erik Sargent
dafe028c11
Rename
2012-11-28 21:00:11 -07:00
Erik Sargent
a73a263543
Enter
2012-11-28 19:58:42 -07:00
Erik Sargent
8802dac02a
Arrow key navigation
2012-11-28 17:32:05 -07:00
Erik Sargent
8722d3751c
Keys array
2012-11-28 10:36:54 -07:00
Erik Sargent
b78dc3f48a
keycode naming
2012-11-28 10:22:20 -07:00
Bart Visscher
9717cdb42e
Merge pull request #601 from butonic/add_drag_shadow_in_firefox
...
show drag shadow in firefox by using helper:'clone'
2012-11-28 09:00:12 -08:00
Erik Sargent
0c6b53c25e
no message
2012-11-28 09:55:38 -07:00
Erik Sargent
fa858d7149
initial setup
2012-11-28 09:50:54 -07:00
Erik Sargent
ccb9bb4be0
initial setup
2012-11-28 09:50:49 -07:00
Erik Sargent
5f03c306da
initial setup
2012-11-28 09:50:40 -07:00
Jenkins for ownCloud
1d4d4fd678
[tx-robot] updated from transifex
2012-11-28 00:11:21 +01:00
Jörn Friedrich Dreyer
9a441d3e3a
show drag shadow in firefox by using helper:'clone'
2012-11-27 17:38:21 +01:00
Jenkins for ownCloud
d251f04b98
[tx-robot] updated from transifex
2012-11-27 00:10:47 +01:00
Arthur Schiwon
74cf3b5dfb
use normalizePath to have a proper target path
2012-11-26 14:35:13 +01:00
Arthur Schiwon
776be8d9f7
all but the first parameter are introduced by &
2012-11-26 14:34:28 +01:00
Arthur Schiwon
fdc7a8b204
make sure path starts with /
2012-11-26 14:34:09 +01:00
Jenkins for ownCloud
7892204077
[tx-robot] updated from transifex
2012-11-26 00:02:04 +01:00
Robin Appelman
03fd43a239
Merge branch 'master' into filesystem
2012-11-25 15:38:17 +01:00
Robin Appelman
eaf8399aaf
make sure the output buffer is closed when handeling webdav
2012-11-25 14:45:13 +01:00
Jenkins for ownCloud
1857d5f914
[tx-robot] updated from transifex
2012-11-25 00:03:37 +01:00
Michael Gapczynski
c47bf9bbce
Add checks for storage object
2012-11-24 16:42:54 -05:00
Jenkins for ownCloud
dde3342398
[tx-robot] updated from transifex
2012-11-24 00:03:00 +01:00
Robin Appelman
555dec2d92
merge master into filesystem
2012-11-23 16:20:56 +01:00
Thomas Müller
db2be74b4d
Merge pull request #479 from owncloud/fix_438
...
Do the url encoding once, only in breadcrumbs template
2012-11-23 03:07:02 -08:00
Thomas Müller
b5b7a67f8a
Merge pull request #480 from owncloud/fix_435_and_437
...
Also reject names with \ in the name
2012-11-23 03:05:52 -08:00
Thomas Müller
97ed467224
Merge pull request #418 from libasys/Fix-IE8-fileactions-binding
...
Fixes two issues if you using IE8. IE8 has problems with .bind actions a...
2012-11-23 02:16:21 -08:00
Robin Appelman
95057e727d
merge master into filesystem
2012-11-23 00:40:58 +01:00
Robin Appelman
8fb4dfd2ea
use background scanner
2012-11-23 00:20:46 +01:00
Jenkins for ownCloud
3688376a6f
[tx-robot] updated from transifex
2012-11-23 00:03:17 +01:00
Jörn Friedrich Dreyer
a81d7cd79f
introduce Files.containsInvalidCharacters(), use when creating or renaming files
2012-11-22 13:03:17 +01:00
Thomas Mueller
cd495bf9ba
some more invalid characters have been added
2012-11-22 11:52:05 +01:00
Bart Visscher
1793e85a52
Also reject names with \ in the name
...
fixes issues #435 and #437
2012-11-22 11:52:05 +01:00
blizzz
d4ec77e08b
Merge pull request #482 from eMerzh/fix_prevent_shared_folder
...
Show error message to prevent adding a shared folder in the root dir fix...
2012-11-22 02:40:23 -08:00
Robin Appelman
97380f3485
merge master into filesystem
2012-11-21 22:37:14 +01:00
Jenkins for ownCloud
9204be827b
[tx-robot] updated from transifex
2012-11-21 00:02:33 +01:00
Jenkins for ownCloud
568def2b61
[tx-robot] updated from transifex
2012-11-20 00:02:08 +01:00
Robin Appelman
a922eb756e
merge master into filesystem
2012-11-18 14:07:52 +01:00
Jenkins for ownCloud
e28d71bf55
[tx-robot] updated from transifex
2012-11-18 00:02:00 +01:00
Bart Visscher
20c24f234f
Do the url encoding once, only in breadcrumbs template
...
fixes issue #438
2012-11-16 16:12:28 +01:00
Brice Maron
02bc440900
Show error message to prevent adding a shared folder in the root dir fix #468
2012-11-16 14:59:14 +00:00
Thomas Mueller
4a3b5125cf
adding comments on the form array indexes
2012-11-16 11:58:33 +01:00
Thomas Mueller
2b192a75c4
normalize the path once in upload.php is enough - THX Robin for this hint
2012-11-16 11:50:57 +01:00
Thomas Mueller
7af4cf48c9
refs #461 - drag'n'drop upload to a sub folder is working now
2012-11-16 10:23:40 +01:00
Robin Appelman
f94d62380f
Merge branch 'master' into filesystem
2012-11-15 21:27:24 +01:00
Björn Schießle
8a93cc14f6
port of approved pull request #442 - 'Always set renaming to false, also if renaming was aborted, to finalize the operation and show the file actions again.'
2012-11-15 17:16:18 +01:00
Robin Appelman
bf2ac9f113
merge master into filesystem
2012-11-15 00:37:54 +01:00
Jenkins for ownCloud
a418a3ba65
[tx-robot] updated from transifex
2012-11-15 00:03:50 +01:00
libasys
eda9ce4cf8
Fixes two issues if you using IE8. IE8 has problems with .bind actions and since jquery 1.7.2 using .bind is old school style for event delegation. the new and better way is using .on() function. The second is using $.each instead of for() to walkthrough an array! Now it works perfect, the events after uploads are triggered.
2012-11-14 16:05:24 +01:00
Jenkins for ownCloud
9c36326e47
[tx-robot] updated from transifex
2012-11-14 00:03:38 +01:00
Jenkins for ownCloud
ac22cd4ab0
[tx-robot] updated from transifex
2012-11-13 00:07:19 +01:00
icewind1991
66dfe270c6
Merge pull request #319 from owncloud/fileactions_newfile
...
Add fileactions to new files and folders
2012-11-12 14:57:06 -08:00
Jörn Friedrich Dreyer
bbef5b377e
add i18n for cancel button
2012-11-12 10:52:28 +01:00
Thomas Tanghus
56239df2e7
Update all to use OCP\PERMISSION_* instead of OCP\Share::PERMISSION_*
2012-11-11 23:10:23 +01:00
Jenkins for ownCloud
7ec0efe5c2
[tx-robot] updated from transifex
2012-11-10 00:02:29 +01:00
Jenkins for ownCloud
b33a443088
[tx-robot] updated from transifex
2012-11-09 10:07:45 +01:00
Jenkins for ownCloud
cb57a20ec2
[tx-robot] updated from transifex
2012-11-09 00:03:49 +01:00
Robin Appelman
41a61bc637
fix undefined index when loading files app
2012-11-08 21:36:13 +01:00
Robin Appelman
d4858527c2
fix rename parameter order
2012-11-08 21:35:30 +01:00
Georg Ehrke
84084b9430
Merge pull request #261 from owncloud/fix_opera_file_delete
...
fix file delete in opera - fixes #188
2012-11-08 08:55:19 -08:00
Robin Appelman
091ff02362
merge master into filesystem
2012-11-08 17:32:00 +01:00
Jenkins for ownCloud
c8f24fa3c9
[tx-robot] updated from transifex
2012-11-08 00:03:43 +01:00
Robin Appelman
37fe9800b6
add actions to newly created files and folders
...
closes #231
2012-11-07 22:13:52 +01:00
Robin Appelman
42935c5564
reuse jquery object when adding files to the file list
2012-11-07 22:06:05 +01:00
Robin Appelman
e14054610f
Revert "fix blocking drag & drop upload of folders"
...
Fixes #150
This reverts commit 5b2f3c7f72
.
2012-11-07 21:59:18 +01:00
Robin Appelman
961ff01a93
merge master into filesystem
2012-11-07 17:18:56 +01:00
Björn Schießle
7b51a4e5f9
Merge pull request #306 from owncloud/crumb_drop_fix
...
extract the right file name for drag&drop.
2012-11-07 05:46:18 -08:00
Björn Schießle
168a2c7b6b
get the right file name for drag&drop. This was necessary after the switch to css to show/hide file actions, otherwise the actions where part of the extracted file name.
2012-11-07 14:10:10 +01:00
Thomas Müller
d42d88d391
Merge pull request #289 from zimba12/master
...
Move function that relativizes dates from Files app to core
2012-11-07 03:43:59 -08:00
Jenkins for ownCloud
3e01fe1dbb
[tx-robot] updated from transifex
2012-11-07 00:02:51 +01:00
Alessandro Cosentino
50dbb30eb9
Moved relative_modified_date from file/js to core/js
2012-11-06 10:56:42 -05:00
Jenkins for ownCloud
4d052c1eee
[tx-robot] updated from transifex
2012-11-06 00:01:40 +01:00
Arthur Schiwon
85d6a08ae9
prepare SQL query only once, that's what prepared statements are for. Should improve upgrade time with larger setups
2012-11-05 20:47:26 +01:00
Georg Ehrke
bb0164c9fc
fix file delete in opera - fixes #188
2012-11-05 18:42:44 +01:00
Robin Appelman
34fee8afaa
remove debug statements
2012-11-05 13:52:02 +01:00
Robin Appelman
4b940955dd
merge master into filesystem
2012-11-04 21:12:18 +01:00
Robin Appelman
4f32f49fb1
this line shouldn't be here
2012-11-04 21:00:36 +01:00
Robin Appelman
f187aa6c93
some more code reuse for fileactions
...
also fixes an issue where some fileactions always worked on the last file in the list
2012-11-04 20:48:38 +01:00
Felix Moeller
30d7993e01
Checkstyle fixes: NoSpaceAfterComma
2012-11-04 11:10:46 +01:00
Felix Moeller
f8d1d7787e
Checkstyle fixes for SpaceBeforeOpenBrace
2012-11-04 10:46:32 +01:00
Jenkins for ownCloud
17d466b03b
[tx-robot] updated from transifex
2012-11-04 00:01:42 +01:00
Jenkins for ownCloud
2f0fd84477
[tx-robot] updated from transifex
2012-11-03 00:02:24 +01:00
Robin Appelman
4a5a36577e
merge master into filesystem
2012-11-02 21:42:29 +01:00
Felix Moeller
afadf93d31
Checkstyle: many fixes
2012-11-02 19:53:02 +01:00
Jan-Christoph Borchardt
b05666219e
Merge branch 'master' into navigation
2012-11-02 13:36:01 +01:00
Lukas Reschke
d9e9761099
Fix a typo
2012-11-02 00:16:40 +01:00
Lukas Reschke
0f02b7dea6
Add CSRF token
2012-11-02 00:09:28 +01:00
Jenkins for ownCloud
627509875e
[tx-robot] updated from transifex
2012-11-02 00:04:59 +01:00
Jan-Christoph Borchardt
e66482430e
Files: change wording 'From url' to 'From link'
2012-11-01 18:09:16 +01:00
Jan-Christoph Borchardt
01bd0efc36
Merge branch 'master' into navigation
2012-11-01 16:58:06 +01:00
Robin Appelman
51ba12890d
Merge branch 'master' into filesystem
2012-11-01 16:16:02 +01:00
Björn Schießle
a9ce43de41
adapted comments to the code changes
2012-11-01 00:20:50 +01:00
Björn Schießle
3878950af4
load logging apps for webdav connections
...
Backport of de1b95c
2012-11-01 00:20:43 +01:00
Jörn Friedrich Dreyer
b76306c144
Merge pull request #155 from owncloud/token-expired-IE
...
Send the requesttoken as form value
2012-10-31 04:50:18 -07:00
Thomas Müller
f851738169
Merge pull request #152 from scambra/webdav-quota
...
checking quota in webdav
2012-10-31 03:03:46 -07:00
Jenkins for ownCloud
aca6d3252f
[tx-robot] updated from transifex
2012-10-31 00:02:32 +01:00
Robin Appelman
6e9e263497
merge master into filesystem
2012-10-30 22:59:55 +01:00
Lukas Reschke
116fa64294
Change IE8 to "older IE versions"
...
I'm not sure if IE9 is also affected, so I changed it to "older IE versions" - IE 10 should work fine.
2012-10-30 17:29:26 +01:00
Lukas Reschke
ee1e4a7602
Send the requesttoken as form value
...
This is needed for IE < 8 because it doesn't send the CSRF token here.
So that it is impossible to upload files.
Fixes #110 and related to #122
2012-10-30 17:19:49 +01:00
Jan-Christoph Borchardt
3db43a9980
Merge branch 'master' into navigation
2012-10-30 14:23:38 +01:00
scambra
d9c14292a4
fix checking quota in webdav, adding a sabredav plugin
2012-10-30 10:32:30 +01:00
blizzz
629d33967c
Merge pull request #142 from denis-b/patch-2
...
fix moving (in) dirs containing "+"
2012-10-29 09:25:09 -07:00
denis-b
2aa5a185d4
Update apps/files/ajax/move.php
...
fix moving dirs containing "+"
2012-10-29 16:46:22 +01:00
denis-b
b563935498
Update apps/files/index.php
...
fix dirnames containing "+" not displayed
2012-10-29 16:44:50 +01:00
Bart Visscher
ccbf4e993c
Use files remote webdav in compatibility files/webdav.php
2012-10-29 15:04:56 +01:00
Bart Visscher
ab4ade0d24
Remove fixme, problem is solved already
2012-10-29 15:04:55 +01:00
Jenkins for ownCloud
dbb4e74c79
[tx-robot] updated from transifex
2012-10-29 00:02:45 +01:00
Michael Gapczynski
60e5054ae8
Fix shared status icons
2012-10-28 16:02:05 -04:00
Jan-Christoph Borchardt
d7abd44dea
merge breadcrumb root into navigation
2012-10-28 17:10:31 +01:00
Jan-Christoph Borchardt
7af8c6c3cb
first version of breadcrumb 'root', still have a weird feeling about this
2012-10-28 16:05:31 +01:00
Robin Appelman
0fbb99690b
properly replace fileaction icons with pngs when needed
2012-10-28 16:03:52 +01:00
Georg Ehrke
4fd0514f0a
don't move file into subdirectory if a file with the same name already exists ( fixes #92 )
2012-10-28 15:23:40 +01:00
Jan-Christoph Borchardt
cf2a504d42
Merge branch 'master' into navigation
2012-10-28 14:10:10 +01:00
Robin Appelman
fe6b987b3d
use css to show/hide fileactions
2012-10-28 12:47:42 +01:00
Robin Appelman
d9ef6da2e4
code style
2012-10-28 12:47:42 +01:00
Bart Visscher
d6953fa5ed
Remove wrongly committed files
2012-10-27 17:45:15 +02:00
Jan-Christoph Borchardt
b595ea6efc
first icon update. Next step: make sprited hover state (like for home already)
2012-10-27 17:44:24 +02:00
Bart Visscher
894d44e796
Merge remote-tracking branch 'git://github.com/susinths/SabreDAV_1.7.1.git'
...
Conflicts:
lib/base.php
2012-10-27 16:33:10 +02:00
Robin Appelman
8973124574
Merge branch 'master' into filesystem
2012-10-27 15:31:27 +02:00
Bart Visscher
939b51e46f
Fix download url generation
2012-10-27 15:10:21 +02:00
Robin Appelman
38371d1275
Merge branch 'master' into filesystem
2012-10-27 14:28:24 +02:00
Robin Appelman
dea0d20a9a
fix delete and sort files
2012-10-27 12:18:01 +02:00
Bart Visscher
0120f3fd62
Merge branch 'routing'
...
Conflicts:
core/lostpassword/index.php
core/lostpassword/resetpassword.php
2012-10-27 11:58:02 +02:00
Robin Appelman
cbc71784c0
Merge branch 'master' into filesystem
2012-10-27 10:02:26 +02:00
Jenkins for ownCloud
3bef19c623
[tx-robot] updated from transifex
2012-10-27 00:02:05 +02:00
Jan-Christoph Borchardt
3eea7aac13
first base on navigation rework, less obtrusive, icons need to be updated, settings moved
2012-10-26 23:38:36 +02:00
Robin Appelman
6db81afab9
move some stuff to the new api
2012-10-26 23:05:02 +02:00
Robin Appelman
ad5957207d
merge master into filesystem
2012-10-26 18:29:24 +02:00
Jan-Christoph Borchardt
f477fda785
separate buttons for new file and upload
2012-10-26 18:16:42 +02:00
Robin Appelman
0e2bf8d373
Merge branch 'master' into filesystem
2012-10-26 10:42:41 +02:00
Jenkins for ownCloud
c7d64811d6
[tx-robot] updated from transifex
2012-10-26 02:05:56 +02:00
Robin Appelman
7bc49d2a57
merge master into filesystem
2012-10-25 18:26:08 +02:00
Bart Visscher
43ac43d7af
dir in newfile has to start with /
2012-10-25 08:37:13 +02:00
Lukas Reschke
515e1b467e
Merge pull request #81 from fmms/master
...
Codestyle add some needed spaces.
2012-10-24 10:16:32 -07:00
Lukas Reschke
694b1d397d
Revert e1a4fe9890
2012-10-24 17:58:52 +02:00
Robin Appelman
5a3d6805a2
cleanup OC_Files a bit
2012-10-24 15:52:30 +02:00
Björn Schießle
07e08d5928
urldecode target directory
2012-10-24 15:37:51 +02:00
Robin Appelman
7b150dfa96
merge master into filesystem
2012-10-24 15:32:29 +02:00
Lukas Reschke
a7eb56c799
Merge pull request #76 from fmms/master
...
checkstyle: some more cleanups
2012-10-23 23:48:27 -07:00
Jenkins for ownCloud
f33af71eb0
[tx-robot] updated from transifex
2012-10-24 02:08:34 +02:00
Felix Moeller
e73b817a38
Checkstyle: NoSpaceAfterComma
2012-10-23 22:53:54 +02:00
Lukas Reschke
e1a4fe9890
Fix urlencoding in the breadcrumb
2012-10-23 17:50:36 +02:00
Lukas Reschke
73f85c3b81
Merge pull request #62 from fmms/master
...
More Checkstyle warnings
2012-10-23 08:07:01 -07:00
Robin Appelman
7424f3aef6
merge master into filesystem
2012-10-23 16:16:46 +02:00
icewind1991
ab944094e2
Merge pull request #12 from scambra/fixes
...
check free space using folder's owner
2012-10-23 07:02:21 -07:00
Arthur Schiwon
6a2a915559
Files: urldecode urlencoded dir names, fixes oc-2111
2012-10-23 13:50:24 +02:00
Felix Moeller
36d0d75901
Codestyle: FunctionCallArgumentSpacing
2012-10-23 08:35:54 +02:00
Jenkins for ownCloud
bc2a648f2d
[tx-robot] updated from transifex
2012-10-23 02:06:03 +02:00
Felix Moeller
6a00a6b9ed
Make Jenkins more happy.
...
This is NoSpaceAfterComma
2012-10-23 00:28:12 +02:00
Jenkins for ownCloud
d8e945466d
[tx-robot] updated from transifex
2012-10-22 02:06:18 +02:00
Robin Appelman
5217ca219a
Merge branch 'master' into filesystem
2012-10-21 15:16:23 +02:00
Jenkins for ownCloud
16c4eb66d7
[tx-robot] updated from transifex
2012-10-21 02:06:44 +02:00
Robin Appelman
f7722abcb0
Merge branch 'master' into filesystem
2012-10-20 23:50:14 +02:00
Jenkins for ownCloud
cfbd310d34
[tx-robot] updated from transifex
2012-10-20 02:03:53 +02:00
Jenkins for ownCloud
f5043c0661
[tx-robot] updated from transifex
2012-10-19 02:08:00 +02:00
Robin Appelman
9712a78559
merge master into filesystem
2012-10-18 23:24:28 +02:00
Thomas Müller
e4c0bb59e5
Merge pull request #39 from scambra/date-l10n-fixes
...
Date l10n fixes
2012-10-18 08:09:58 -07:00
Jörn Friedrich Dreyer
e307bf31c8
fix oc-605
2012-10-18 14:19:34 +02:00
Jenkins for ownCloud
519a0ae4ab
[tx-robot] updated from transifex
2012-10-18 02:09:32 +02:00
Thomas Müller
9f01cd05fb
Merge pull request #37 from scambra/js-interpolation-l10n
...
use interpolation for some translations in js
2012-10-17 13:28:46 -07:00
Bart Visscher
6081bfa2bc
Merge branch 'master' into routing
...
Conflicts:
lib/search/provider/file.php
settings/ajax/changepassword.php
settings/settings.php
2012-10-17 16:38:11 +02:00
Susinthiran Sithamparanathan
b2b84f3a6f
Update Sabre to version 1.7.1
2012-10-17 16:17:36 +02:00
Robin Appelman
77cef5f514
merge master into filesystem
2012-10-17 13:14:17 +02:00
Jenkins for ownCloud
fd6adc7d08
[tx-robot] updated from transifex
2012-10-16 23:39:13 +02:00
scambra
c814a7a841
use interpolation for some translations in js
2012-10-16 20:53:31 +02:00
scambra
5ecce8bfb7
Translate modification date when file is created/uploaded, use same strings as lib/template.php
2012-10-16 20:25:11 +02:00
Jenkins for ownCloud
c3823aa864
[tx-robot] updated from transifex
2012-10-16 02:08:21 +02:00
Bart Visscher
4af5b016cc
Whitespace cleanup
2012-10-14 21:04:08 +02:00
Jenkins for ownCloud
c88cf5cae5
[tx-robot] updated from transifex
2012-10-14 02:08:47 +02:00
Robin Appelman
11e9ce25e6
merge master into filesystem
2012-10-13 04:29:20 +02:00
Jenkins for ownCloud
d386bc8737
[tx-robot] updated from transifex
2012-10-13 02:08:50 +02:00
Robin Appelman
5b2f3c7f72
fix blocking drag & drop upload of folders
2012-10-12 15:30:16 +02:00
Lukas Reschke
e5f2d46c6f
Sanitize user input
2012-10-12 14:10:05 +02:00
Jenkins for ownCloud
b761143047
[tx-robot] updated from transifex
2012-10-12 02:07:10 +02:00
Robin Appelman
fb2d2bc201
merge master into filesystem
2012-10-11 22:54:39 +02:00
Jenkins for ownCloud
673e3dae3f
[tx-robot] updated from transifex
2012-10-11 02:07:32 +02:00
Björn Schießle
41640b4b91
don't show the share action in the file view for publically shared files.
2012-10-10 17:44:21 +02:00
Robin Appelman
aaa1b73364
don't use depricated OC_Filesystem
2012-10-10 13:18:36 +02:00
Thomas Müller
29fa9dfb79
Merge pull request #25 from visit1985/uploadfilesize
...
fixed max possible upload size for files app in admin screen
2012-10-10 00:41:19 -07:00
Jenkins for ownCloud
fce6ce9bc6
[tx-robot] updated from transifex
2012-10-10 02:09:28 +02:00
Jenkins for ownCloud
f1fc73ea5b
[tx-robot] updated from transifex
2012-10-09 02:07:41 +02:00
Björn Schießle
32e2d7ef8f
check if ID was assigned
2012-10-08 17:47:02 +02:00
Björn Schießle
277dd2b0a9
remove debug output
2012-10-08 17:32:04 +02:00
Björn Schießle
2923d24921
add data-id directly after upload/creation to the file list (bugfix for #1917 )
2012-10-08 17:30:35 +02:00
Björn Schießle
4dba91838f
add ID to upload form and check if ID exist to avoid loading invalid javascript code for read-only views.
2012-10-08 10:28:29 +02:00
Jenkins for ownCloud
b934668b9e
[tx-robot] updated from transifex
2012-10-08 02:07:01 +02:00
Michael Gapczynski
4b446f3edd
Revert part of 5beca59b
, fixes file upload bug oc-1926
2012-10-07 17:17:37 -04:00
Michael Göhler
7f2208b9a1
fixed max possible upload size for files app in admin screen
...
used get_cfg_var() to get the real limit from php.ini instead of .ht_access
dont know why we used PHP_INT_MAX here...
2012-10-07 00:31:07 +02:00
Jenkins for ownCloud
35c5f71989
[tx-robot] updated from transifex
2012-10-06 02:06:49 +02:00
Björn Schießle
4f7c7c615e
prevent xss attacks
2012-10-05 17:05:23 +02:00
Björn Schießle
5e2bce24b4
enable user to download selected files from publically shared directory
2012-10-05 16:12:04 +02:00
Björn Schießle
f4136854b6
stripsplashes doesn't work if the slash is the only character -> creating file in root dir leads to "//filename"
2012-10-05 11:15:32 +02:00
Björn Schießle
5beca59b9c
check if element really exists before calling it. (e.g. for public shared files view, elements like "navigation" doesn't exist)
2012-10-05 10:32:38 +02:00
Jenkins for ownCloud
5c042d88ad
[tx-robot] updated from transifex
2012-10-04 02:07:35 +02:00
Jenkins for ownCloud
32a6b3b862
[tx-robot] updated from transifex
2012-10-02 23:18:26 +02:00
Björn Schießle
92b37119e3
remove textbox after pressing "enter" even if the name is the same
2012-10-02 18:38:17 +02:00
Jörn Friedrich Dreyer
39735721ec
escape identifiers in queries
2012-10-02 14:11:25 +02:00
Frank Karlitschek
3fdebaa5dc
automatically remove and prevent installation of apps with a require version less than the current one. We check now the first ad second part of the version number.
...
Also increase the require tags of the core apps to 4.9 Please note that 4.9 is the internal versionnumber of the upcoming 4.5 release.
You have to pu a <require>4.9</require> into the info.xml of your app to make it as compatible with 4.5
2012-10-02 12:10:45 +02:00
Jenkins for ownCloud
f0c4356392
[tx-robot] updated from transifex
2012-10-02 02:06:08 +02:00
Mat Lipe
d1010e58d8
Update apps/files/css/files.css
...
Fixed a strange comment issue
2012-10-01 06:43:31 -05:00
Mat Lipe
2330dd5f21
Update apps/files/css/files.css
...
Fix the File Upload Button in Chrome. Tested in IE9-8-7, Firefox, Chrome
2012-09-30 20:02:52 -05:00
Jenkins for ownCloud
27bd9df027
[tx-robot] updated from transifex
2012-09-28 23:36:09 +02:00
Bart Visscher
dbdf3bde7c
Implement route for download in OC_Search_Provider_File
2012-09-28 22:20:17 +02:00
Bart Visscher
c9317b5a68
Merge branch 'master' into routing
2012-09-28 21:41:21 +02:00
Bart Visscher
4e2f575938
Correctly fix oc-1016 and fix downloading of files
2012-09-28 21:18:20 +02:00
Bart Visscher
bf1057143c
Merge branch 'master' into routing
...
Conflicts:
apps/files/js/filelist.js
core/js/js.js
lib/ocs.php
2012-09-28 15:38:49 +02:00
Jenkins for ownCloud
5144d26088
[tx-robot] updated from transifex
2012-09-28 02:06:03 +02:00
Jenkins for ownCloud
09aa95586a
[tx-robot] updated from transifex
2012-09-27 02:03:09 +02:00
Robin Appelman
cfbca40fbe
fix sharing for newly uploaded or created files
2012-09-26 13:25:11 +02:00
Jenkins for ownCloud
2c00f8c850
[tx-robot] updated from transifex
2012-09-26 13:22:37 +02:00
Björn Schießle
fcd70246db
Merge branch 'master' of github.com:owncloud/core
2012-09-26 10:50:06 +02:00
Björn Schießle
c3c6e52104
- take webdav namespace for properties into account
...
- change update routine to add the namesapce to all stored properties
2012-09-26 10:48:30 +02:00
Jenkins for ownCloud
5855355faa
[tx-robot] updated from transifex
2012-09-26 02:06:37 +02:00
Jenkins for ownCloud
e5487376da
[tx-robot] updated from transifex
2012-09-25 02:05:18 +02:00
Brice Maron
7aca730f71
Small css fix for button new in files. fix oc-1638
2012-09-24 18:40:59 +00:00
Jenkins for ownCloud
ecb90d72f3
[tx-robot] updated from transifex
2012-09-24 02:04:10 +02:00
Robin Appelman
a22a5d6807
some js style fixes
2012-09-23 03:16:52 +02:00
Jenkins for ownCloud
81ecabb19c
[tx-robot] updated from transifex
2012-09-23 02:04:41 +02:00
Jenkins for ownCloud
08132587d1
[tx-robot] updated from transifex
2012-09-22 02:01:19 +02:00
Jenkins for ownCloud
01160d0fb4
[tx-robot] updated from transifex
2012-09-22 01:18:31 +02:00
Thomas Müller
d5055639b2
Merge pull request #15 from scambra/delete-fixes
...
use post to delete files, get has a limit and fails with many files
2012-09-21 16:11:11 -07:00
Thomas Müller
ac69974d73
Merge pull request #17 from scambra/4.5-l10n-fixes
...
Fix some untranslated strings
2012-09-21 16:09:30 -07:00
Tom Needham
bcd3d1116c
Change background colour of upload button to be consistant with new button
2012-09-21 12:45:11 +00:00
scambra
107b641708
translate rename and history actions
2012-09-21 12:30:13 +02:00
Jenkins for ownCloud
8f2c76d3da
[tx-robot] updated from transifex
2012-09-21 02:04:56 +02:00
Frank Karlitschek
6c644a0c83
change the new button color on mouse over so that the user understands that the button is actually two buttons.
2012-09-20 14:59:28 +02:00
icewind1991
4ea128ee43
Merge pull request #13 from scambra/safari-fixes
...
fix js success callback on safari when uploading files
2012-09-20 02:24:27 -07:00
scambra
1b411df83e
use post to delete files, get has a limit and fails with many files
2012-09-20 08:28:35 +02:00
scambra
aee8949c92
fix js success callback on safari when uploading files
2012-09-20 08:02:55 +02:00
Jenkins for ownCloud
7c42e88676
[tx-robot] updated from transifex
2012-09-20 02:09:31 +02:00
Bernhard Posselt
1c643ce4bc
made upload button the same height in chrome and firefox
...
Signed-off-by: Tom Needham <needham.thomas@gmail.com>
2012-09-19 22:10:13 +00:00
scambra
2b5133a1c4
check free space using folder's owner
2012-09-19 21:31:29 +02:00
Tom Needham
73ed13fe75
Increase click area of breadcrumb, fix oc-703
2012-09-19 12:31:02 +00:00
Björn Schießle
223bf3e47c
fix for bug #1752 (Renaming of folders in files view does not work correctly in firefox 15)
2012-09-19 14:05:09 +02:00
Björn Schießle
c199c4ad67
Merge branch 'master' of github.com:owncloud/core
2012-09-19 12:03:58 +02:00
Björn Schießle
6596094a28
add generated unique file name to the uploadingFiles list instead of the original name
2012-09-19 12:02:36 +02:00
Björn Schießle
1e880feab1
execute lastAction() before add new one
2012-09-19 11:56:31 +02:00
Jenkins for ownCloud
b0e645fe13
[tx-robot] updated from transifex
2012-09-19 02:07:26 +02:00
Tom Needham
8a74a39c42
Fix oc-1769, renaming folders with extensions
2012-09-18 22:08:34 +00:00
Jenkins for ownCloud
06e963c54f
[tx-robot] updated from transifex
2012-09-18 02:04:26 +02:00
Tom Needham
597fed4fde
Fix oc-1726, cannot delete multiple files one by one without refresh
2012-09-17 15:29:15 +00:00
Thomas Müller
21bffbfb69
Enhanced space handling - thx fmms
2012-09-17 11:14:44 +03:00
Thomas Müller
7a7d2a06b3
Adding a few more string to translation
2012-09-17 10:54:06 +03:00
Jenkins for ownCloud
dbd2dea689
[tx-robot] updated from transifex
2012-09-17 02:07:23 +02:00
Robin Appelman
7da3492ab5
show the size of new files when using New->From Url
2012-09-16 17:05:08 +02:00
Jenkins for ownCloud
6568671bdc
[tx-robot] updated from transifex
2012-09-16 02:03:40 +02:00
Jenkins for ownCloud
fbdefd5601
[tx-robot] updated from transifex
2012-09-15 02:05:52 +02:00
Jenkins for ownCloud
e41ccd4344
[tx-robot] updated from transifex
2012-09-14 02:03:18 +02:00
Jenkins for ownCloud
bb0b438ace
[tx-robot] updated from transifex
2012-09-13 02:03:54 +02:00
Michael Gapczynski
87b7a23648
Don't get metadata directly from the 'cached' file cache after upload
2012-09-12 17:00:46 -04:00
Jenkins for ownCloud
8c9c095d48
[tx-robot] updated from transifex
2012-09-12 02:02:58 +02:00
Jenkins for ownCloud
6a29bbda7a
[tx-robot] updated from transifex
2012-09-11 02:03:53 +02:00
Jenkins for ownCloud
bd720bdf4c
[tx-robot] updated from transifex
2012-09-10 02:04:59 +02:00
Robin Appelman
a050915167
move breadcrumb css to core so we can reuse it
2012-09-09 03:00:01 +02:00
Jenkins for ownCloud
5e790368bc
[tx-robot] updated from transifex
2012-09-09 02:03:35 +02:00
Jenkins for ownCloud
d5d2e89622
[tx-robot] updated from transifex
2012-09-08 02:05:41 +02:00
Bart Visscher
5eba579827
Merge branch 'master' into routing
...
Conflicts:
apps/files/js/fileactions.js
lib/base.php
lib/helper.php
lib/ocs.php
2012-09-07 15:51:44 +02:00
Thomas Mueller
3829460ab8
adding space between) and {
2012-09-07 15:22:01 +02:00
Michael Gapczynski
73d726d1b2
Support for unshare from self, with a bunch of temporary fixes to overcome configuration problems with file actions
2012-09-07 00:02:22 -04:00
Michael Gapczynski
17dadd5c8a
Don't show the delete all action if delete permission is not granted
2012-09-07 00:02:22 -04:00
Jenkins for ownCloud
a94b56b57b
[tx-robot] updated from transifex
2012-09-07 02:07:22 +02:00
Michael Gapczynski
d936590f77
Don't pass content for a new text file from UI, fixes bug oc-1660
2012-09-06 16:01:51 -04:00
Michael Gapczynski
837eb1871d
Don't delete the file anymore to replace it in the UI, just overwrite it
2012-09-05 22:13:50 -04:00
Michael Gapczynski
a5211e31bc
Add permissions to new files/folders, bug fix for oc-1649
2012-09-05 21:47:09 -04:00
Jenkins for ownCloud
af3e767489
[tx-robot] updated from transifex
2012-09-06 02:06:37 +02:00
Bart Visscher
9329af921d
Add missing ; to js code
2012-09-05 22:26:09 +02:00
Michael Gapczynski
a26ea6d65c
Implement support for replacing files during upload with the actions: replace, suggest name, and cancel
2012-09-05 00:12:25 -04:00
Thomas Mueller
02f9de55a3
add translation string
2012-09-04 23:42:49 +02:00
Bart Visscher
f188f6cc2f
Fix some jslint warnings
2012-09-04 21:27:37 +02:00
Jenkins for ownCloud
b867b738e8
[tx-robot] updated from transifex
2012-09-04 02:03:21 +02:00
Jenkins for ownCloud
d386e0172a
[tx-robot] updated from transifex
2012-09-03 02:07:40 +02:00
Jenkins for ownCloud
2bb7cb9f64
[tx-robot] updated from transifex
2012-09-02 02:02:53 +02:00
Jenkins for ownCloud
c0c48cb3ee
[tx-robot] updated from transifex
2012-09-01 13:37:28 +02:00
Jenkins for ownCloud
ab090d5277
[tx-robot] updated from transifex
2012-09-01 02:04:00 +02:00
Jenkins for ownCloud
75cd7eacf8
[tx-robot] updated from transifex
2012-08-31 02:07:19 +02:00
Jörn Friedrich Dreyer
73d0a2b8f7
use OC.PERMISSION_X to filter selected drag'n'drop elements
2012-08-31 01:11:10 +02:00
Jörn Friedrich Dreyer
ca8120e9f4
unify permissions (3/3): remove old PERMISSION_X from FileActions & OC.Share
2012-08-31 01:11:10 +02:00
Jörn Friedrich Dreyer
3ba27e624f
unify permissions (2/3): change apps to use OC::PERMISSION_X
2012-08-31 01:11:10 +02:00
Thomas Mueller
077e988136
oc-1548: prevent user from leaving the page while a file upload is in progress
2012-08-31 00:45:03 +02:00
Jörn Friedrich Dreyer
26ef012418
use permissions to quickfix drag selections
2012-08-31 00:13:02 +02:00
Bart Visscher
b483f2aab8
Merge branch 'master' into routing
...
Conflicts:
apps/contacts/js/contacts.js
apps/contacts/lib/search.php
apps/files_archive/js/archive.js
apps/gallery/lib/tiles.php
apps/gallery/templates/index.php
lib/ocs.php
2012-08-30 21:49:28 +02:00
Jenkins for ownCloud
898ca364a2
[tx-robot] updated from transifex
2012-08-30 02:06:45 +02:00
Bart Visscher
db18218a1b
Space before tab fixes
2012-08-29 20:34:44 +02:00
Bart Visscher
0e58800016
Whitespace fixes in apps
2012-08-29 20:29:43 +02:00
Bart Visscher
cbaf858dea
Merge remote-tracking branch 'gitorious/master' into routing
...
Conflicts:
apps/files/js/fileactions.js
apps/files_archive/js/archive.js
2012-08-29 20:16:39 +02:00
Jenkins for ownCloud
9338d093f9
[tx-robot] updated from transifex
2012-08-29 02:06:48 +02:00
Thomas Mueller
b64229a89e
apply coding style
2012-08-29 01:39:42 +02:00
Thomas Mueller
fe49cbafc7
apply coding style
2012-08-29 00:50:12 +02:00
Thomas Mueller
f301bfd8c9
apply coding style
2012-08-29 00:36:27 +02:00
Jenkins for ownCloud
8374a49cc1
[tx-robot] updated from transifex
2012-08-28 02:03:56 +02:00
Jan-Christoph Borchardt
6b5f1ffdb4
upload button improvement, better separation, fix wrap issue
2012-08-27 14:05:18 -07:00
Jenkins for ownCloud
faf702b9e6
[tx-robot] updated from transifex
2012-08-26 19:47:33 +02:00
Jenkins for ownCloud
bae07faa34
[tx-robot] updated from transifex
2012-08-26 01:20:16 +02:00
Jenkins for ownCloud
c82518cb0e
[tx-robot] updated from transifex
2012-08-26 00:12:05 +02:00
Jörn Friedrich Dreyer
4f5eff2b6f
Merge branch 'master' of git://gitorious.org/owncloud/owncloud into oracle-support
2012-08-25 03:14:26 +02:00
Jenkins for ownCloud
f57d527a7c
[tx-robot] updated from transifex
2012-08-25 02:08:36 +02:00
Jörn Friedrich Dreyer
fa3497f6ed
add backticks to SQL, use limit parameter instead of LIMIT SQL
2012-08-25 01:52:27 +02:00
Jörn Friedrich Dreyer
fd5af9aff4
Merge branch 'master' of git://gitorious.org/owncloud/owncloud into oracle-support
2012-08-25 00:06:20 +02:00
Jörn Friedrich Dreyer
c8255a170c
Merge branch 'master' of git://gitorious.org/owncloud/owncloud into oracle-support
...
Conflicts:
3rdparty/Sabre/CardDAV/Plugin.php
3rdparty/smb4php/smb.php
apps/bookmarks/ajax/addBookmark.php
apps/bookmarks/ajax/editBookmark.php
apps/bookmarks/appinfo/migrate.php
apps/calendar/ajax/calendar/edit.form.php
apps/calendar/ajax/changeview.php
apps/calendar/ajax/import/import.php
apps/calendar/ajax/settings/guesstimezone.php
apps/calendar/ajax/settings/setfirstday.php
apps/calendar/ajax/settings/settimeformat.php
apps/calendar/ajax/share/changepermission.php
apps/calendar/ajax/share/share.php
apps/calendar/ajax/share/unshare.php
apps/calendar/appinfo/app.php
apps/calendar/appinfo/remote.php
apps/calendar/appinfo/update.php
apps/calendar/appinfo/version
apps/calendar/js/calendar.js
apps/calendar/l10n/da.php
apps/calendar/l10n/de.php
apps/calendar/l10n/fi_FI.php
apps/calendar/l10n/gl.php
apps/calendar/l10n/he.php
apps/calendar/l10n/hr.php
apps/calendar/l10n/ja_JP.php
apps/calendar/l10n/lb.php
apps/calendar/l10n/lt_LT.php
apps/calendar/l10n/nb_NO.php
apps/calendar/l10n/pl.php
apps/calendar/l10n/pt_PT.php
apps/calendar/l10n/ro.php
apps/calendar/l10n/ru.php
apps/calendar/l10n/sv.php
apps/calendar/l10n/zh_CN.php
apps/calendar/l10n/zh_TW.php
apps/calendar/lib/app.php
apps/calendar/lib/calendar.php
apps/calendar/lib/object.php
apps/calendar/lib/share.php
apps/calendar/templates/part.choosecalendar.rowfields.php
apps/calendar/templates/part.import.php
apps/calendar/templates/settings.php
apps/contacts/ajax/activation.php
apps/contacts/ajax/addressbook/delete.php
apps/contacts/ajax/contact/add.php
apps/contacts/ajax/contact/addproperty.php
apps/contacts/ajax/contact/delete.php
apps/contacts/ajax/contact/deleteproperty.php
apps/contacts/ajax/contact/saveproperty.php
apps/contacts/ajax/createaddressbook.php
apps/contacts/ajax/cropphoto.php
apps/contacts/ajax/currentphoto.php
apps/contacts/ajax/importaddressbook.php
apps/contacts/ajax/oc_photo.php
apps/contacts/ajax/savecrop.php
apps/contacts/ajax/selectaddressbook.php
apps/contacts/ajax/updateaddressbook.php
apps/contacts/ajax/uploadimport.php
apps/contacts/ajax/uploadphoto.php
apps/contacts/appinfo/migrate.php
apps/contacts/appinfo/remote.php
apps/contacts/css/contacts.css
apps/contacts/import.php
apps/contacts/index.php
apps/contacts/js/contacts.js
apps/contacts/l10n/ca.php
apps/contacts/l10n/cs_CZ.php
apps/contacts/l10n/da.php
apps/contacts/l10n/de.php
apps/contacts/l10n/el.php
apps/contacts/l10n/eo.php
apps/contacts/l10n/es.php
apps/contacts/l10n/et_EE.php
apps/contacts/l10n/eu.php
apps/contacts/l10n/fa.php
apps/contacts/l10n/fi_FI.php
apps/contacts/l10n/fr.php
apps/contacts/l10n/he.php
apps/contacts/l10n/hr.php
apps/contacts/l10n/hu_HU.php
apps/contacts/l10n/ia.php
apps/contacts/l10n/it.php
apps/contacts/l10n/ja_JP.php
apps/contacts/l10n/ko.php
apps/contacts/l10n/lb.php
apps/contacts/l10n/mk.php
apps/contacts/l10n/nb_NO.php
apps/contacts/l10n/nl.php
apps/contacts/l10n/pl.php
apps/contacts/l10n/pt_BR.php
apps/contacts/l10n/pt_PT.php
apps/contacts/l10n/ro.php
apps/contacts/l10n/ru.php
apps/contacts/l10n/sk_SK.php
apps/contacts/l10n/sl.php
apps/contacts/l10n/sv.php
apps/contacts/l10n/th_TH.php
apps/contacts/l10n/tr.php
apps/contacts/l10n/zh_CN.php
apps/contacts/l10n/zh_TW.php
apps/contacts/lib/addressbook.php
apps/contacts/lib/hooks.php
apps/contacts/lib/vcard.php
apps/contacts/photo.php
apps/contacts/templates/part.contact.php
apps/contacts/templates/part.contacts.php
apps/contacts/templates/part.cropphoto.php
apps/contacts/templates/part.importaddressbook.php
apps/contacts/templates/part.selectaddressbook.php
apps/contacts/thumbnail.php
apps/files/ajax/download.php
apps/files/ajax/newfile.php
apps/files/ajax/timezone.php
apps/files/appinfo/update.php
apps/files/appinfo/version
apps/files/index.php
apps/files/js/fileactions.js
apps/files/js/filelist.js
apps/files/js/files.js
apps/files/l10n/ar.php
apps/files/l10n/bg_BG.php
apps/files/l10n/ca.php
apps/files/l10n/cs_CZ.php
apps/files/l10n/da.php
apps/files/l10n/de.php
apps/files/l10n/el.php
apps/files/l10n/eo.php
apps/files/l10n/es.php
apps/files/l10n/et_EE.php
apps/files/l10n/eu.php
apps/files/l10n/fa.php
apps/files/l10n/fi_FI.php
apps/files/l10n/fr.php
apps/files/l10n/gl.php
apps/files/l10n/he.php
apps/files/l10n/hr.php
apps/files/l10n/hu_HU.php
apps/files/l10n/ia.php
apps/files/l10n/id.php
apps/files/l10n/it.php
apps/files/l10n/ja_JP.php
apps/files/l10n/ko.php
apps/files/l10n/lb.php
apps/files/l10n/lt_LT.php
apps/files/l10n/mk.php
apps/files/l10n/ms_MY.php
apps/files/l10n/nb_NO.php
apps/files/l10n/nl.php
apps/files/l10n/nn_NO.php
apps/files/l10n/pl.php
apps/files/l10n/pt_BR.php
apps/files/l10n/pt_PT.php
apps/files/l10n/ro.php
apps/files/l10n/ru.php
apps/files/l10n/sk_SK.php
apps/files/l10n/sl.php
apps/files/l10n/sr.php
apps/files/l10n/sr@latin.php
apps/files/l10n/sv.php
apps/files/l10n/th_TH.php
apps/files/l10n/tr.php
apps/files/l10n/uk.php
apps/files/l10n/zh_CN.php
apps/files/l10n/zh_TW.php
apps/files_archive/js/archive.js
apps/files_encryption/lib/cryptstream.php
apps/files_encryption/lib/proxy.php
apps/files_encryption/tests/proxy.php
apps/files_external/appinfo/app.php
apps/files_external/lib/smb.php
apps/files_external/lib/streamwrapper.php
apps/files_external/tests/config.php
apps/files_external/tests/smb.php
apps/files_sharing/ajax/email.php
apps/files_sharing/ajax/getitem.php
apps/files_sharing/ajax/setpermissions.php
apps/files_sharing/ajax/share.php
apps/files_sharing/ajax/toggleresharing.php
apps/files_sharing/ajax/unshare.php
apps/files_sharing/ajax/userautocomplete.php
apps/files_sharing/js/settings.js
apps/files_sharing/js/share.js
apps/files_sharing/lib_share.php
apps/files_sharing/settings.php
apps/files_sharing/sharedstorage.php
apps/files_sharing/templates/settings.php
apps/files_versions/ajax/rollbackVersion.php
apps/files_versions/versions.php
apps/gallery/ajax/thumbnail.php
apps/gallery/appinfo/app.php
apps/gallery/appinfo/update.php
apps/gallery/appinfo/version
apps/gallery/css/styles.css
apps/gallery/index.php
apps/gallery/js/pictures.js
apps/gallery/l10n/ca.php
apps/gallery/l10n/cs_CZ.php
apps/gallery/l10n/de.php
apps/gallery/l10n/el.php
apps/gallery/l10n/es.php
apps/gallery/l10n/fi_FI.php
apps/gallery/l10n/fr.php
apps/gallery/l10n/it.php
apps/gallery/l10n/pl.php
apps/gallery/l10n/pt_PT.php
apps/gallery/l10n/ru.php
apps/gallery/l10n/sl.php
apps/gallery/l10n/sv.php
apps/gallery/l10n/th_TH.php
apps/gallery/l10n/tr.php
apps/gallery/l10n/zh_CN.php
apps/gallery/lib/album.php
apps/gallery/lib/hooks_handlers.php
apps/gallery/lib/managers.php
apps/gallery/lib/photo.php
apps/gallery/lib/tiles.php
apps/gallery/lib/tiles_test.php
apps/gallery/templates/index.php
apps/media/lib_ampache.php
apps/media/lib_collection.php
apps/media/lib_media.php
apps/remoteStorage/lib_remoteStorage.php
apps/tasks/ajax/addtaskform.php
apps/tasks/ajax/edittask.php
apps/user_ldap/appinfo/update.php
apps/user_ldap/group_ldap.php
apps/user_ldap/lib_ldap.php
apps/user_ldap/settings.php
apps/user_ldap/templates/settings.php
apps/user_ldap/user_ldap.php
apps/user_migrate/appinfo/app.php
apps/user_migrate/templates/settings.php
apps/user_webfinger/host-meta.php
config/config.sample.php
core/js/js.js
core/l10n/da.php
core/l10n/de.php
core/l10n/fi_FI.php
core/l10n/gl.php
core/l10n/he.php
core/l10n/hr.php
core/l10n/id.php
core/l10n/ja_JP.php
core/l10n/lb.php
core/l10n/lt_LT.php
core/l10n/nb_NO.php
core/l10n/pl.php
core/l10n/pt_PT.php
core/l10n/ro.php
core/l10n/ru.php
core/l10n/sv.php
core/lostpassword/index.php
core/templates/layout.user.php
core/templates/login.php
db_structure.xml
index.php
l10n/af/calendar.po
l10n/af/contacts.po
l10n/af/core.po
l10n/af/files.po
l10n/af/settings.po
l10n/ar/calendar.po
l10n/ar/contacts.po
l10n/ar/core.po
l10n/ar/files.po
l10n/ar/media.po
l10n/ar/settings.po
l10n/bg_BG/calendar.po
l10n/bg_BG/contacts.po
l10n/bg_BG/core.po
l10n/bg_BG/files.po
l10n/bg_BG/media.po
l10n/bg_BG/settings.po
l10n/ca/calendar.po
l10n/ca/contacts.po
l10n/ca/core.po
l10n/ca/files.po
l10n/ca/gallery.po
l10n/ca/settings.po
l10n/cs_CZ/calendar.po
l10n/cs_CZ/contacts.po
l10n/cs_CZ/core.po
l10n/cs_CZ/files.po
l10n/cs_CZ/gallery.po
l10n/cs_CZ/settings.po
l10n/da/calendar.po
l10n/da/contacts.po
l10n/da/core.po
l10n/da/files.po
l10n/da/settings.po
l10n/de/calendar.po
l10n/de/contacts.po
l10n/de/core.po
l10n/de/files.po
l10n/de/gallery.po
l10n/de/settings.po
l10n/el/calendar.po
l10n/el/contacts.po
l10n/el/core.po
l10n/el/files.po
l10n/el/gallery.po
l10n/el/settings.po
l10n/eo/calendar.po
l10n/eo/contacts.po
l10n/eo/core.po
l10n/eo/files.po
l10n/eo/media.po
l10n/eo/settings.po
l10n/es/calendar.po
l10n/es/contacts.po
l10n/es/core.po
l10n/es/files.po
l10n/es/gallery.po
l10n/es/settings.po
l10n/et_EE/calendar.po
l10n/et_EE/contacts.po
l10n/et_EE/core.po
l10n/et_EE/files.po
l10n/et_EE/settings.po
l10n/eu/calendar.po
l10n/eu/contacts.po
l10n/eu/core.po
l10n/eu/files.po
l10n/eu/settings.po
l10n/fa/calendar.po
l10n/fa/contacts.po
l10n/fa/core.po
l10n/fa/files.po
l10n/fa/settings.po
l10n/fi_FI/calendar.po
l10n/fi_FI/contacts.po
l10n/fi_FI/core.po
l10n/fi_FI/files.po
l10n/fi_FI/gallery.po
l10n/fi_FI/settings.po
l10n/fr/calendar.po
l10n/fr/contacts.po
l10n/fr/core.po
l10n/fr/files.po
l10n/fr/gallery.po
l10n/fr/media.po
l10n/fr/settings.po
l10n/gl/calendar.po
l10n/gl/contacts.po
l10n/gl/core.po
l10n/gl/files.po
l10n/gl/settings.po
l10n/he/calendar.po
l10n/he/contacts.po
l10n/he/core.po
l10n/he/files.po
l10n/he/settings.po
l10n/hr/calendar.po
l10n/hr/contacts.po
l10n/hr/core.po
l10n/hr/files.po
l10n/hr/settings.po
l10n/hu_HU/calendar.po
l10n/hu_HU/contacts.po
l10n/hu_HU/core.po
l10n/hu_HU/files.po
l10n/hu_HU/settings.po
l10n/hy/calendar.po
l10n/hy/contacts.po
l10n/hy/core.po
l10n/hy/files.po
l10n/hy/settings.po
l10n/ia/calendar.po
l10n/ia/contacts.po
l10n/ia/core.po
l10n/ia/files.po
l10n/ia/settings.po
l10n/id/calendar.po
l10n/id/contacts.po
l10n/id/core.po
l10n/id/files.po
l10n/id/settings.po
l10n/it/calendar.po
l10n/it/contacts.po
l10n/it/core.po
l10n/it/files.po
l10n/it/gallery.po
l10n/it/settings.po
l10n/ja_JP/calendar.po
l10n/ja_JP/contacts.po
l10n/ja_JP/core.po
l10n/ja_JP/files.po
l10n/ja_JP/settings.po
l10n/ko/calendar.po
l10n/ko/contacts.po
l10n/ko/core.po
l10n/ko/files.po
l10n/ko/settings.po
l10n/lb/calendar.po
l10n/lb/contacts.po
l10n/lb/core.po
l10n/lb/files.po
l10n/lb/settings.po
l10n/lt_LT/calendar.po
l10n/lt_LT/contacts.po
l10n/lt_LT/core.po
l10n/lt_LT/files.po
l10n/lt_LT/settings.po
l10n/mk/calendar.po
l10n/mk/contacts.po
l10n/mk/core.po
l10n/mk/files.po
l10n/mk/settings.po
l10n/ms_MY/calendar.po
l10n/ms_MY/contacts.po
l10n/ms_MY/core.po
l10n/ms_MY/files.po
l10n/ms_MY/settings.po
l10n/nb_NO/calendar.po
l10n/nb_NO/contacts.po
l10n/nb_NO/core.po
l10n/nb_NO/files.po
l10n/nb_NO/settings.po
l10n/nl/calendar.po
l10n/nl/contacts.po
l10n/nl/core.po
l10n/nl/files.po
l10n/nl/settings.po
l10n/nn_NO/calendar.po
l10n/nn_NO/contacts.po
l10n/nn_NO/core.po
l10n/nn_NO/files.po
l10n/nn_NO/settings.po
l10n/pl/calendar.po
l10n/pl/contacts.po
l10n/pl/core.po
l10n/pl/files.po
l10n/pl/gallery.po
l10n/pl/settings.po
l10n/pt_BR/calendar.po
l10n/pt_BR/contacts.po
l10n/pt_BR/core.po
l10n/pt_BR/files.po
l10n/pt_BR/settings.po
l10n/pt_PT/calendar.po
l10n/pt_PT/contacts.po
l10n/pt_PT/core.po
l10n/pt_PT/files.po
l10n/pt_PT/gallery.po
l10n/pt_PT/settings.po
l10n/ro/calendar.po
l10n/ro/contacts.po
l10n/ro/core.po
l10n/ro/files.po
l10n/ro/settings.po
l10n/ru/calendar.po
l10n/ru/contacts.po
l10n/ru/core.po
l10n/ru/files.po
l10n/ru/gallery.po
l10n/ru/settings.po
l10n/sk_SK/calendar.po
l10n/sk_SK/contacts.po
l10n/sk_SK/core.po
l10n/sk_SK/files.po
l10n/sk_SK/settings.po
l10n/sl/calendar.po
l10n/sl/contacts.po
l10n/sl/core.po
l10n/sl/files.po
l10n/sl/gallery.po
l10n/sl/settings.po
l10n/sr/calendar.po
l10n/sr/contacts.po
l10n/sr/core.po
l10n/sr/files.po
l10n/sr/settings.po
l10n/sr@latin/calendar.po
l10n/sr@latin/contacts.po
l10n/sr@latin/core.po
l10n/sr@latin/files.po
l10n/sr@latin/settings.po
l10n/sv/calendar.po
l10n/sv/contacts.po
l10n/sv/core.po
l10n/sv/files.po
l10n/sv/gallery.po
l10n/sv/media.po
l10n/sv/settings.po
l10n/templates/bookmarks.pot
l10n/templates/calendar.pot
l10n/templates/contacts.pot
l10n/templates/core.pot
l10n/templates/files.pot
l10n/templates/gallery.pot
l10n/templates/media.pot
l10n/templates/settings.pot
l10n/th_TH/calendar.po
l10n/th_TH/contacts.po
l10n/th_TH/core.po
l10n/th_TH/files.po
l10n/th_TH/gallery.po
l10n/th_TH/settings.po
l10n/tr/calendar.po
l10n/tr/contacts.po
l10n/tr/core.po
l10n/tr/files.po
l10n/tr/gallery.po
l10n/tr/settings.po
l10n/uk/calendar.po
l10n/uk/contacts.po
l10n/uk/core.po
l10n/uk/files.po
l10n/uk/media.po
l10n/uk/settings.po
l10n/zh_CN/calendar.po
l10n/zh_CN/contacts.po
l10n/zh_CN/core.po
l10n/zh_CN/files.po
l10n/zh_CN/gallery.po
l10n/zh_CN/settings.po
l10n/zh_TW/calendar.po
l10n/zh_TW/contacts.po
l10n/zh_TW/core.po
l10n/zh_TW/files.po
l10n/zh_TW/settings.po
lib/app.php
lib/base.php
lib/connector/sabre/file.php
lib/connector/sabre/locks.php
lib/connector/sabre/node.php
lib/db.php
lib/filecache.php
lib/fileproxy/quota.php
lib/files.php
lib/filestorage/local.php
lib/filesystemview.php
lib/group/database.php
lib/helper.php
lib/installer.php
lib/json.php
lib/l10n.php
lib/migrate.php
lib/mimetypes.fixlist.php
lib/ocs.php
lib/preferences.php
lib/public/json.php
lib/public/util.php
lib/template.php
lib/user.php
lib/user/database.php
lib/util.php
lib/vcategories.php
ocs/providers.php
settings/admin.php
settings/ajax/lostpassword.php
settings/ajax/removeuser.php
settings/ajax/setbackgroundjobsmode.php
settings/ajax/setlanguage.php
settings/ajax/setquota.php
settings/ajax/togglegroups.php
settings/apps.php
settings/css/settings.css
settings/js/apps.js
settings/js/users.js
settings/l10n/bg_BG.php
settings/l10n/ca.php
settings/l10n/cs_CZ.php
settings/l10n/da.php
settings/l10n/de.php
settings/l10n/el.php
settings/l10n/eo.php
settings/l10n/es.php
settings/l10n/et_EE.php
settings/l10n/eu.php
settings/l10n/fa.php
settings/l10n/fi_FI.php
settings/l10n/fr.php
settings/l10n/gl.php
settings/l10n/he.php
settings/l10n/hr.php
settings/l10n/hu_HU.php
settings/l10n/it.php
settings/l10n/ja_JP.php
settings/l10n/ko.php
settings/l10n/lt_LT.php
settings/l10n/mk.php
settings/l10n/ms_MY.php
settings/l10n/nb_NO.php
settings/l10n/nl.php
settings/l10n/nn_NO.php
settings/l10n/pl.php
settings/l10n/pt_BR.php
settings/l10n/pt_PT.php
settings/l10n/ru.php
settings/l10n/sk_SK.php
settings/l10n/sl.php
settings/l10n/sv.php
settings/l10n/th_TH.php
settings/l10n/tr.php
settings/l10n/zh_CN.php
settings/personal.php
settings/templates/admin.php
settings/templates/users.php
2012-08-25 00:05:07 +02:00
Michael Gapczynski
0c4575db7a
Temporary fix to prevent rename action in root of Shared directory
2012-08-24 15:12:16 -04:00
Michael Gapczynski
36487246ed
Switch to using file cache ids instead of paths for file sharing
2012-08-24 10:05:37 -04:00
Arthur Schiwon
eadb894eff
Fix deletion for browser that do not support onBeforeUnload, fixes oc-1534
2012-08-24 15:00:53 +02:00
Lukas Reschke
9188d2a844
Add a missing exit();
2012-08-24 15:00:53 +02:00
Lukas Reschke
4e5291c77a
Use SCRIPT_NAME instead of PHP_SELF which won't send the PATH_INFO, this prevents XSS in old browsers. Thanks to Nico Golde.
2012-08-24 15:00:53 +02:00
Jenkins for ownCloud
07a889631e
[tx-robot] updated from transifex
2012-08-24 02:07:18 +02:00
Juan Carlos Cornejo
0944b4455b
Moves the lastAction=null outside the if so it can include the undo requests from replace
2012-08-22 17:08:10 -04:00
Juan Carlos Cornejo
24a207a8fa
Fixes a bug where if one tries to delete a file, then clicks undo, and then tries to delete the file again, no questions or undo options were presented.
...
Essentially, just set FileLists.lastAction = null when one clicks undo.
2012-08-22 16:56:00 -04:00
Jenkins for ownCloud
e6d87b2c4b
[tx-robot] updated from transifex
2012-08-22 02:08:16 +02:00
Michael Gapczynski
53350b2f19
Remove unnecessary file
2012-08-21 10:33:20 -04:00
Jenkins for ownCloud
b819aa33f7
[tx-robot] updated from transifex
2012-08-21 02:09:12 +02:00
Arthur Schiwon
ef3eebfd3e
Fix deletion for browser that do not support onBeforeUnload, fixes oc-1534.
2012-08-20 17:24:10 +02:00
Michael Gapczynski
82d81e8d39
Merge branch 'share_api'
...
Conflicts:
apps/contacts/lib/vcard.php
apps/files/index.php
lib/files.php
2012-08-19 22:29:01 -04:00
Jenkins for ownCloud
36474e5681
[tx-robot] updated from transifex
2012-08-20 02:01:32 +02:00
Lukas Reschke
6ef5edf5ea
Use SCRIPT_NAME instead of PHP_SELF which won't send the PATH_INFO, this prevents XSS in old browsers. Thanks to Nico Golde.
2012-08-18 09:30:01 +02:00
Robin Appelman
53a888cc81
more path normalization
2012-08-17 01:22:54 +02:00
Jenkins for ownCloud
1e6dc67517
[tx-robot] updated from transifex
2012-08-16 02:09:15 +02:00
Bart Visscher
ddfb9de147
Fix linkTo calls for new routing
2012-08-15 18:16:06 +02:00
Jenkins for ownCloud
da3896808a
[tx-robot] updated from transifex
2012-08-15 02:07:20 +02:00
Michael Gapczynski
4c7fd8cd01
Merge branch 'master' into share_api
...
Conflicts:
lib/group.php
lib/group/backend.php
lib/group/database.php
lib/group/interface.php
lib/public/user.php
lib/user.php
lib/user/backend.php
lib/user/database.php
lib/user/interface.php
2012-08-14 10:22:13 -04:00
Jenkins for ownCloud
355a1adb3a
[tx-robot] updated from transifex
2012-08-12 02:04:58 +02:00
Michael Gapczynski
78cd1153f0
Merge branch 'master' into share_api
...
Conflicts:
apps/contacts/lib/vcard.php
apps/files_sharing/sharedstorage.php
2012-08-09 11:38:22 -04:00
Bart Visscher
10cfcd4ff0
Remove useless setting of RUNTIME_NOAPPS
2012-08-08 22:42:50 +02:00
Jenkins for ownCloud
a9f894ce11
[tx-robot] updated from transifex
2012-08-07 02:07:50 +02:00
Michael Gapczynski
de7f48b050
Check if New and Upload buttons exist before adding their width to the total breadcrumbs width
2012-08-06 17:37:10 -04:00
Michael Gapczynski
7c0a5d4a59
Check if New and Upload buttons exist before adding their width to the total breadcrumbs width
2012-08-06 17:35:22 -04:00
Michael Gapczynski
ea23854328
Merge branch 'master' into share_api
...
Conflicts:
apps/contacts/lib/app.php
apps/contacts/templates/part.chooseaddressbook.rowfields.php
2012-08-06 13:49:54 -04:00
Jenkins for ownCloud
9ca8d20a99
[tx-robot] updated from transifex
2012-08-06 02:02:50 +02:00
Michael Gapczynski
002ad4ba16
Tweak users delete notification
2012-08-04 16:44:26 -04:00
Michael Gapczynski
086397d8a1
Fix condition checking for resizing breadcrumbs
2012-08-04 15:57:49 -04:00
Michael Gapczynski
207ca3ec06
Dynamically resize breadcrumbs, fix for bug oc-468
2012-08-04 15:50:32 -04:00
Bart Visscher
e36e00dc00
Merge branch 'chunked_upload'
2012-08-03 15:58:17 +02:00
Jenkins for ownCloud
7dc799c167
[tx-robot] updated from transifex
2012-08-03 02:04:12 +02:00
Jenkins for ownCloud
274d1ef87f
[tx-robot] updated from transifex
2012-08-01 02:02:35 +02:00
Jenkins for ownCloud
36ccaf51ed
[tx-robot] updated from transifex
2012-07-31 22:57:24 +02:00
Michael Gapczynski
94ce8f2168
Merge branch 'master' into share_api
...
Conflicts:
apps/contacts/lib/app.php
apps/files_sharing/js/share.js
2012-07-31 15:00:04 -04:00
jfd
ede464f058
escape all identifiers with backticks
2012-07-31 18:53:05 +02:00
Michael Gapczynski
dfae77dec1
Add notifications and undo support for replacing files when renaming
2012-07-30 12:22:11 -04:00
Michael Gapczynski
519eb39422
Remove delete tipsy if file is deleted, fixes bug oc-958
2012-07-30 10:07:19 -04:00
Jenkins for ownCloud
3430dcd367
[tx-robot] updated from transifex
2012-07-30 02:05:41 +02:00
Michael Gapczynski
e18639551d
Tweak appearance of undo delete notification
2012-07-29 18:02:08 -04:00
Jenkins for ownCloud
18f6552a08
[tx-robot] updated from transifex
2012-07-29 02:06:29 +02:00
Michael Gapczynski
e02d8d7f7e
Remove delete tipsy if file is deleted, fixes bug oc-958
2012-07-27 21:28:41 -04:00
Bart Visscher
896d27de36
Chunked upload: Support reusing local chunks
2012-07-27 19:35:33 +02:00
Jenkins for ownCloud
0a9c33e151
[tx-robot] updated from transifex
2012-07-27 02:04:26 +02:00
Jenkins for ownCloud
ba0ea21074
[tx-robot] updated from transifex
2012-07-26 08:04:12 +02:00
Jenkins for ownCloud
42c22bee36
[tx-robot] updated from transifex
2012-07-26 08:03:10 +02:00
Michael Gapczynski
30b58f5677
Merge branch 'master' into share_api
...
Conflicts:
apps/calendar/js/loader.js
apps/contacts/index.php
apps/contacts/js/loader.js
apps/files/js/files.js
apps/files_sharing/sharedstorage.php
lib/filesystemview.php
2012-07-25 17:08:18 -04:00
Michael Gapczynski
4d17ed2f71
Make file actions permissions aware
2012-07-25 16:33:08 -04:00
Michael Gapczynski
6f58eca534
Change read only check to isCreatable
2012-07-24 21:35:03 -04:00
Michael Gapczynski
b58e72cdb2
Alert user of errors when creating new files or folders
2012-07-23 22:35:34 -04:00
Bjoern Schiessle
73734c98e0
- remove namespace from file property name (webdav)
...
- update script to fix broken properties in the database
2012-07-23 11:00:37 +02:00
Bjoern Schiessle
bd63fddbf4
fix broken properties in the database
2012-07-23 10:34:01 +02:00
Bjoern Schiessle
708c771296
update routine to fix broken file properties in db
2012-07-23 10:25:26 +02:00
Robin Appelman
b1010160b3
CSRF protection for eventsource
2012-07-22 16:37:49 +02:00
Robin Appelman
a49c07cf88
progressbar for New->From Url
2012-07-22 03:56:51 +02:00
Robin Appelman
59ab8b14c7
cache fileid's in oc_cache
2012-07-22 03:24:34 +02:00
Lukas Reschke
38271ded75
Added CSRF checks
2012-07-20 20:12:36 +02:00
Robin Appelman
b45d3ced79
fix remote and public.php
2012-07-13 22:44:35 +02:00
Lukas Reschke
d203fa2c50
Sanitizing file names
2012-07-11 19:15:11 +02:00
Lukas Reschke
c3fea30811
Sanitizing file names
2012-07-11 19:14:04 +02:00
Michael Gapczynski
0b14b4e3e8
Call exit() to prevent further code execution if directory does not exist
2012-07-11 02:33:11 +02:00
Jörn Friedrich Dreyer
e59a1806cf
remove superfluous ?> at the end of .php files (left out apps/*/templates)
2012-07-09 16:51:16 +02:00
Lukas Reschke
0abcf0a421
CSRF checks
2012-07-07 15:58:11 +02:00
Bjoern Schiessle
b95996c02c
- when creating a new text file or directory which name already exist use the same pattern as for file uploads in such a case (add a (N) to the name)
...
- don't allow renaming if a file/directory with the name already exists
2012-06-29 15:23:04 +02:00
Bjoern Schiessle
cd005e6c62
use new sanitizeHTML() function
2012-06-21 10:28:43 +02:00
Robin Appelman
bf2062b09d
write_close the session when scanning files or music
2012-06-16 01:35:39 +02:00
Robin Appelman
f06c08a637
cleanup oc_filecache, splitting it in several parts and using the new hasUpdated
2012-06-15 19:56:15 +02:00
Thomas Tanghus
5c6a7172ca
Files: Double encode download links. Fix for oc-1016.
2012-06-15 15:58:10 +02:00
Thomas Tanghus
8f6121ffa8
Files: Double encode download links. Fix for oc-1016.
2012-06-15 15:57:04 +02:00
Michael Gapczynski
b5889d6ffe
Merge commit 'refs/merge-requests/127' of git://gitorious.org/owncloud/owncloud into merge-requests/127
...
Conflicts:
apps/files_external/templates/settings.php
lib/template.php
2012-06-13 15:17:46 -04:00
Bjoern Schiessle
635a2f8ec9
Label the delete operation "unshare" for files in the "Shared" folder to reduce
...
confusion about the operation.
2012-06-12 16:32:00 +02:00
Bjoern Schiessle
8626f04f5d
Label the delete operation "unshare" for files in the "Shared" folder to reduce
...
confusion about the operation.
2012-06-12 16:27:24 +02:00
Bjoern Schiessle
ef6b6ac230
block slashes only for new files and new folders but not for file upload from url (bug #964 )
2012-06-12 14:16:09 +02:00
Bjoern Schiessle
f6e7c633a0
block slashes only for new files and new folders but not for file upload from url (bug #964 )
2012-06-12 14:11:28 +02:00
Bjoern Schiessle
4501407283
committed patch (bug #967 ) to add missing translations for file actions
2012-06-12 11:41:13 +02:00
Bjoern Schiessle
b38ce8adfd
committed patch (bug #967 ) to add missing translations for file actions
2012-06-12 11:39:03 +02:00
Lukas Reschke
6defbc7f4d
Removed some unessecary sanitizations
2012-06-11 19:20:48 +02:00
Lukas Reschke
2b22c538c8
Make some apps compatible
2012-06-11 19:07:51 +02:00
Lukas Reschke
c009bc4b87
Revert
2012-06-11 13:27:32 +02:00
Lukas Reschke
6817a6b102
First try of implementing assignHTML
2012-06-11 12:45:07 +02:00
Bjoern Schiessle
bb07c20bf4
fixed var name, $filename should be $foldername
2012-06-06 18:11:23 +02:00
Bjoern Schiessle
c960e42a17
fixed var name, $filename should be $foldername
2012-06-06 18:08:51 +02:00
Robin Appelman
f1b10fcc93
update translations
2012-06-06 00:29:44 +02:00
Robin Appelman
f7d221f5f0
update translations
2012-06-06 00:29:28 +02:00
Robin Appelman
a3c1f70be4
dont show config option for file upload size if we cant write the new value
2012-06-06 00:24:15 +02:00
Robin Appelman
063c9accb6
prevent creating files with a / the name
2012-06-06 00:04:02 +02:00
Robin Appelman
e6c4e53486
prevent creating files with a / the name
2012-06-06 00:02:51 +02:00
Arthur Schiwon
769d94ab26
linkTo instead of hard links in Files and Files_Archive. Hope that makes sense.
2012-06-05 14:14:26 +02:00
Bart Visscher
4a5973662c
Merge branch 'unstable'
...
Conflicts:
apps/files_external/tests/config.php
apps/files_versions/ajax/getVersions.php
apps/files_versions/appinfo/app.php
apps/files_versions/history.php
apps/files_versions/js/versions.js
apps/files_versions/templates/history.php
apps/files_versions/versions.php
lib/base.php
2012-06-04 23:02:05 +02:00
Bjoern Schiessle
c8f670dfab
Don't allow user to delete, rename and re-share the "Shared" directory
2012-06-04 14:00:35 +02:00
Bjoern Schiessle
2d80c148ba
Don't allow user to delete, rename and re-share the "Shared" directory
2012-06-04 10:42:09 +02:00
Frank Karlitschek
83c6714c72
don´t start a session here. I don´t think it´s needed. Let´s see if it breaks something
2012-06-01 11:12:50 +02:00
Frank Karlitschek
8ed13e627e
don´t do warnings.
...
Not sure if this start_session call is really needed here.
2012-06-01 11:08:40 +02:00
Frank Karlitschek
baae4c741d
fix the breadcrumb
2012-05-31 21:44:05 +02:00
Frank Karlitschek
670022cc8a
fix the breadcrumb
2012-05-31 21:43:07 +02:00
Arthur Schiwon
3db28d7616
linkTo instead of hard links in Files and Files_Archive. Hope that makes sense.
2012-05-31 19:46:51 +02:00
Bart Visscher
a33f580db1
Remove OC_App::register function
...
The data supplied is never used in OwnCloud. Removed the call from all the apps, and made the public API function empty.
2012-05-31 13:01:30 +02:00
Frank Karlitschek
a945fa10a6
update copyright
2012-05-26 19:14:24 +02:00
Brice Maron
2774ff1ad8
Add HEAD request management for files ajax/download.php
2012-05-25 11:19:38 +02:00
Brice Maron
9c2a6fb551
Add HEAD request management for files ajax/download.php
2012-05-24 22:48:10 +00:00
Brice Maron
5fa14806c8
Add translation for error message
2012-05-24 19:16:00 +00:00
Brice Maron
2c9311cf48
Add error message when uploading folder or null files. ref oc-739
2012-05-24 18:47:34 +00:00
Brice Maron
f00a50c76a
Add pending line in file list before trying to upload. Correct indentation
2012-05-24 16:56:19 +00:00
Michael Gapczynski
5a48ade933
Make sure sharing and versions dropdowns come down in the same location for all files
2012-05-19 11:24:23 -04:00
Arthur Schiwon
e606213fa0
make upload work with IE again
2012-05-18 17:07:00 +02:00
Frank Karlitschek
9e73524168
mark the apps as part of the shipped package and increase the requirement to ownCloud 4
2012-05-18 16:06:57 +02:00
Michael Gapczynski
cbfbbe672c
Merge commit 'refs/merge-requests/115' of git://gitorious.org/owncloud/owncloud into merge-requests/115
...
Conflicts:
apps/files/templates/index.php
2012-05-17 15:38:28 -04:00
Robin Appelman
ac8bfc218e
update translations
2012-05-17 00:36:21 +02:00
Arthur Schiwon
fbc2892083
try to remove deprecated files from /files on update
2012-05-16 15:59:36 +02:00
Michael Gapczynski
6673375eeb
No multiple file sharing in this next release, sharing UI isn't ready for it :(
2012-05-15 11:45:59 -04:00
Sam Tuke
2ad6b5048e
fixed 'delete' label so it doesn't break translations
2012-05-15 16:24:06 +01:00
Michael Gapczynski
568b6a7f56
Make only writable files draggable
2012-05-14 20:41:06 -04:00
Thomas Mueller
583dce5276
removing executable bit - again
2012-05-15 00:52:00 +02:00
Robin Appelman
6779f28af4
cache app types during install or update
2012-05-14 22:49:31 +02:00
Michael Gapczynski
e03c5f39a8
Call is_writable explicitly on folders for readonly check
2012-05-14 16:31:00 -04:00
Robin Appelman
e7c106d91e
selective app loading for remote/public
2012-05-14 00:28:28 +02:00
Robin Appelman
ee0294bbb1
update translations
2012-05-13 20:00:34 +02:00
Bartek Przybylski
ab9927d5fc
oc-627, calling base function instead of loading too much useless functions
2012-05-12 13:25:04 +02:00
Robin Appelman
736739bbbd
load remote and public paths from info.xml during upgrade instead of setting them every time
2012-05-11 20:33:56 +02:00
Jan-Christoph Borchardt
d1e5a56bc6
fixing upload icon color
2012-05-10 21:40:22 +02:00
Jan-Christoph Borchardt
e3f452cf53
larger clickable area for new button
2012-05-10 14:08:08 +00:00
Jan-Christoph Borchardt
2ae37b32d4
fixing background for clicked new button
2012-05-10 13:44:30 +00:00
Jan-Christoph Borchardt
8fc565821f
reduced text shadow brightness
2012-05-10 13:37:48 +00:00
Jan-Christoph Borchardt
46b1f35107
highlight the files new and upload button all the time
2012-05-10 13:34:44 +00:00
Vitaly Kuznetsov
6f981738bb
Fix some non-utf8-friendly htmlentities (resulting in wrong display of utf8-encoded directory names for example)
2012-05-10 09:10:53 +00:00
Brice Maron
de6aa0f88c
Use a clean uri param constructor to get files
2012-05-09 21:35:59 +00:00
Robin Appelman
588b51d88a
update translations
2012-05-09 12:41:01 +02:00
Brice Maron
fae1ce4ea7
Correct file move by dropping on folder
2012-05-08 22:07:14 +00:00
Arthur Schiwon
e9c7ecf22d
applying coding guideline
2012-05-07 17:35:23 +02:00
Arthur Schiwon
0ff5ab65be
applying coding guideline
2012-05-07 17:35:23 +02:00
Georg Ehrke
936c8ba1cc
improve remote.php and create public.php
2012-05-07 15:39:17 +02:00
Georg Ehrke
1138df0f4b
fix webdav, bloody merge conflicts
2012-05-07 12:47:34 +02:00
Georg Ehrke
46fe2e3e2a
fix merge conflicts
2012-05-07 11:47:14 +02:00
Frank Karlitschek
1945cd6946
ported the oc_template class
2012-05-06 23:00:36 +02:00