e43e961dcb
we cannot load avatar on guest page
2013-09-17 19:20:16 +02:00
3f7f6434d1
Merge branch 'master' into fix_3728_with_file_exists_dialog
2013-09-17 19:11:47 +02:00
b59ce403d8
Merge branch 'master' into fix_3728_with_file_exists_dialog
...
Conflicts:
apps/files/css/files.css
apps/files/js/file-upload.js
apps/files/js/filelist.js
apps/files/js/files.js
apps/files_sharing/js/public.js
core/js/jquery.ocdialog.js
core/js/oc-dialogs.js
2013-09-17 19:10:46 +02:00
b40925ae17
initial scrollto implementation:
...
use places/folder icon,
move link construction to JS,
only show icon on hover,
use 'searchresult' as css class name,
add filter/unfilter methods,
highlight searched files in current filelist
only filter when correct FileList is present
2013-09-17 18:40:51 +02:00
642b064c5b
we can leave the loop if the permission of the link share was checked
2013-09-17 18:18:23 +02:00
d6771502f2
check only permission from link-share to decide if public upload is enabled or disabled
2013-09-17 18:11:43 +02:00
afe4f6a794
add exists method to jquery
2013-09-16 13:47:37 +02:00
534d93d2d3
Merge branch 'master' into sharing_mail_notification_master
...
Conflicts:
apps/files/index.php
2013-09-16 10:40:06 +02:00
58e6582056
Merge pull request #4803 from owncloud/fix-4465-add-share-user-on-enter
...
Fixes #4465 - Added autoFocus to #shareWith autocomplete options
2013-09-15 03:07:11 -07:00
db7e1dd877
Merge pull request #4853 from owncloud/external-shared_mimetype-icons
...
Use external and shared icons in OC.Dialogs.filepicker()
2013-09-15 02:42:14 -07:00
a58e176852
Merge pull request #4506 from owncloud/oc_avatars
...
OC Avatars
2013-09-14 16:00:36 -07:00
a0c2c2473a
Merge pull request #4501 from owncloud/ajaxfilelist
...
Ajax calls for "files" and "files_trashbin" apps
2013-09-14 12:51:16 -07:00
dcc899d0a0
Merge pull request #4806 from owncloud/oc-dialogs-pageleave
...
Don't popup meaningless alerts when dialog called on page leave
2013-09-14 10:35:39 -07:00
c117e719da
Use external and shared icons in OC.Dialogs.filepicker()
2013-09-14 14:35:23 +02:00
1304b511e9
Ajax calls for "files" and "files_trashbin" apps
...
Frontend:
- The files app list now uses ajax calls to refresh the list.
- Added support the browser back button (history API).
- Added mask + spinner while loading file list
Backend:
- Added utility function in core JS for parsing query strings.
- Moved file list + breadcrumb template data code to helper
functions
- Fixed some file paths in trashbin app to be similar to the files app
2013-09-13 19:59:14 +02:00
c9c5e1b97f
Merge branch 'master' into oc_avatars
2013-09-12 07:41:44 +02:00
b7205d97d7
Merge pull request #4735 from owncloud/multiple_mimetypes_rawlist
...
Make it possible to pass rawlist.php an JSON array, to filter by more than one mimetype
2013-09-11 17:18:04 -07:00
08225a60c8
Save two lines
2013-09-11 21:15:32 +02:00
1f8f0e61d8
Remove test error :P
2013-09-11 21:11:35 +02:00
7a2b23a036
Fix double destroy on escape.
2013-09-11 17:13:39 +02:00
15be3d85b6
no autoFocus if no users returned
2013-09-11 15:59:28 +01:00
799c5c2c9b
Don't popup meaningless alerts when dialog called on page leave
2013-09-11 16:02:12 +02:00
92b57c13c1
Added autoFocus to #shareWith autocomplete options
2013-09-11 11:45:32 +01:00
fdfdd2e4e7
Remove console logging
2013-09-10 00:25:07 +02:00
51547c3316
Fix setting ocdialog options after initialization.
2013-09-10 00:21:42 +02:00
bd1d5b69fb
fix ESC for conflicts dialog
2013-09-08 17:31:12 +02:00
0a0410815e
close and destroy dialog on ESC
2013-09-08 10:11:35 +02:00
00cc83e3f7
show preview for uploading image files on conflict
2013-09-07 14:58:51 +02:00
ce03501646
fine ie8 compatability
2013-09-06 23:44:40 +02:00
673e0c01a7
fix page leaving checks
2013-09-06 22:40:10 +02:00
02d14aee17
completely remove dialog on cancel/continue
2013-09-06 16:50:45 +02:00
c6ca9c1e9d
Use shorter array-conversion
2013-09-06 13:33:17 +02:00
3774632ecc
Clean up avatars and preliminary use JSON->rawlist.php
2013-09-05 23:12:52 +02:00
f84fe479a5
Only use mimetype_list and clean up a bit
2013-09-05 18:40:55 +02:00
8a7e26b268
cleanup dead code
2013-09-05 17:46:19 +02:00
992b59f70b
Make it possible to pass rawlist.php an JSON array, to filter by more than one mimetype
2013-09-05 16:54:12 +02:00
f8563ec583
Merge branch 'master' into sharing_mail_notification_master
...
increased version number to trigger db update
Conflicts:
lib/util.php
2013-09-05 13:39:45 +02:00
bbf8acb383
separate uploading code from progress code, add progress capability detection
2013-09-05 10:19:54 +02:00
6db96603a0
Have login-checks and CSRF checks
2013-09-05 00:04:31 +02:00
49fd7e9f1e
refactor dialog creation
2013-09-04 16:42:18 +02:00
4af5a8c483
Merge branch 'master' into fix_3728_with_file_exists_dialog
...
Conflicts:
apps/files/ajax/upload.php
apps/files/js/file-upload.js
apps/files/js/filelist.js
apps/files/js/files.js
apps/files/templates/part.list.php
2013-09-04 14:11:40 +02:00
820fd42161
Merge branch 'master' into oc_avatars
2013-09-04 12:56:40 +02:00
6435e18e95
Merge pull request #4709 from owncloud/previews_in_ocidalogs_filepicker
...
Add previews to OC.dialogs.filepicker()
2013-09-03 22:35:58 -07:00
6d42f51d0c
Fix unwanted caching in IE8
2013-09-03 18:34:40 +02:00
ce263df4c7
Don't use HTML5 <header> to support avatars in IE8
2013-09-03 16:52:15 +02:00
c2eaf7589d
Merge pull request #4707 from owncloud/use_on_instead_of_deprecated_bind
...
use on to add event listener instead of deprecated jquery bind
2013-09-03 06:27:08 -07:00
d62c5063f4
Add previews to OC.dialogs.filepicker(); Fix #4697
2013-09-03 15:15:20 +02:00
85758f3d7d
Merge pull request #4473 from owncloud/texteditor_polishing
...
Texteditor polishing
2013-09-03 05:38:59 -07:00
fd7469db9e
coding-style fixes
2013-09-03 13:37:06 +02:00
b0c6f990e4
use on to add event listener instead of deprecated jquery bind
2013-09-03 13:12:19 +02:00
2da6f6b4ce
Merge pull request #4695 from owncloud/placeholder-hsl
...
RGB -> HSL
2013-09-03 02:18:39 -07:00
53a7f80ac3
Use provided mimetype on open. Fix #4696
2013-09-02 23:53:45 +02:00
9eeb27c91a
placeholder.js: fix typo
2013-09-02 18:29:16 +02:00
57a1219ca0
placeholder.js: adjust saturation and lightness values
2013-09-02 18:20:18 +02:00
e7a14ea32d
RGB -> HSL
2013-09-02 16:41:18 +02:00
f44cd944e0
Better naming than "ava" & "data", cache timeout, use OC.Router.registerLoadedCallback()
2013-09-01 16:04:39 +02:00
8de9e3d85e
Add a description for $.avatar() and remove TODOs @raghunayyar fixed
2013-08-31 23:41:49 +02:00
385de45ed9
Deal with OC.Router.generate()
2013-08-31 19:05:53 +02:00
aa88eea9cf
Sanitize displayname, respect data @ $element, fix routename, clean after cropping, updateAvatar with displayname
2013-08-31 18:27:28 +02:00
65ddefc89d
set sendMail status back to false
2013-08-30 16:29:22 +02:00
10cf1b3a4e
return mailSend status in getItems()
2013-08-30 15:39:43 +02:00
77adaee645
enable user to inform recipients about a shared file by mail
2013-08-30 13:53:49 +02:00
ecf187393b
Finish cropper, Get rid of TODOs, Improve \OCP\Avatar and "fix" unitests
2013-08-30 09:00:37 +02:00
0c708be76b
Use defaultavatars
2013-08-29 14:26:11 +02:00
f0ea23891a
Merge pull request #4618 from owncloud/visualize-js
...
visualize
2013-08-28 14:17:50 -07:00
6502a148ec
fixing typo
2013-08-28 23:04:55 +02:00
067815099f
calculate fontsize and line-height
2013-08-28 21:54:20 +02:00
584857de69
Merge pull request #4627 from owncloud/trashbin-tipsy
...
change orientation for delete tooltip to left, fix #4589
2013-08-28 09:09:40 -07:00
e7b40983e4
change orientation for delete tooltip to left, fix #4589
2013-08-28 17:58:23 +02:00
ed2fa06a26
reviewers comments
2013-08-28 16:52:12 +02:00
4a00b26029
add visualize
2013-08-28 16:29:27 +02:00
c6eda25d50
remove show password toggle from log in page, ref #4577 #4580
2013-08-28 13:58:49 +02:00
9843c8e838
Merge pull request #4434 from owncloud/fix_octemplate_escaping
...
Fix octemplate string escaping.
2013-08-28 03:59:43 -07:00
776d64f804
Cache Object.keys(this.vars)
2013-08-28 12:50:05 +02:00
7c9d999243
reduced complexity, added listing conflicts to dialog
2013-08-22 14:29:00 +02:00
90da518e3e
Merge pull request #4262 from owncloud/fix_jslint_kondou
...
Fix some JSLint warnings
2013-08-20 12:45:10 -07:00
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
1793ec1d5d
Fixed inconsistent spacing.
2013-08-18 05:17:28 -04:00
9e8a6b704d
Add _many_ newlines at the end of files
2013-08-18 11:06:59 +02:00
edd92e4c09
Merge branch 'master' into fix_jslint_kondou
...
Conflicts:
apps/files/js/file-upload.js
2013-08-18 00:38:52 +02:00
15c9a0f405
fixing undefined js error
2013-08-17 19:24:06 +02:00
2ee8425295
Remove cancel button from filepicker
...
Having the cancel button in the bottom right corner was a bit confusing.
It's useless anyways, since there's a X in the top right.
2013-08-17 12:07:58 +02:00
5b8d30c6b6
refactor OC.Breadcrumbs, allow injection of container to allow rendering crumbs into full screen editor
2013-08-16 17:20:49 +02:00
f94e603698
progress fixes
2013-08-16 11:40:55 +02:00
d2767faf61
Merge pull request #4113 from owncloud/delete-fix
...
Delete icon fix
2013-08-15 15:31:42 -07:00
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
5fb7aab7a0
remove jPlayer css rules from core css file
2013-08-15 16:08:49 +02:00
ca495758bd
Fix octemplate string escaping.
2013-08-14 23:06:43 +02:00
8f3f47e868
Merge pull request #4376 from owncloud/use_plurals
...
Use plural translations
2013-08-14 10:23:19 -07:00
9da49264ea
change filelist ui updates
2013-08-14 17:49:45 +02:00
e1927d5bee
fix whitespace, check selected files before starting upload
2013-08-14 10:55:12 +02:00
11a404b90b
comment clarification
2013-08-14 00:25:07 +02:00
ca95a475d5
use edit & reshare permission as default
2013-08-13 22:58:47 +02:00
5660f99592
add PERMISSIONS_ALL summary
2013-08-13 22:58:27 +02:00
9549bd3e68
Use plural translations
2013-08-09 20:37:18 +02:00
a2ac5e0163
Merge pull request #4271 from owncloud/plural_translations
...
Plural translations
2013-08-08 10:34:28 -07:00
ff67f115d4
fix #2711 using a custom event, also use css selectors over filterAttr
2013-08-08 13:50:04 +02:00
d97e3c3571
adding proper evaluation of plural form - uses LGPL licensed code of jsgettext
2013-08-03 23:31:49 +02:00
f8bb4e10ae
use fixed OC.Breadcrumb.push()
2013-08-02 11:46:44 +02:00
b12c1cb325
add OC.Breadcrumb.show(dir, filename, link)
2013-08-02 11:46:44 +02:00
1348330c7d
Fix a syntax error & have if-conds in an own line
2013-08-01 18:44:01 +02:00
44594fb41c
make sure the first breadcrumb item is inserted before any other elements in the topbar
2013-08-01 16:46:01 +02:00
aaf0fec9f5
Fix some JSLint warnings
2013-07-31 21:21:02 +02:00
17c36b5074
fixes #4026
2013-07-30 10:26:42 +02:00
284fb86258
show tablespace only for oracle, hide dbhost for sqlite, remove unnecessary js & html ids
2013-07-24 19:56:57 +02:00
2a42021815
Merge branch 'master' into delete-fix
...
Conflicts:
core/css/styles.css
2013-07-23 16:24:34 +02:00
ab997bdc68
Create an array entry before filling it
2013-07-23 14:57:58 +03:00
5160ea6063
Show generic error when there is no error
2013-07-22 21:02:18 +03:00
934f2e94a3
Merge branch 'master' into disable-anon-upload-master
2013-07-22 11:36:52 +02:00
48948ccf5f
finally remove the file size obfuscation as it had more disadvantages. I was wrong, sorry.
2013-07-18 22:15:26 +02:00
8a25d1ad06
remove unnecessary tipsy for Files delete
2013-07-18 18:41:01 +02:00
bb0c5bff5f
Add multiple plural forms to the php part
2013-07-16 22:16:53 +02:00
fc2d538311
new admin setting added which allows to turn off anonymous uploads
2013-07-12 17:03:51 +02:00
d18bd17eb7
- eventsource.php: in case of potential CSRF attack we send an error message from the EventSource to the browser
...
- eventsource.js: handle undefined data on event
- update.js: in case of error we close the event source - advise the user to reload the page
- update.php: EventSource initialization is now done before we enter the maintenance mode in order to allow browser reload in case of possible CSRF attack
2013-07-11 00:27:21 +02:00
5513e30752
Merge pull request #3920 from owncloud/Fixing_search_ie8
...
[ie8] Fix lazy CSS loading and missing borders in search dropdown
2013-07-09 05:29:18 -07:00
4e214883d6
Partly integrate plural translations into js
2013-07-07 20:26:09 +02:00
18b11f76b1
fixing === and ident
2013-07-05 15:27:14 +02:00
59b700a550
Merge branch 'master' into fixing-3934-master
...
Conflicts:
core/js/share.js
2013-07-05 13:52:33 +02:00
27c0cc7fda
no anonymous upload on read-only folders
2013-07-05 11:23:08 +02:00
13991be5ce
no anonymous upload on files only folders
2013-07-05 10:53:59 +02:00
16e5a1b100
Fix lazy styles loading in IE8
2013-07-02 18:44:10 +03:00
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
0217315a24
Escape dropdown
...
Fixes #3241
2013-06-29 13:24:05 +02:00
7d3490036c
Merge pull request #3838 from rgeber/master
...
Public Upload Feature
2013-06-28 07:30:41 -07:00
be22d28eb9
Merge pull request #3576 from owncloud/jquery.multiselect-1.13
...
Update to jquery.multiselect 1.13
2013-06-27 07:50:47 -07:00
e6c1db7a3f
move javascript variables 'oc_current_user' and 'oc_requesttoken' to js.js - fixes #3853
2013-06-26 11:23:21 +02:00
ddb0ff346d
Public upload feature
2013-06-25 12:24:14 +02:00
e0547a25ab
if rename of file fails, the rename is undone in the view - #fix 2820
...
Changes:
* OC.dialog -> OC.Notification
* Added test
* Fixed OC.Notification.show() issue for queued items
* Highlight failed item and show notification
2013-06-15 09:58:27 +02:00
0bcb04398d
multiselect: fixed 'add group' interface a bit
2013-06-11 18:21:13 +02:00
46d4886709
Set default button in oc-dialogs
2013-06-03 03:31:33 +02:00
5f1cbc6a1a
Catch double destroy on escape.
2013-06-03 03:19:35 +02:00
901b1150ff
Replacement for jquery.dialog to fit better with ownCloud design.
2013-06-02 21:52:59 +02:00
3fe46706af
Update to jquery.multiselect 1.13
2013-06-02 19:53:18 +02:00
bfcf113ce7
Forgot typeof condition
2013-06-01 16:47:34 +02:00
64c9fdcc28
Speed up octemplate rendering.
2013-06-01 16:38:35 +02:00
3001db6b50
Update jquery to 1.10.0 & add jquery-migrate 1.2.1
2013-05-27 20:13:13 +02:00
9fd2be0757
Merge pull request #3406 from owncloud/oc_dialogs_oc_template
...
Use js templates in OC.dialogs etc.
2013-05-22 03:00:04 -07:00
38b2d0a822
Remove more obsolete code.
2013-05-20 09:54:43 +02:00
27a5132b46
Don't set image path in template.
2013-05-20 09:44:31 +02:00
c3779555aa
Dialogs: Home folder icon instead of '/'.
2013-05-17 16:18:40 +02:00
800c39fef1
cleanup after people who don't test in ie
2013-05-17 12:47:32 +02:00
ba9849a1aa
Dialogs: Fix method names.
2013-05-17 08:42:15 +02:00
2f91606e35
Dialogs: Cleanup.
2013-05-17 07:14:43 +02:00
a0b79f5649
Dialogs: Loose up-button.
2013-05-17 06:48:24 +02:00
e60d86bdd1
Dialogs: Make slug show last dir emphasized.
2013-05-17 06:16:51 +02:00
152e275c8a
Various cleanups in OC.dialogs
2013-05-17 04:54:08 +02:00
913941d894
Line length etc.
2013-05-16 18:19:28 +02:00
c8bbf90feb
Port OC.dialogs to use octemplate except for prompt() and form().
...
Also load octemplate per default.
2013-05-16 13:41:04 +02:00
591b383f2d
peselect filename without extension on rename
2013-05-13 15:54:45 +02:00
337e3ed61f
Typo
2013-05-12 10:51:21 +02:00
Jörn Friedrich Dreyer
Bjoern Schiessle
Morris Jobke
Thomas Müller
Bernhard Posselt
Thomas Tanghus
kondou
Vincent Petry
Pete McFarlane
Robin Appelman
Jan-Christoph Borchardt
Owen Winkler
Victor Dubiniuk
Jakob Sack
Lukas Reschke
Roman Geber