raghunayyar
b356b7065f
Password Toggle Works on Installation as well.
2013-02-08 16:38:28 +05:30
Jörn Friedrich Dreyer
43ffb5945c
attach handlers to document instead of filelist, minor whitespace cleanups
2013-02-08 11:05:56 +01:00
Tobias Ramforth
d577f790c8
Added MS SQL Server support
2013-02-08 00:00:51 +01:00
Bart Visscher
a82d18d2f8
Fill oc_webroot with the expected value
2013-02-07 21:13:57 +01:00
Bart Visscher
458ba4b55c
Fix disabling setup form on submit
2013-02-07 08:12:09 +01:00
Bart Visscher
c0b370f6cf
Define the variables that are expected to exist but won't be set in setup
2013-02-07 08:11:18 +01:00
Thomas Müller
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
raghunayyar
3bcf3c91e1
Password Toggle Support for Login
2013-02-03 11:56:00 +01:00
Robin Appelman
5dd2c9152e
fix breadcrumbs for gallery and texteditor
2013-02-01 00:14:39 +01:00
Thomas Mueller
b1da1db0eb
Merge branch 'master' into from_live_to_on
...
Conflicts:
apps/files_external/js/google.js
2013-01-31 23:34:12 +01:00
Jan-Christoph Borchardt
3d5c7ca245
Merge branch 'master' into navigation
2013-01-31 19:28:25 +01:00
Björn Schießle
9cd692a6d0
use the same tooltip as for the password field
2013-01-31 17:00:05 +01:00
Jörn Friedrich Dreyer
d7823adb07
attach to filelist which is present on .ready()
2013-01-30 17:46:33 +01:00
Jörn Friedrich Dreyer
22812c5f0d
replace live() with on() in core js
2013-01-30 17:00:54 +01:00
Jan-Christoph Borchardt
284e690737
Merge branch 'master' into navigation
2013-01-30 13:53:43 +01:00
Lukas Reschke
250c565d2b
Merge pull request #1360 from owncloud/display_name
...
introduction of display names
2013-01-29 14:05:54 -08:00
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
Jan-Christoph Borchardt
3bafa87a12
merge styles
2013-01-28 19:36:21 +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
Björn Schießle
a606e8d944
use display name to show share_width and owner information
2013-01-25 17:40:23 +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
Jan-Christoph Borchardt
6182b1353b
merge master into navigation
2013-01-15 20:40:38 +07: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
Jan-Christoph Borchardt
586cc9a83b
merge master into navigation
2012-12-18 15:41:58 +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
Thomas Tanghus
daf452b4ba
Added some missing type checks.
2012-12-04 18:00:13 +01:00
Thomas Tanghus
9ddd754bce
Enhanced multiSelect jquery plugin.
2012-12-04 18:00:13 +01:00
Jörn Friedrich Dreyer
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
Jörn Friedrich Dreyer
3e519945c3
replace minified infieldlabel with dcneiners version
2012-12-04 13:30:13 +01:00
Thomas Tanghus
5c9faf396a
Sharing: Fix false positived v. 2
2012-11-27 23:01:26 +01:00
Jörn Friedrich Dreyer
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
Arthur Schiwon
4c707d1b1f
remove debug output
2012-11-26 14:35:02 +01:00
Arthur Schiwon
e5ad774ab0
coding style
2012-11-26 14:34:51 +01:00
Arthur Schiwon
4764876192
check whether to join url with ? or &
2012-11-26 14:34:41 +01:00
Arthur Schiwon
776be8d9f7
all but the first parameter are introduced by &
2012-11-26 14:34:28 +01:00
Jörn Friedrich Dreyer
995b5c0739
readd fallback code for pre token links
2012-11-23 15:51:57 +01:00
Jörn Friedrich Dreyer
d8a171df26
implement share via link token
2012-11-20 15:03:12 +01:00
Thomas Müller
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
Thomas Müller
d1c0f2a739
Merge pull request #454 from Raydiation/master
...
Routing fixes
2012-11-15 15:15:07 -08:00
Thomas Tanghus
b51b9539d0
Very simple js console switcher.
2012-11-15 19:43:10 +01:00
Bernhard Posselt
defdbe3c10
removed unneeded callback checks in routes_request that could potentially fail
2012-11-15 15:07:01 +01:00
Bernhard Posselt
25e4a071ef
fixed: this.routes_request is a deferred/promise
2012-11-15 15:01:21 +01:00
Bernhard Posselt
bf20021b62
instead of warning via popup, write to console.warn
2012-11-15 14:48:18 +01:00
Bernhard Posselt
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
Bernhard Posselt
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
Bernhard Posselt
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
libasys
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
Alessandro Cosentino
7d01342bab
fix translation issues with previous commit
2012-11-13 19:32:26 -05:00
Alessandro Cosentino
aa917cfb18
uncomment hours entries in relative date functions
2012-11-13 19:18:26 -05:00
Thomas Tanghus
972ba89bc2
Merge branch 'master' of github.com:owncloud/core into vcategories_db
2012-11-07 15:33:21 +01:00
Alessandro Cosentino
50dbb30eb9
Moved relative_modified_date from file/js to core/js
2012-11-06 10:56:42 -05:00
Jörn Friedrich Dreyer
c2d6ac53b2
fix human filesize column header
2012-11-06 11:08:02 +01:00
Thomas Tanghus
1147dc9774
Merge branch 'master' of github.com:owncloud/core into vcategories_db
...
Conflicts:
lib/vcategories.php
2012-11-05 12:06:59 +01:00
Lukas Reschke
8c4c74b23f
Merge pull request #178 from owncloud/JustOneCSRFTokenPerSession
...
Just one CSRF token per session
2012-11-04 05:54:02 -08:00
Thomas Tanghus
4648dcfa46
VCategories: Use correct variable.
2012-11-04 12:09:04 +01:00
Jan-Christoph Borchardt
01bd0efc36
Merge branch 'master' into navigation
2012-11-01 16:58:06 +01:00
Jan-Christoph Borchardt
f50c043cfb
Merge branch 'navigation' of github.com:owncloud/core into navigation
2012-10-31 18:52:13 +01:00
Lukas Reschke
393d2517ee
Change the requesttoken back to OC.EventSource.requesttoken
2012-10-31 18:43:16 +01:00
Lukas Reschke
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
Thomas Tanghus
5fc0c89a73
Merge branch 'master' of github.com:owncloud/core into vcategories_db
2012-10-31 16:09:11 +01:00
Thomas Tanghus
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
libasys
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
Jan-Christoph Borchardt
3db43a9980
Merge branch 'master' into navigation
2012-10-30 14:23:38 +01:00
Thomas Tanghus
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
Bart Visscher
ed7accd237
Change search to use routing
2012-10-29 15:04:55 +01:00
Bernhard Posselt
c4b8bb1041
added old functions again to not break apps, but show a deprecation warning
2012-10-29 01:14:07 +01:00
Michael Gapczynski
e5a74903e4
Try to fix shared status icons again
2012-10-28 16:36:17 -04: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
99ba05e766
Merge branch 'navigation' of github.com:owncloud/core into navigation
2012-10-28 16:48:30 +01:00
Jan-Christoph Borchardt
71435ac1cc
improve user menu
2012-10-28 16:47:25 +01:00
Björn Schießle
f2f2b8ba3b
added some visual feedback is password was set
2012-10-28 14:57:36 +01:00
Björn Schießle
a4a1dad831
set password if user leaves password field (issue #57 )
2012-10-28 14:31:34 +01:00
Bernhard Posselt
a6f3a570c6
dont resize content div with javascript but use css box-sizing to do it
2012-10-27 19:42:25 +02:00
Bart Visscher
939b51e46f
Fix download url generation
2012-10-27 15:10:21 +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
Jan-Christoph Borchardt
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
Thomas Müller
628c7ca9cf
closes #113
2012-10-26 21:18:03 +02:00
libasys
0cf1fef3fa
Fix for problems using for() function instead of $.each for arrays with IE8
2012-10-26 20:34:04 +02:00
Thomas Tanghus
675a56c5ed
Merge branch 'master' of github.com:owncloud/core into vcategories_db
...
Conflicts:
lib/vcategories.php
2012-10-24 21:55:25 +02:00
Lukas Reschke
b1150f6a7f
Urlencode the share URL
...
Fixes #63
2012-10-23 17:55:49 +02:00
Thomas Tanghus
273fdb7b64
Added type and callback arguments to most methods.
2012-10-22 15:40:08 +02:00
scambra
41b597e179
Translate formatDate using jquery datepicker
2012-10-19 13:56:19 +02:00
scambra
a24d8db4b2
translate datepicker
2012-10-19 13:56:19 +02:00
Thomas Tanghus
fdf3ec1027
Add wait state to category dialog while processing.
2012-10-19 02:25:39 +02:00
Thomas Tanghus
81536a81e3
More js updates for app/type in OCCategories
2012-10-19 00:39:09 +02:00
Thomas Tanghus
97c884c548
Updated category js for handling favorites and use post instead of get.
2012-10-19 00:09:07 +02: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
scambra
c814a7a841
use interpolation for some translations in js
2012-10-16 20:53:31 +02:00
Lukas Reschke
cdd30216b1
escapeHTML function
2012-10-12 14:10:11 +02:00
Thomas Müller
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
Victor Dubiniuk
71ff6382b5
Prevent closing sharing dialog on picking the date
2012-10-08 22:38:14 +03:00
Victor Dubiniuk
06d00af9f8
Prevent closing sharing dialog on month adjustment. Fixes oc-1884
2012-10-08 22:03:16 +03:00
Bart Visscher
f3a211c03c
Implement routing on javascript side
2012-10-05 09:42:36 +02:00
Thomas Tanghus
bb345770af
Suggestion for simple, yet efficient variable interpolation in js translations.
2012-10-05 03:33:46 +02:00
Björn Schießle
16eade5a3b
share.expiration is null if no expiration date is set.
2012-10-04 11:18:37 +02:00
Michael Gapczynski
7bee735877
Show correct public link url for folders
2012-10-03 16:17:36 -04:00
Bart Visscher
de1bfe9d6b
Make the core ajax calls use the router
2012-10-02 21:58:42 +02:00
Bart Visscher
bb136b9adf
Make the settings ajax calls use the router
2012-10-02 18:00:23 +02:00
Georg Ehrke
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
Bart Visscher
a33dda3c65
Fix double url decoding in fileDownloadPath function
2012-09-29 18:10:23 +02:00
Thomas Müller
7f6a984e57
Merge pull request #20 from scambra/undo-l10n
...
undo interpolation in js for 4.5
2012-09-28 14:32:44 -07:00
Bart Visscher
c9317b5a68
Merge branch 'master' into routing
2012-09-28 21:41:21 +02:00
scambra
8f27881770
undo interpolation in js for 4.5
2012-09-28 19:53:18 +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
Christian Reiner
743826bbf3
Reimplementation of CSRF protection including autorefresh
2012-09-28 13:30:44 +02:00
Michael Gapczynski
b4e40b1c21
Fix unsetting share expiration date
2012-09-26 00:09:35 -04:00
Michael Gapczynski
00103d730f
Show share expiration date set for shared item
2012-09-26 00:04:27 -04:00
Michael Gapczynski
2bdf89f4d4
Stop autocomplete selection event propogration so share dropdown doesn't disappear, fixes bug oc-1773
2012-09-25 23:18:36 -04:00
Robin Appelman
a22a5d6807
some js style fixes
2012-09-23 03:16:52 +02:00
scambra
d5211f9615
some characters in comments avoid finding some strings to translate
2012-09-21 12:05:01 +02:00
scambra
0f15bc881f
fix translating dialog buttons, they are translated in core not dialogs app
2012-09-21 11:48:57 +02:00
scambra
22c6b48d2f
translate files_sharing app
2012-09-21 11:48:20 +02:00
Björn Schießle
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
Michael Gapczynski
518ca0ac58
Fix changing of share status icons, bug fix for oc-1631
2012-09-19 01:44:15 -04:00
Michael Gapczynski
1e1e8ae3b5
Don't show the expiration option until a share occurs, bug fix for oc-1724
2012-09-19 01:02:57 -04:00
Michael Gapczynski
60feaf9abf
Merge branch 'master' into share_expiration
...
Conflicts:
core/js/share.js
lib/util.php
2012-09-12 01:06:57 -04:00
Michael Gapczynski
54d4e556fe
Add lock and clock icon for sharing
2012-09-12 01:02:08 -04:00
Michael Gapczynski
8f0354bcdd
Temporarily disable sharing with contacts and emails, will come in next release
2012-09-12 01:02:08 -04:00
Michael Gapczynski
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
Robin Appelman
0b2633a787
add breadcrumb controll to js
2012-09-09 03:00:01 +02:00
Robin Appelman
9beb958845
forgot a ,
2012-09-09 00:35:02 +02:00
Robin Appelman
b14265b5c3
add js versions of basename and dirname
2012-09-08 23:59:02 +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
Bart Visscher
e0db35fac0
Fix name for OCCategories
2012-09-05 22:26:09 +02:00
Bart Visscher
a8de0af273
Add 'var' before some global js vars
2012-09-05 22:26:09 +02:00
Bart Visscher
9329af921d
Add missing ; to js code
2012-09-05 22:26:09 +02:00
Bart Visscher
f188f6cc2f
Fix some jslint warnings
2012-09-04 21:27:37 +02:00
Michael Gapczynski
6c29334b48
Add support for share expiration
2012-09-01 18:53:48 -04:00
Michael Gapczynski
5a9a795cd5
Fix check in Javascript for password protected link
2012-09-01 13:52:12 -04: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
Jörn Friedrich Dreyer
61a3e5f96b
unify permissions (1/3): add permission conastants to javascript OC
2012-08-31 01:11:10 +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
Robin Appelman
8990855f88
add OC.get and OC.set to get/set variables by name in javascript
2012-08-30 03:02:29 +02:00
Michael Gapczynski
3828d86191
Remove old Javascript code
2012-08-29 14:37:36 -04: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
Michael Gapczynski
76bc4753e9
Fix displaying if a link is password protected
2012-08-29 14:06:55 -04:00
Michael Gapczynski
0788c6e968
Hide link password controls if link is removed
2012-08-29 14:06:55 -04:00
Michael Gapczynski
26501a0bc8
Delete old link if user sets a password
2012-08-29 14:06:55 -04:00
Michael Gapczynski
9fcb916057
Fix toggling of password protection in sharing dropdown
2012-08-29 11:54:49 -04:00
Robin Appelman
92c782c1b0
return the jQuery deferred object when using OC.loadScript
2012-08-29 01:57:59 +02:00
Michael Gapczynski
2aac6f02a0
Reimplement links support for sharing and add password protection option
2012-08-27 20:37:38 -04:00
Michael Gapczynski
0a9d1ed3a6
Initial previewer for public links
2012-08-27 20:37:38 -04:00
Michael Gapczynski
545812f589
Move additional jquery.inview files
2012-08-26 18:50:20 -04:00
Michael Gapczynski
d6bb04a74e
Move jquery.inview from contacts app to core
2012-08-26 17:55:51 -04: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
d84b1adf34
Dynamically update shared status icon
2012-08-24 15:32:06 -04:00
Michael Gapczynski
7168fa4b05
Add padding to the reshared text
2012-08-24 15:12:16 -04:00
Michael Gapczynski
fedb3641f9
Determine if reshare needs to be checked
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
Michael Gapczynski
cfec290ad9
Prevent resharing in UI if share permission not granted
2012-08-24 10:05:37 -04:00
Arthur Schiwon
a3b4cb205c
Show Login-Button when user+pw are autocompleted, fixes oc-1068
2012-08-24 14:54:16 +02:00
Thomas Tanghus
aefa52018d
Use right variable name.
2012-08-23 05:02:30 +02:00
Michael Gapczynski
885b8c481b
Check if files_sharing app is enabled, move file specific javascript to files_sharing app
2012-08-22 12:32:07 -04:00
Michael Gapczynski
9699ff03bd
Revert using item name, no longer allowing the same item source exist for a user
2012-08-22 11:57:58 -04:00
Michael Gapczynski
09e851a9c4
Fix share ajax calls to use itemName/itemSource, show who shared a file with you
2012-08-20 21:22:22 -04: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
Anders Nor Berle
b6a3bf154d
Comment out javascript that hides login button
...
It has been reported problems with the javascript that hides the
login button so jancborchardt okayed that I made this change.
2012-08-16 20:55:10 +00:00
Michael Gapczynski
df8a2e5361
File sharing cleanup, works perfectly I think :)
2012-08-16 12:20:14 -04:00
Bart Visscher
63af75586b
Merge branch 'master' into routing
2012-08-15 17:39:00 +02:00
Bart Visscher
4954e46bb2
Use core routes in js too
2012-08-15 17:38:55 +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
Thomas Tanghus
eb516b79b6
Position appsettings fixed and load it in dynamically added element.
2012-08-12 18:42:54 +02:00
Jakob Sack
7fa896971f
JavaScript file for activating web cron
2012-08-09 00:58:54 +02:00
Michael Gapczynski
d02b0e39b2
Fix issues with hiding and showing dropdown
2012-08-08 17:50:09 -04:00
Michael Gapczynski
a22f30fb78
Reset item shares variable, fixes autocomplete not showing people
2012-08-08 11:39:00 -04:00
Michael Gapczynski
b1a7e30819
Actually change background image of shared items
2012-08-07 21:23:55 -04:00
Michael Gapczynski
51ddc44b62
Somewhat fixes dropdown display issues in the contacts app
2012-08-06 15:43:20 -04:00
Michael Gapczynski
6f83540dd6
Remove person from array after unshare, so name appears in autocomplete again
2012-08-06 14:45:45 -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
Michael Gapczynski
4f10574065
Don't load item if it doesn't have it status set
2012-08-06 13:30:44 -04:00
Michael Gapczynski
3b2c853916
Lots of refactoring to share API
2012-08-06 11:27:13 -04:00
Arthur Schiwon
c5d5ca88a8
Show Login-Button when user+pw are autocompleted, fixes oc-1068
2012-08-03 13:15:15 +02:00
Michael Gapczynski
26e406c3c0
Hide 'can edit' if not checked
2012-08-01 18:03:00 -04:00
Michael Gapczynski
4933128850
Throw exceptions in share API for UI to display
2012-08-01 17:52:29 -04:00
Thomas Tanghus
98f37b93f6
Propagate exceptions in OC.appSettings.
2012-08-01 16:24:02 +02:00
Michael Gapczynski
83b935a1c2
Prevent up and down arrow from changing the share with input value
2012-07-31 21:31:59 -04:00
Michael Gapczynski
269922543e
Give share with search focus when sharing dropdown appears
2012-07-31 14:48:19 -04:00
Jörn Friedrich Dreyer
795e78809f
add oracle to install & setup
2012-07-31 19:34:30 +02:00
Michael Gapczynski
8d01e1a355
Don't show self or already shared with users and groups in the share with search
2012-07-31 13:06:32 -04:00
Michael Gapczynski
8729119d4b
Add suggestion to share with search for sharing via email
2012-07-31 10:18:26 -04:00
Thomas Tanghus
6df95db8e8
Forgot to also use the options I added :-P
2012-07-31 16:05:58 +02:00
Thomas Tanghus
8837576ce7
Added some more options to OC.appSettings().
2012-07-31 16:03:08 +02:00
Thomas Tanghus
fb14cb87bd
Made the parameter for OC.appSettings() an object to be able to extend it.
2012-07-31 14:17:28 +02:00
Thomas Tanghus
084866cb1e
White space
2012-07-31 14:06:44 +02:00
Thomas Tanghus
553773f2e1
Popup for app specific settings.
2012-07-31 12:23:22 +02:00
Michael Gapczynski
ed71343df8
Autocomplete for share with search in sharing dropdown
2012-07-30 15:30:21 -04:00
Michael Gapczynski
db72ce398b
Add support for configuring which permissions are possible for items
2012-07-27 10:13:23 -04:00
Michael Gapczynski
cb21406e18
Implement CRUDS in share dropdown, and some clean-up
2012-07-26 21:56:22 -04: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
Robin Appelman
b1010160b3
CSRF protection for eventsource
2012-07-22 16:37:49 +02:00
Michael Gapczynski
4bf13adff2
Merge branch 'master' into share_api
...
Conflicts:
apps/contacts/lib/addressbook.php
apps/files_sharing/js/share.js
apps/files_sharing/sharedstorage.php
2012-07-11 20:25:59 -04:00
Michael Gapczynski
cbf851de69
Show private link in dropdown
2012-07-11 12:21:30 -04:00
Michael Gapczynski
ccb5e99395
Generate random token for private links (more entropy than past private links)
2012-07-11 12:18:59 -04:00
Michael Gapczynski
7c908a0016
Sharing files working using share API
2012-07-10 18:56:22 -04:00
Michael Gapczynski
0045e64041
Fix time formatting for minutes, prepend 0 if minutes is less than 10
2012-07-06 16:49:15 -04:00
Michael Gapczynski
90e4af312a
Fix time formatting for minutes, prepend 0 if minutes is less than 10
2012-07-06 16:38:54 -04:00
Brice Maron
799e34acd4
Add slash to app url if not set fix oc-1169
2012-07-03 21:58:36 +00:00
Michael Gapczynski
1ad5e3e39f
Add parameter to showDropDown to not show private link UI, only files can be shared as private links
2012-07-03 17:00:23 -04:00
Michael Gapczynski
db33765e36
Add share with to list in dropdown after sharing
2012-07-03 16:52:53 -04:00
Michael Gapczynski
5e8ef33190
Clean up in the dropdown for unsharing
2012-07-03 14:00:09 -04:00
Michael Gapczynski
dd7d34a40e
Prevent adding a duplicate to a multiselect
2012-07-01 11:36:44 -04:00