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
63d51980e1
Get config from template
2013-05-12 10:51:21 +02:00
048569754a
Add compatibility function for outerHTML
2013-04-29 22:35:37 +02:00
26e2672a5a
Merge pull request #2787 from owncloud/fix-password-autocomplete-2632
...
turn off autocompletion for password field
2013-04-26 01:59:20 -07:00
e8bb998ecc
Fix #3095 .
2013-04-24 11:13:12 +02:00
938b12236a
modify password clone to password type right on submit to prevent the browser remind the content
2013-04-19 10:06:18 +02:00
3f7643ef46
Merge pull request #2769 from owncloud/octemplate
...
Add octemplate jQuery plugin
2013-04-15 13:42:35 -07:00
155582ab70
Updated docs.
2013-04-15 22:10:29 +02:00
59be6a910c
Implements Toggle for Database Password.
2013-04-13 09:45:30 +05:30
18c873d1e5
Merge pull request #2554 from owncloud/hide-toggle-checkbox
...
Implements Hide / Display for the Password Toggle Button
2013-04-11 01:18:40 -07:00
51e07a90b7
Merge pull request #2758 from Kondou-ger/refactor_OCdialogs
...
Refactor OCdialogs.
2013-04-09 13:24:04 -07:00
5f89812a9b
Fix #2730
...
Swap OC.dialogs.alert()'s parameters, so Error is shown
as its title.
2013-04-09 13:22:34 +02:00
e44cc8ea57
Fix OC.dialogs.form()
...
Don't do _too_ much escapeHTML()
2013-04-09 13:07:28 +02:00
9c53f35d9a
Remove manual mimetype checking.
2013-04-08 23:00:02 +02:00
38941a61bf
turn off autocompletion for password field
...
refs #2632
2013-04-07 21:51:10 +02:00
870b73ce5a
Add octemplate jQuery plugin
2013-04-06 23:24:43 +02:00
75af38c1bd
Move compatibility functions to compatibility.js and add two more.
2013-04-06 22:37:15 +02:00
275badaf76
Make files _and_ directorys selectable/browsable.
...
Also make long variables more readable by splitting them
up into shorter ones.
2013-04-06 19:21:15 +02:00
d556e7fbc0
Make files selectable again.
2013-04-06 17:22:55 +02:00
3e185911f1
Fix repeating directory names.
...
Also fix some CSS for Firefox.
2013-04-06 16:46:40 +02:00
fba6681f71
Make directories show at top.
2013-04-06 14:42:56 +02:00
6231e5be39
Make directories clickable.
...
A bit bugged though ...
2013-04-06 14:17:47 +02:00
1919acd68f
Small fixes
...
* escapeHTML(everything)
* curly braces for if
* camelcase function_to_call
* add missing semicolae (?)
2013-04-06 12:16:55 +02:00
0be80abe70
Refactor OCdialogs.
...
Fix #2557 and make the whole code more usable.
2013-04-06 10:07:12 +02:00
74b02db337
Fixed things in alert-messages
...
Two parameters for OC.dialogs.alert, otherwise one will be "undefined".
Also fixed missing translation.
2013-04-05 01:56:32 +02:00
86ac30c596
Merge pull request #2516 from kabum/master
...
share autocomplete - improve group appearance - issue #173
2013-03-29 07:28:09 -07:00
c51396551d
Whitespaces
2013-03-27 22:55:17 +01:00
3af61a0a7c
Share Dialog: show Displayname instead of internal name
2013-03-27 22:55:05 +01:00
8d7aa42b9a
Removes the setTimeout() method.
2013-03-26 23:32:26 +05:30
25a8690318
Fixes autofill for display / hide toggle button, a better function name.
2013-03-25 16:09:35 +05:30
d9cd9875e0
Initial Commit : Password Toggle Button hides if no input present
2013-03-25 04:30:09 +05:30
79d99b9c96
use simple markup to highlight groups in share autocomplete
2013-03-22 10:00:43 +01:00
8871629db5
replace hardcoded css style with css class - ref owncloud/core#173
2013-03-21 23:19:59 +01:00
a1a6ef9409
share autocomplete - improve group appearance
...
highlight groups with markup (bold font) instead of "(group)" postfix
ref owncloud/core#173
2013-03-21 22:45:36 +01:00
b8c1a4da3e
Upgraded infield labels plugin to the latest version. Updated invocation to opt-in to pollling at the same duration you were using before, 100ms
2013-03-17 22:21:34 -05:00
9ad03b61a3
Update share.js
...
Added HTML escaping
2013-03-08 17:29:05 +01:00
6e5e8c6b46
Fix #2080 and fix #2141
2013-03-07 22:30:12 -05:00
a83a5aa900
fix #2128
2013-03-06 13:02:44 +01:00
e9f46a7452
Remove inline js from OC.Dialogs.FilePicker.
2013-03-04 16:36:49 +01:00
577945bd33
Sanitize shareWith
2013-03-04 00:54:21 +01:00
0488968443
Merge pull request #2034 from owncloud/fix_bug47
...
Fix #47 - Duplicate files create a (2) when multiples are uploaded
2013-03-03 11:49:04 -08:00
620ddd3baa
new Array() -> []
2013-03-02 19:24:37 +01:00
22424e8abc
update OC.Notification.show
2013-03-02 17:36:04 +01:00
ff9476b3e3
fix oc#47
2013-03-01 18:30:25 +01:00
294403fa99
The router base url is without / on the end
2013-02-28 18:02:26 +01:00
e01ab04d2b
reduce minimum length for username suggestions in share dialog, fix #1666
2013-02-27 17:57:53 +01:00
58b06c5c9a
Merge pull request #1905 from owncloud/fix-share-icons
...
Fix adding share icons to share action
2013-02-27 02:31:52 -08:00
f36d92bbc1
Merge pull request #1800 from raghunayyar/sharing-dropdown-fixes
...
Various Layout Fixes for Sharing Dropdown.
2013-02-27 02:19:35 -08:00
a65b16f3e7
generate url only once
2013-02-26 20:45:25 +01:00
81bb4363a2
use 15 min instead of 15 sec timeout
2013-02-26 20:25:07 +01:00
4e55348054
implemented a heartbeat request which is calls the server every 15 minutes to prevent a session timeout
2013-02-26 19:34:46 +01:00
5b732ac1ea
Move space
2013-02-25 20:52:01 -05:00
aa2ea9e3de
Fix adding share icons to share action
2013-02-25 20:20:29 -05:00
6dd1d479da
Merge pull request #1706 from owncloud/master-sqlserver
...
Microsoft SQL-Server support for ownCloud!
2013-02-25 12:50:32 -08:00
7c30c1a2e8
Merge pull request #1833 from owncloud/fix_1465
...
Fix 1465
2013-02-25 04:34:13 -08:00
9898ba4daf
Merge branch 'master' into master-sqlserver
...
Conflicts:
core/templates/installation.php
2013-02-22 22:59:09 +01:00
1a747b3e48
Style cleanup core dir
2013-02-21 23:47:21 +01:00
0dd7fd0599
IE8 does not support window.onclick
2013-02-21 17:38:25 +01:00
6ecc3d7ee1
Reduced email input width by 10% to increase space.
2013-02-20 23:08:21 +05:30
d8e8dab006
Fixes the Email Button and the email input Width.
2013-02-20 21:37:23 +05:30
5a8e0f2048
Extra position check for multiselect dropdown. Fix app/issues/575
2013-02-16 19:56:56 +01:00
4b80466880
Merge branch 'master' into master-sqlserver
...
Conflicts:
lib/db.php
lib/files/cache/cache.php
lib/files/cache/legacy.php
lib/setup.php
2013-02-14 22:54:48 +01:00
db30f94fc8
Merge pull request #1697 from owncloud/navigation-details
...
Navigation details
2013-02-14 08:39:17 -08:00
3f09cc139f
double speed for user menu slide
2013-02-14 17:13:50 +01:00
e643742eb3
adding prototype trim as fallback for IE8
2013-02-14 12:59:26 +01:00
8065c73339
fixing eventsource.js for IE8
2013-02-14 12:20:22 +01:00
8877087b57
adding a compatibility.js as a single source to define all fallback function declarations
2013-02-14 12:20:04 +01:00
76b31f870c
Merge branch 'master' into master-sqlserver
2013-02-12 00:32:38 +01:00
45ed0c6010
if you add/remove more than one user from the share dialog replacing 'Share' with 'Shared' will lead to a string with more and more trailing 'd's
2013-02-11 15:37:01 +01:00
41ec976fd7
Bugfixes and cleanup MS SQL Server installation
2013-02-10 13:07:59 +01:00
316807e0d3
Merge pull request #1624 from owncloud/singleselect
...
Split editable select code used for quota selection into a jquery plugin
2013-02-12 11:05:07 -08:00
e68e5cc849
Split editable select code used for quota selection into a jquery plugin
2013-02-11 15:18:14 +01:00
1ba44a3325
Merge pull request #1538 from raghunayyar/admin-password-toggle
...
Password Toggle Works on Installation
2013-02-10 02:38:43 -08:00
800609aaeb
Merge pull request #1545 from owncloud/fix-oc_webroot
...
fixup oc_webroot correctly before and after setup
2013-02-09 03:27:22 -08:00
d5f98a82aa
fix-oc_webroot
2013-02-08 18:44:52 +01:00
b356b7065f
Password Toggle Works on Installation as well.
2013-02-08 16:38:28 +05:30
43ffb5945c
attach handlers to document instead of filelist, minor whitespace cleanups
2013-02-08 11:05:56 +01:00
d577f790c8
Added MS SQL Server support
2013-02-08 00:00:51 +01:00
a82d18d2f8
Fill oc_webroot with the expected value
2013-02-07 21:13:57 +01:00
458ba4b55c
Fix disabling setup form on submit
2013-02-07 08:12:09 +01:00
c0b370f6cf
Define the variables that are expected to exist but won't be set in setup
2013-02-07 08:11:18 +01:00
04b97a1906
Merge pull request #1229 from owncloud/from_live_to_on
...
replace live() with on() in core js
2013-02-03 21:55:54 -08:00
3bcf3c91e1
Password Toggle Support for Login
2013-02-03 11:56:00 +01:00
5dd2c9152e
fix breadcrumbs for gallery and texteditor
2013-02-01 00:14:39 +01:00
b1da1db0eb
Merge branch 'master' into from_live_to_on
...
Conflicts:
apps/files_external/js/google.js
2013-01-31 23:34:12 +01:00
3d5c7ca245
Merge branch 'master' into navigation
2013-01-31 19:28:25 +01:00
9cd692a6d0
use the same tooltip as for the password field
2013-01-31 17:00:05 +01:00
d7823adb07
attach to filelist which is present on .ready()
2013-01-30 17:46:33 +01:00
22812c5f0d
replace live() with on() in core js
2013-01-30 17:00:54 +01:00
284e690737
Merge branch 'master' into navigation
2013-01-30 13:53:43 +01:00
250c565d2b
Merge pull request #1360 from owncloud/display_name
...
introduction of display names
2013-01-29 14:05:54 -08:00
ed2ee8c411
Change file action text for files inside shared folders as well
2013-01-28 23:16:29 -05:00
ede7fccb00
Change file action text to 'Shared'
2013-01-28 23:13:38 -05:00
a78ae6a5cb
Merge branch 'master' into permanent-share-icons
2013-01-28 19:39:51 +01:00
3bafa87a12
merge styles
2013-01-28 19:36:21 +01:00
1d44a99ebb
Merge branch 'master' into updater-CSP
...
Conflicts:
core/templates/update.php
2013-01-28 09:57:24 +01:00
31d83fddc4
Merge pull request #1321 from owncloud/csp-fixes
...
Files: CSP fixes
2013-01-28 00:29:46 -08:00
0986b6f910
Use global oc_requesttoken for Event Source
2013-01-26 16:36:48 -05:00
31ebea0f6a
Permanently display shared status icons
2013-01-26 13:25:15 -05:00
7f0a3018b6
Fix undefined variable
2013-01-26 13:46:00 +01:00
276d98b9dd
Merge pull request #1059 from owncloud/fixing-998-master
...
Fixing 998 master
2013-01-26 04:15:40 -08:00
dbc13cf6ee
Move update inline JS
2013-01-25 19:18:16 +01:00
a606e8d944
use display name to show share_width and owner information
2013-01-25 17:40:23 +01:00
047f1988c3
Merge branch 'master' into no-inline-js
2013-01-25 16:11:07 +01:00
936e991394
Add js linkToRemote and linkToRemoteBase
2013-01-25 16:00:26 +01:00
ff4d62132a
This breaks the installation
...
@bartv2 This JS part is breaking the installation (POST parameters are
not transferred), could you please take a look? THX.
JS console says:
uncaught exception: cannot call methods on button prior to
initialization; attempted to call method 'disable'
2013-01-25 15:47:57 +01:00
b4c3dd84b4
update to jquery-ui 1.10.0
2013-01-23 11:37:52 +01:00
c8bbbb48d3
Merge master...
2013-01-23 11:30:40 +01:00
9eecb91338
Merge pull request #1113 from owncloud/fix-issue-1085
...
Fix rendering of database connection error page
2013-01-22 14:38:44 -08:00
39da6f8166
Move timezone check to external JS
2013-01-21 21:10:44 +01:00
8ca78fcf3f
Move requesttoken to oc-requesttoken.js
2013-01-21 20:24:18 +01:00
5fff57339f
Move config to core/js/config.php
2013-01-21 00:10:47 +01:00
1dd70ac506
update used space percent after each ajax call and display the notification
2013-01-19 00:31:49 +01:00
afb5de955e
Merge branch 'master' into fixing-998-master
...
Conflicts:
apps/files/ajax/upload.php
apps/files/js/files.js
2013-01-18 23:22:34 +01:00
b7f507b925
dont resize content div with javascript but use css box-sizing to do it
2013-01-16 19:38:19 +01:00
6182b1353b
merge master into navigation
2013-01-15 20:40:38 +07:00
954b559d48
Merge pull request #994 from owncloud/enhanced_multiSelect
...
Enhanced multiSelect
2013-01-11 10:23:04 -08:00
508b6a9fc7
displaying notification now centered
...
The notification div has been moved to the user templates.
Correct display of the notification will only work with the use of OC.Notification.show() as on fadeIn() the css needs to be changed as this style required display: inline.
2013-01-11 11:52:07 +01:00
364b1cd391
Merge branch 'master' into fixing-998-master
...
Conflicts:
apps/files/js/files.js
2013-01-11 10:00:12 +01:00
bfc55fef89
bring back L250 as spotted by @tanghus - THX
2013-01-08 00:24:35 +01:00
d39655e126
Move template parameters around so database error page is properly rendered
2013-01-07 14:15:51 -05:00
3bb7ee521f
attach max upload tipsy to div instead of a to fix tooltip not showing due to new z-index
2013-01-07 12:23:29 +01:00
9671ace32e
Merge branch 'master' into fix_minor_files_annoyances
...
Conflicts:
apps/files/js/files.js
2013-01-06 22:46:40 +01:00
a867b36e7f
js optimisations and style fixes
2013-01-06 10:41:07 +01:00
6806484c16
Merge branch 'master' into fixing-998-master
2013-01-06 10:36:14 +01:00
ba475d4862
javascript notification functions have been moved to js.js for common use
2013-01-04 23:34:09 +01:00
fe4f056a23
use jQuery.parseJSON fallback for IE6/7/8
2013-01-02 17:13:23 +01:00
4a7604daa2
remove , at end of js. IE8 chokes on this
2013-01-02 17:02:06 +01:00
5b07e722cb
combine ie8 fix with debug check
2013-01-02 12:21:30 +01:00
e998da06d1
fix broken console.log in ie8
2013-01-02 12:13:07 +01:00
c317da7814
multiSelect: Add sorting options.
2012-12-21 06:18:10 +01:00
689edc2534
multiSelect: Make sure up/down classes are removed on close.
2012-12-21 06:17:13 +01:00
63fa943a52
multiSelect: Don't force popup above if there's no room for it there.
2012-12-21 00:53:23 +01:00
73b186cc60
Merge branch 'fix_multiSelect' of github.com:owncloud/core into enhanced_multiSelect
2012-12-21 00:52:29 +01:00
586cc9a83b
merge master into navigation
2012-12-18 15:41:58 +01:00
3adfb91ad8
call the password input field by name
2012-12-18 13:40:19 +01:00
d873f0da35
autofocus to password input after clicking the checkbox; code restructured; debug output added
2012-12-18 13:39:52 +01:00
c457e15b20
some more usability improvements:
...
merged pull request https://github.com/owncloud/core/pull/121 into this patch with fixes for all issues mentioned in 121
2012-12-18 13:39:37 +01:00
1dd79cc8e1
set password for shared links when the user press enter and when he leaves the password field
2012-12-18 13:39:09 +01:00
c938a4f791
feedback to the user while request is being processed
2012-12-12 12:34:28 +01:00
162a2c0fba
moving sharing email code to core
2012-12-10 23:22:42 +01:00
45074d5023
restoring feature to send sharing link via email
2012-12-10 18:41:08 +01:00
80d8ca24ec
fix svg -> png replacement for android, cleanup and remove obsolete css
2012-12-07 17:21:26 +01:00
6d643f9e74
multiSelect.js: Give each select a unique msid to prevent double adding in users.js
2012-12-04 21:21:54 +01:00
feeaaf2d29
multiSelect: Make sure last added entry is selected and some code cleanup.
2012-12-04 18:00:14 +01:00
daf452b4ba
Added some missing type checks.
2012-12-04 18:00:13 +01:00
9ddd754bce
Enhanced multiSelect jquery plugin.
2012-12-04 18:00:13 +01:00
e72f95f643
merge changes discussed in dcneiner pull number 4 'fix for autocomplete issue' including firefox password overlay
2012-12-04 13:32:55 +01:00
3e519945c3
replace minified infieldlabel with dcneiners version
2012-12-04 13:30:13 +01:00
5c9faf396a
Sharing: Fix false positived v. 2
2012-11-27 23:01:26 +01:00
71e8755d31
Merge pull request #380 from butonic/feature_share_link_with_token
...
Feature share link with token
2012-11-26 07:42:53 -08:00
4c707d1b1f
remove debug output
2012-11-26 14:35:02 +01:00
e5ad774ab0
coding style
2012-11-26 14:34:51 +01:00
4764876192
check whether to join url with ? or &
2012-11-26 14:34:41 +01:00
776be8d9f7
all but the first parameter are introduced by &
2012-11-26 14:34:28 +01:00
995b5c0739
readd fallback code for pre token links
2012-11-23 15:51:57 +01:00
d8a171df26
implement share via link token
2012-11-20 15:03:12 +01:00
f3ae43d94a
Merge pull request #420 from libasys/bugfix-share
...
If you using the sharing by link the array monthNames don't exist and ca...
2012-11-17 14:47:24 -08:00
d1c0f2a739
Merge pull request #454 from Raydiation/master
...
Routing fixes
2012-11-15 15:15:07 -08:00
b51b9539d0
Very simple js console switcher.
2012-11-15 19:43:10 +01:00
defdbe3c10
removed unneeded callback checks in routes_request that could potentially fail
2012-11-15 15:07:01 +01:00
25e4a071ef
fixed: this.routes_request is a deferred/promise
2012-11-15 15:01:21 +01:00
bf20021b62
instead of warning via popup, write to console.warn
2012-11-15 14:48:18 +01:00
ad87bc4645
Prevent ajax race conditions when using routes by offering a callback that is run after the the routes have finished loading
2012-11-15 14:48:18 +01:00
14d4af24a2
Revert "Prevent ajax race conditions when using routes by offering a callback that is run after the the routes have finished loading"
...
This reverts commit 9b8375cf2c
2012-11-14 23:09:15 +01:00
9b8375cf2c
Prevent ajax race conditions when using routes by offering a callback that is run after the the routes have finished loading
2012-11-14 22:37:21 +01:00
493ae19bca
If you using the sharing by link the array monthNames don't exist and causes errors in all browsers! so we check if the type of the variable isn't undefined!
2012-11-14 16:47:52 +01:00
7d01342bab
fix translation issues with previous commit
2012-11-13 19:32:26 -05:00
aa917cfb18
uncomment hours entries in relative date functions
2012-11-13 19:18:26 -05:00
972ba89bc2
Merge branch 'master' of github.com:owncloud/core into vcategories_db
2012-11-07 15:33:21 +01:00
50dbb30eb9
Moved relative_modified_date from file/js to core/js
2012-11-06 10:56:42 -05:00
c2d6ac53b2
fix human filesize column header
2012-11-06 11:08:02 +01:00
1147dc9774
Merge branch 'master' of github.com:owncloud/core into vcategories_db
...
Conflicts:
lib/vcategories.php
2012-11-05 12:06:59 +01:00
8c4c74b23f
Merge pull request #178 from owncloud/JustOneCSRFTokenPerSession
...
Just one CSRF token per session
2012-11-04 05:54:02 -08:00
4648dcfa46
VCategories: Use correct variable.
2012-11-04 12:09:04 +01:00
01bd0efc36
Merge branch 'master' into navigation
2012-11-01 16:58:06 +01:00
f50c043cfb
Merge branch 'navigation' of github.com:owncloud/core into navigation
2012-10-31 18:52:13 +01:00
393d2517ee
Change the requesttoken back to OC.EventSource.requesttoken
2012-10-31 18:43:16 +01:00
7a7f12a0c1
Create only one CSRF token per session
...
Before, the CSRF token expired every hour. We had a script in place
which should refresh the token but this don't worked in every case.
(Laptop sleeping etc.)
With this commit, the token will only get once created for every
session so that the "Token expired" warning shouldn't appear.
2012-10-31 18:37:59 +01:00
5fc0c89a73
Merge branch 'master' of github.com:owncloud/core into vcategories_db
2012-10-31 16:09:11 +01:00
3813ee78c3
Merge pull request #112 from libasys/Fix-strange-Isue-IE8
...
Use $.each() instead of for(var...) in oc.dialogs. Fixes accessing undefined vars in IE8.
2012-10-31 06:16:13 -07:00
b095e32227
UPDATE oc-dialogs.js and Fix some small Bugs Added in the description of form a select ecample
2012-10-31 09:42:26 +01:00
3db43a9980
Merge branch 'master' into navigation
2012-10-30 14:23:38 +01:00
5550cde03b
Merge branch 'master' of github.com:owncloud/core into vcategories_db
...
Fix conflicts:
core/ajax/vcategories/add.php
core/ajax/vcategories/delete.php
2012-10-30 06:53:49 +01:00
ed7accd237
Change search to use routing
2012-10-29 15:04:55 +01:00
c4b8bb1041
added old functions again to not break apps, but show a deprecation warning
2012-10-29 01:14:07 +01:00
e5a74903e4
Try to fix shared status icons again
2012-10-28 16:36:17 -04:00
60e5054ae8
Fix shared status icons
2012-10-28 16:02:05 -04:00
d7abd44dea
merge breadcrumb root into navigation
2012-10-28 17:10:31 +01:00
99ba05e766
Merge branch 'navigation' of github.com:owncloud/core into navigation
2012-10-28 16:48:30 +01:00
71435ac1cc
improve user menu
2012-10-28 16:47:25 +01:00
f2f2b8ba3b
added some visual feedback is password was set
2012-10-28 14:57:36 +01:00
a4a1dad831
set password if user leaves password field (issue #57 )
2012-10-28 14:31:34 +01:00
a6f3a570c6
dont resize content div with javascript but use css box-sizing to do it
2012-10-27 19:42:25 +02:00
939b51e46f
Fix download url generation
2012-10-27 15:10:21 +02:00
0120f3fd62
Merge branch 'routing'
...
Conflicts:
core/lostpassword/index.php
core/lostpassword/resetpassword.php
2012-10-27 11:58:02 +02:00
46871e9b2e
update infieldlabel script from @zawaideh to fix autofill overlap, https://github.com/zawaideh/In-Field-Labels-jQuery-Plugin
2012-10-26 21:47:05 +02:00
628c7ca9cf
closes #113
2012-10-26 21:18:03 +02:00
0cf1fef3fa
Fix for problems using for() function instead of $.each for arrays with IE8
2012-10-26 20:34:04 +02:00
675a56c5ed
Merge branch 'master' of github.com:owncloud/core into vcategories_db
...
Conflicts:
lib/vcategories.php
2012-10-24 21:55:25 +02:00
b1150f6a7f
Urlencode the share URL
...
Fixes #63
2012-10-23 17:55:49 +02:00
273fdb7b64
Added type and callback arguments to most methods.
2012-10-22 15:40:08 +02:00
41b597e179
Translate formatDate using jquery datepicker
2012-10-19 13:56:19 +02:00
a24d8db4b2
translate datepicker
2012-10-19 13:56:19 +02:00
fdf3ec1027
Add wait state to category dialog while processing.
2012-10-19 02:25:39 +02:00
81536a81e3
More js updates for app/type in OCCategories
2012-10-19 00:39:09 +02:00
97c884c548
Updated category js for handling favorites and use post instead of get.
2012-10-19 00:09:07 +02:00
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
c814a7a841
use interpolation for some translations in js
2012-10-16 20:53:31 +02:00
cdd30216b1
escapeHTML function
2012-10-12 14:10:11 +02:00
a0c53619ff
Merge pull request #24 from owncloud/js_variable_interpolation
...
A suggestion for simple, yet efficient variable interpolation in js translations
2012-10-10 00:40:47 -07:00
71ff6382b5
Prevent closing sharing dialog on picking the date
2012-10-08 22:38:14 +03:00
06d00af9f8
Prevent closing sharing dialog on month adjustment. Fixes oc-1884
2012-10-08 22:03:16 +03:00
f3a211c03c
Implement routing on javascript side
2012-10-05 09:42:36 +02:00
bb345770af
Suggestion for simple, yet efficient variable interpolation in js translations.
2012-10-05 03:33:46 +02:00
16eade5a3b
share.expiration is null if no expiration date is set.
2012-10-04 11:18:37 +02:00
7bee735877
Show correct public link url for folders
2012-10-03 16:17:36 -04:00
de1bfe9d6b
Make the core ajax calls use the router
2012-10-02 21:58:42 +02:00
bb136b9adf
Make the settings ajax calls use the router
2012-10-02 18:00:23 +02:00
43c85248d4
Share - Dropdown dialog - cut off username if it's longer than 14 chars - bugfix for oc-1871
2012-10-01 16:04:20 +02:00
a33dda3c65
Fix double url decoding in fileDownloadPath function
2012-09-29 18:10:23 +02:00
7f6a984e57
Merge pull request #20 from scambra/undo-l10n
...
undo interpolation in js for 4.5
2012-09-28 14:32:44 -07:00
c9317b5a68
Merge branch 'master' into routing
2012-09-28 21:41:21 +02:00
8f27881770
undo interpolation in js for 4.5
2012-09-28 19:53:18 +02:00
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
743826bbf3
Reimplementation of CSRF protection including autorefresh
2012-09-28 13:30:44 +02:00
b4e40b1c21
Fix unsetting share expiration date
2012-09-26 00:09:35 -04:00
00103d730f
Show share expiration date set for shared item
2012-09-26 00:04:27 -04:00
2bdf89f4d4
Stop autocomplete selection event propogration so share dropdown doesn't disappear, fixes bug oc-1773
2012-09-25 23:18:36 -04:00
a22a5d6807
some js style fixes
2012-09-23 03:16:52 +02:00
d5211f9615
some characters in comments avoid finding some strings to translate
2012-09-21 12:05:01 +02:00
0f15bc881f
fix translating dialog buttons, they are translated in core not dialogs app
2012-09-21 11:48:57 +02:00
22c6b48d2f
translate files_sharing app
2012-09-21 11:48:20 +02:00
b1c60841e8
float right element needs to be the first element, otherwise firefox will move it to a new line
2012-09-20 10:31:23 +02:00
518ca0ac58
Fix changing of share status icons, bug fix for oc-1631
2012-09-19 01:44:15 -04:00
1e1e8ae3b5
Don't show the expiration option until a share occurs, bug fix for oc-1724
2012-09-19 01:02:57 -04:00
60feaf9abf
Merge branch 'master' into share_expiration
...
Conflicts:
core/js/share.js
lib/util.php
2012-09-12 01:06:57 -04:00
54d4e556fe
Add lock and clock icon for sharing
2012-09-12 01:02:08 -04:00
8f0354bcdd
Temporarily disable sharing with contacts and emails, will come in next release
2012-09-12 01:02:08 -04:00
6c17a4cb77
Don't display actions for children in shared collections, show the parent collection the child is shared in
2012-09-09 14:44:08 -04:00
0b2633a787
add breadcrumb controll to js
2012-09-09 03:00:01 +02:00
9beb958845
forgot a ,
2012-09-09 00:35:02 +02:00
b14265b5c3
add js versions of basename and dirname
2012-09-08 23:59:02 +02:00
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
e0db35fac0
Fix name for OCCategories
2012-09-05 22:26:09 +02:00
a8de0af273
Add 'var' before some global js vars
2012-09-05 22:26:09 +02:00
9329af921d
Add missing ; to js code
2012-09-05 22:26:09 +02:00
f188f6cc2f
Fix some jslint warnings
2012-09-04 21:27:37 +02:00
6c29334b48
Add support for share expiration
2012-09-01 18:53:48 -04:00
5a9a795cd5
Fix check in Javascript for password protected link
2012-09-01 13:52:12 -04:00
ca8120e9f4
unify permissions (3/3): remove old PERMISSION_X from FileActions & OC.Share
2012-08-31 01:11:10 +02:00
3ba27e624f
unify permissions (2/3): change apps to use OC::PERMISSION_X
2012-08-31 01:11:10 +02:00
61a3e5f96b
unify permissions (1/3): add permission conastants to javascript OC
2012-08-31 01:11:10 +02:00
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
8990855f88
add OC.get and OC.set to get/set variables by name in javascript
2012-08-30 03:02:29 +02:00
Morris Jobke
kondou
Bjoern Schiessle
Thomas Müller
Jan-Christoph Borchardt
Thomas Tanghus
Jörn Friedrich Dreyer
Owen Winkler
Robin Appelman
Victor Dubiniuk
Jakob Sack
Lukas Reschke
Roman Geber
Bart Visscher
raghunayyar
Bernhard Posselt
Arthur Schiwon
Doug Neiner
Michael Gapczynski
Georg Ehrke
Georg Ehrke
Administrator
Frank Karlitschek
Tobias Ramforth
libasys
Alessandro Cosentino
scambra
Georg Ehrke
Christian Reiner