Michael Gapczynski
ed2ee8c411
Change file action text for files inside shared folders as well
2013-01-28 23:16:29 -05:00
Michael Gapczynski
ede7fccb00
Change file action text to 'Shared'
2013-01-28 23:13:38 -05:00
Jan-Christoph Borchardt
a78ae6a5cb
Merge branch 'master' into permanent-share-icons
2013-01-28 19:39:51 +01:00
Thomas Mueller
1d44a99ebb
Merge branch 'master' into updater-CSP
...
Conflicts:
core/templates/update.php
2013-01-28 09:57:24 +01:00
Thomas Müller
31d83fddc4
Merge pull request #1321 from owncloud/csp-fixes
...
Files: CSP fixes
2013-01-28 00:29:46 -08:00
Michael Gapczynski
0986b6f910
Use global oc_requesttoken for Event Source
2013-01-26 16:36:48 -05:00
Michael Gapczynski
31ebea0f6a
Permanently display shared status icons
2013-01-26 13:25:15 -05:00
Lukas Reschke
7f0a3018b6
Fix undefined variable
2013-01-26 13:46:00 +01:00
Thomas Müller
276d98b9dd
Merge pull request #1059 from owncloud/fixing-998-master
...
Fixing 998 master
2013-01-26 04:15:40 -08:00
Lukas Reschke
dbc13cf6ee
Move update inline JS
2013-01-25 19:18:16 +01:00
Lukas Reschke
047f1988c3
Merge branch 'master' into no-inline-js
2013-01-25 16:11:07 +01:00
Thomas Tanghus
936e991394
Add js linkToRemote and linkToRemoteBase
2013-01-25 16:00:26 +01:00
Lukas Reschke
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
Thomas Mueller
b4c3dd84b4
update to jquery-ui 1.10.0
2013-01-23 11:37:52 +01:00
Lukas Reschke
c8bbbb48d3
Merge master...
2013-01-23 11:30:40 +01:00
Michael Gapczynski
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
Lukas Reschke
39da6f8166
Move timezone check to external JS
2013-01-21 21:10:44 +01:00
Lukas Reschke
8ca78fcf3f
Move requesttoken to oc-requesttoken.js
2013-01-21 20:24:18 +01:00
Lukas Reschke
5fff57339f
Move config to core/js/config.php
2013-01-21 00:10:47 +01:00
Thomas Mueller
1dd70ac506
update used space percent after each ajax call and display the notification
2013-01-19 00:31:49 +01:00
Thomas Mueller
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
Bernhard Posselt
b7f507b925
dont resize content div with javascript but use css box-sizing to do it
2013-01-16 19:38:19 +01:00
Lukas Reschke
954b559d48
Merge pull request #994 from owncloud/enhanced_multiSelect
...
Enhanced multiSelect
2013-01-11 10:23:04 -08:00
Thomas Mueller
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
Thomas Mueller
364b1cd391
Merge branch 'master' into fixing-998-master
...
Conflicts:
apps/files/js/files.js
2013-01-11 10:00:12 +01:00
Thomas Mueller
bfc55fef89
bring back L250 as spotted by @tanghus - THX
2013-01-08 00:24:35 +01:00
Michael Gapczynski
d39655e126
Move template parameters around so database error page is properly rendered
2013-01-07 14:15:51 -05:00
Jörn Friedrich Dreyer
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
Thomas Mueller
9671ace32e
Merge branch 'master' into fix_minor_files_annoyances
...
Conflicts:
apps/files/js/files.js
2013-01-06 22:46:40 +01:00
Thomas Mueller
a867b36e7f
js optimisations and style fixes
2013-01-06 10:41:07 +01:00
Thomas Mueller
6806484c16
Merge branch 'master' into fixing-998-master
2013-01-06 10:36:14 +01:00
Thomas Mueller
ba475d4862
javascript notification functions have been moved to js.js for common use
2013-01-04 23:34:09 +01:00
Jörn Friedrich Dreyer
fe4f056a23
use jQuery.parseJSON fallback for IE6/7/8
2013-01-02 17:13:23 +01:00
Jörn Friedrich Dreyer
4a7604daa2
remove , at end of js. IE8 chokes on this
2013-01-02 17:02:06 +01:00
Jörn Friedrich Dreyer
5b07e722cb
combine ie8 fix with debug check
2013-01-02 12:21:30 +01:00
Jörn Friedrich Dreyer
e998da06d1
fix broken console.log in ie8
2013-01-02 12:13:07 +01:00
Thomas Tanghus
c317da7814
multiSelect: Add sorting options.
2012-12-21 06:18:10 +01:00
Thomas Tanghus
689edc2534
multiSelect: Make sure up/down classes are removed on close.
2012-12-21 06:17:13 +01:00
Thomas Tanghus
63fa943a52
multiSelect: Don't force popup above if there's no room for it there.
2012-12-21 00:53:23 +01:00
Thomas Tanghus
73b186cc60
Merge branch 'fix_multiSelect' of github.com:owncloud/core into enhanced_multiSelect
2012-12-21 00:52:29 +01:00
Björn Schießle
3adfb91ad8
call the password input field by name
2012-12-18 13:40:19 +01:00
Björn Schießle
d873f0da35
autofocus to password input after clicking the checkbox; code restructured; debug output added
2012-12-18 13:39:52 +01:00
Björn Schießle
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
Björn Schießle
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
Thomas Mueller
c938a4f791
feedback to the user while request is being processed
2012-12-12 12:34:28 +01:00
Thomas Mueller
162a2c0fba
moving sharing email code to core
2012-12-10 23:22:42 +01:00
Thomas Mueller
45074d5023
restoring feature to send sharing link via email
2012-12-10 18:41:08 +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
Thomas Tanghus
6d643f9e74
multiSelect.js: Give each select a unique msid to prevent double adding in users.js
2012-12-04 21:21:54 +01:00
Thomas Tanghus
feeaaf2d29
multiSelect: Make sure last added entry is selected and some code cleanup.
2012-12-04 18:00:14 +01:00