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
Bart Visscher
Thomas Müller
raghunayyar
Robin Appelman
Jan-Christoph Borchardt
Björn Schießle
Jörn Friedrich Dreyer
Lukas Reschke
Michael Gapczynski
Thomas Tanghus
Bernhard Posselt
Arthur Schiwon
libasys
Alessandro Cosentino