Felix Moeller
|
2d61f03452
|
More Checkstyle cleanup
This is for all LowerCaseConstant warnings
|
2012-10-23 08:01:09 +02:00 |
Thomas Tanghus
|
befdd6b63b
|
Merge branch 'master' of github.com:owncloud/core into vcategories_db
|
2012-10-23 06:23:03 +02:00 |
Jenkins for ownCloud
|
bc2a648f2d
|
[tx-robot] updated from transifex
|
2012-10-23 02:06:03 +02:00 |
Thomas Tanghus
|
69cf89c5f6
|
Merge branch 'master' of github.com:owncloud/core into vcategories_db
|
2012-10-22 15:41:39 +02:00 |
Thomas Tanghus
|
273fdb7b64
|
Added type and callback arguments to most methods.
|
2012-10-22 15:40:08 +02:00 |
Jenkins for ownCloud
|
d8e945466d
|
[tx-robot] updated from transifex
|
2012-10-22 02:06:18 +02:00 |
Jenkins for ownCloud
|
16c4eb66d7
|
[tx-robot] updated from transifex
|
2012-10-21 02:06:44 +02:00 |
Michael Gapczynski
|
699a484f42
|
Fix font family for textarea
|
2012-10-20 14:15:33 -04:00 |
Michael Gapczynski
|
dd58849aa0
|
Apply textbox CSS rules to textarea as well
|
2012-10-20 14:11:35 -04:00 |
Jenkins for ownCloud
|
cfbd310d34
|
[tx-robot] updated from transifex
|
2012-10-20 02:03:53 +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
|
03ff614265
|
Merge branch 'master' of github.com:owncloud/core into vcategories_db
|
2012-10-19 02:27:04 +02:00 |
Thomas Tanghus
|
fdf3ec1027
|
Add wait state to category dialog while processing.
|
2012-10-19 02:25:39 +02:00 |
Thomas Tanghus
|
e55cc23132
|
app !== type
|
2012-10-19 02:24:57 +02:00 |
Jenkins for ownCloud
|
f5043c0661
|
[tx-robot] updated from transifex
|
2012-10-19 02:08:00 +02:00 |
Thomas Tanghus
|
81536a81e3
|
More js updates for app/type in OCCategories
|
2012-10-19 00:39:09 +02:00 |
Thomas Tanghus
|
b9c9fdfe20
|
Use get for loading dialog.
|
2012-10-19 00:38:23 +02:00 |
Thomas Tanghus
|
3b6cfe4977
|
Merge branch 'master' of github.com:owncloud/core into vcategories_db
|
2012-10-19 00:17:28 +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 |
Thomas Tanghus
|
26719005a4
|
Added ajax files for favorite category handling.
|
2012-10-19 00:07:41 +02:00 |
Thomas Tanghus
|
f4fd4a5a52
|
Updated category ajax files to use type instead of app and add callCheck.
|
2012-10-19 00:06:18 +02:00 |
Thomas Müller
|
e4c0bb59e5
|
Merge pull request #39 from scambra/date-l10n-fixes
Date l10n fixes
|
2012-10-18 08:09:58 -07:00 |
Jenkins for ownCloud
|
519a0ae4ab
|
[tx-robot] updated from transifex
|
2012-10-18 02:09:32 +02:00 |
Thomas Müller
|
9f01cd05fb
|
Merge pull request #37 from scambra/js-interpolation-l10n
use interpolation for some translations in js
|
2012-10-17 13:28:46 -07:00 |
Bart Visscher
|
a8d0f84829
|
Resetting the password should also invalidate the token login cookies
|
2012-10-17 17:26:12 +02:00 |
Bart Visscher
|
0a614429af
|
Change the lostpassword flow to a controller
|
2012-10-17 17:24:49 +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 |
Jenkins for ownCloud
|
fd6adc7d08
|
[tx-robot] updated from transifex
|
2012-10-16 23:39:13 +02:00 |
scambra
|
c814a7a841
|
use interpolation for some translations in js
|
2012-10-16 20:53:31 +02:00 |
scambra
|
ec253f1354
|
Use strftime to format date with translated month names
|
2012-10-16 20:19:35 +02:00 |
Jenkins for ownCloud
|
c3823aa864
|
[tx-robot] updated from transifex
|
2012-10-16 02:08:21 +02:00 |
Lukas Reschke
|
3eb43c1fbe
|
Show a warning in the installer if .htaccess is not working
|
2012-10-15 23:25:15 +02:00 |
Michael Göhler
|
d7a4547482
|
avoid undefined index warning on login page
|
2012-10-15 20:37:52 +02:00 |
Lukas Reschke
|
842d6dad47
|
Remove space
|
2012-10-15 17:42:38 +02:00 |
Lukas Reschke
|
d33bec09fe
|
Verify password page for users
|
2012-10-15 17:42:38 +02:00 |
Lukas Reschke
|
c930ac9f88
|
Merge pull request #30 from visit1985/logonpage
extend logon page to display multiple error messages
|
2012-10-15 03:52:11 -07:00 |
Michael Göhler
|
7095b3a083
|
extend logon page to display multiple error messages
|
2012-10-14 19:57:24 +02:00 |
Lukas Reschke
|
2c427f050e
|
Show a warning in the installer if no secure RNG is available
|
2012-10-14 17:18:30 +02:00 |
Lukas Reschke
|
99cd922b82
|
Doublehash the token to prevent timing attacks
|
2012-10-14 12:13:02 +02:00 |
Jenkins for ownCloud
|
c88cf5cae5
|
[tx-robot] updated from transifex
|
2012-10-14 02:08:47 +02:00 |
Jenkins for ownCloud
|
d386bc8737
|
[tx-robot] updated from transifex
|
2012-10-13 02:08:50 +02:00 |
Lukas Reschke
|
cdd30216b1
|
escapeHTML function
|
2012-10-12 14:10:11 +02:00 |
Jenkins for ownCloud
|
b761143047
|
[tx-robot] updated from transifex
|
2012-10-12 02:07:10 +02:00 |
Jenkins for ownCloud
|
673e3dae3f
|
[tx-robot] updated from transifex
|
2012-10-11 02:07:32 +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 |
Jenkins for ownCloud
|
fce6ce9bc6
|
[tx-robot] updated from transifex
|
2012-10-10 02:09:28 +02:00 |
Michael Gapczynski
|
b475164e95
|
Fix autocomplete search for users for groups only share policy
|
2012-10-09 08:35:07 -04:00 |
Björn Schießle
|
003241e847
|
fix for bug #1942: Allow user to share with every group if "allow users to share with anyone" is set
|
2012-10-09 10:36:24 +02: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 |
Frank Karlitschek
|
c701bed2e3
|
fix a lot of small layout bugs and make the apps page overall prettier plus add ratings finally
|
2012-10-08 15:49:48 +02:00 |
Jenkins for ownCloud
|
b934668b9e
|
[tx-robot] updated from transifex
|
2012-10-08 02:07:01 +02:00 |
Jenkins for ownCloud
|
e36317c21a
|
[tx-robot] updated from transifex
|
2012-10-07 02:08:12 +02:00 |
Jenkins for ownCloud
|
35c5f71989
|
[tx-robot] updated from transifex
|
2012-10-06 02:06:49 +02:00 |
Björn Schießle
|
f493e97f5d
|
always generate access token, also for forms shown to anonymous users (e.g. public shares)
|
2012-10-05 10:32:38 +02: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 |
Jenkins for ownCloud
|
5c042d88ad
|
[tx-robot] updated from transifex
|
2012-10-04 02:07:35 +02:00 |
Michael Gapczynski
|
7bee735877
|
Show correct public link url for folders
|
2012-10-03 16:17:36 -04:00 |
Jenkins for ownCloud
|
32a6b3b862
|
[tx-robot] updated from transifex
|
2012-10-02 23:18:26 +02: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 |
Jenkins for ownCloud
|
f0c4356392
|
[tx-robot] updated from transifex
|
2012-10-02 02:06:08 +02:00 |
Thomas Tanghus
|
36696a8057
|
Fixed old, annoying css error that it turned out I had made myself :-P
|
2012-10-01 23:42:45 +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 |
Jenkins for ownCloud
|
377fb19818
|
[tx-robot] updated from transifex
|
2012-10-01 02:08:31 +02:00 |
Robin Appelman
|
f8eebcbb01
|
reload the current url when login in instead of always redirecting to the default app (oc-1873)
|
2012-09-30 03:47:37 +02:00 |
Jenkins for ownCloud
|
7e30c74ea4
|
[tx-robot] updated from transifex
|
2012-09-30 02:05:59 +02:00 |
Bart Visscher
|
a33dda3c65
|
Fix double url decoding in fileDownloadPath function
|
2012-09-29 18:10:23 +02:00 |
Lukas Reschke
|
ef57e9294b
|
Fallback for systems without openssl
|
2012-09-29 16:44:02 +02:00 |
Lukas Reschke
|
36f1c9b083
|
rand() + uniqid() are not from cryptographic quality
|
2012-09-29 15:33:10 +02:00 |
Lukas Reschke
|
578aa4e425
|
Removed sectoken
This token is completly useless since an attacker can easily extract it
from the page.
|
2012-09-29 15:18:38 +02:00 |
Lukas Reschke
|
f5fe95a131
|
Removed sectoken
This token is completly useless since an attacker can easily extract it
from the page.
|
2012-09-29 15:15:35 +02:00 |
Jenkins for ownCloud
|
dc66e94ee3
|
[tx-robot] updated from transifex
|
2012-09-29 02:04:55 +02:00 |
Jenkins for ownCloud
|
27bd9df027
|
[tx-robot] updated from transifex
|
2012-09-28 23:36:09 +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
|
d0bd2bbf27
|
Convert menu entries of settings pages to use router
|
2012-09-28 23:20:17 +02:00 |
Bart Visscher
|
22d22d19c0
|
Do urlencoding in linkTo functions
|
2012-09-28 22:27:52 +02: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 |
Christian Reiner
|
71454b1bca
|
Fix to preserve backward compatibility for apps creating static links containing the request token (currently the contacts app and maybe some 3rd party implementations)
|
2012-09-28 18:57:20 +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
|
4dbd4c35c5
|
Merge branch 'master' of git://github.com/owncloud/core
|
2012-09-28 13:31:01 +02:00 |
Christian Reiner
|
743826bbf3
|
Reimplementation of CSRF protection including autorefresh
|
2012-09-28 13:30:44 +02:00 |
Jenkins for ownCloud
|
5144d26088
|
[tx-robot] updated from transifex
|
2012-09-28 02:06:03 +02:00 |
Jenkins for ownCloud
|
09aa95586a
|
[tx-robot] updated from transifex
|
2012-09-27 02:03:09 +02:00 |
Jenkins for ownCloud
|
2c00f8c850
|
[tx-robot] updated from transifex
|
2012-09-26 13:22:37 +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 |
Jenkins for ownCloud
|
5855355faa
|
[tx-robot] updated from transifex
|
2012-09-26 02:06:37 +02:00 |
Jenkins for ownCloud
|
e5487376da
|
[tx-robot] updated from transifex
|
2012-09-25 02:05:18 +02:00 |
Jenkins for ownCloud
|
ecb90d72f3
|
[tx-robot] updated from transifex
|
2012-09-24 02:04:10 +02:00 |
Robin Appelman
|
a22a5d6807
|
some js style fixes
|
2012-09-23 03:16:52 +02:00 |
Jenkins for ownCloud
|
81ecabb19c
|
[tx-robot] updated from transifex
|
2012-09-23 02:04:41 +02:00 |
Lukas Reschke
|
ac79fe649c
|
Added a missing CSRF check
|
2012-09-22 11:02:03 +02:00 |
Jenkins for ownCloud
|
08132587d1
|
[tx-robot] updated from transifex
|
2012-09-22 02:01:19 +02:00 |
Jenkins for ownCloud
|
01160d0fb4
|
[tx-robot] updated from transifex
|
2012-09-22 01:18:31 +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 |
Tom Needham
|
edbbb2bd9f
|
General style fixes for the share dropdown
|
2012-09-19 20:04:16 +00:00 |
Tom Needham
|
fb3724ba64
|
Fix datepicker icons for all uses across ownCloud
|
2012-09-19 16:51:20 +00: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 |
Jenkins for ownCloud
|
b0e645fe13
|
[tx-robot] updated from transifex
|
2012-09-19 02:07:26 +02:00 |
Jenkins for ownCloud
|
06e963c54f
|
[tx-robot] updated from transifex
|
2012-09-18 02:04:26 +02:00 |
Jenkins for ownCloud
|
dbd2dea689
|
[tx-robot] updated from transifex
|
2012-09-17 02:07:23 +02:00 |
Jenkins for ownCloud
|
e41ccd4344
|
[tx-robot] updated from transifex
|
2012-09-14 02:03:18 +02:00 |
Frank Karlitschek
|
df528cfe95
|
show the current username. This confused some people
|
2012-09-12 12:23:21 +02: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 |
Jenkins for ownCloud
|
6a29bbda7a
|
[tx-robot] updated from transifex
|
2012-09-11 02:03:53 +02: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 |
Michael Gapczynski
|
13d513c17c
|
Fix shared collection item searching
|
2012-09-09 11:50:12 -04:00 |
Robin Appelman
|
a050915167
|
move breadcrumb css to core so we can reuse it
|
2012-09-09 03:00:01 +02:00 |
Robin Appelman
|
0b2633a787
|
add breadcrumb controll to js
|
2012-09-09 03:00:01 +02:00 |
Jenkins for ownCloud
|
5e790368bc
|
[tx-robot] updated from transifex
|
2012-09-09 02:03:35 +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 |
Jenkins for ownCloud
|
d5d2e89622
|
[tx-robot] updated from transifex
|
2012-09-08 02:05:41 +02:00 |
Bart Visscher
|
edcd297476
|
Move handling of core remotes to OC_TemplateLayout
|
2012-09-07 16:42:46 +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 |
Thomas Mueller
|
3829460ab8
|
adding space between) and {
|
2012-09-07 15:22:01 +02:00 |
Jenkins for ownCloud
|
a94b56b57b
|
[tx-robot] updated from transifex
|
2012-09-07 02:07:22 +02:00 |
Jan-Christoph Borchardt
|
90462b2dcf
|
make icons look good on bright and dark backgrounds
|
2012-09-06 13:47:07 +02:00 |
Jenkins for ownCloud
|
af3e767489
|
[tx-robot] updated from transifex
|
2012-09-06 02:06:37 +02:00 |
Thomas Mueller
|
daf41885e5
|
jquery added to ignorelist for l10n
|
2012-09-05 22:53:48 +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 |
Thomas Müller
|
5868f834c8
|
Respect coding style
|
2012-09-04 13:21:36 +03:00 |
Thomas Müller
|
ae67841461
|
Respect coding style
|
2012-09-04 13:21:00 +03:00 |
Thomas Müller
|
ff8b8909c1
|
Respect coding style
|
2012-09-04 13:19:44 +03:00 |
Thomas Müller
|
f4cace6cc1
|
Respect coding style
|
2012-09-04 13:19:04 +03:00 |
Thomas Müller
|
6e76c59007
|
Remove closing php tag
|
2012-09-04 13:18:11 +03:00 |
Thomas Müller
|
5bd4d6b051
|
Respect coding style
|
2012-09-04 13:17:14 +03:00 |
Thomas Müller
|
9e5807d1f9
|
fixing syntax error - sorry for that
|
2012-09-04 13:13:18 +03:00 |
Thomas Müller
|
6d358c051f
|
Update core/lostpassword/templates/email.php
respect coding style
|
2012-09-04 13:10:14 +03:00 |
Thomas Müller
|
97e4647ad5
|
Update core/lostpassword/resetpassword.php
|
2012-09-04 13:09:25 +03:00 |
Thomas Müller
|
395ea2a028
|
Update core/lostpassword/index.php
respect coding style
|
2012-09-04 13:08:55 +03:00 |
Jenkins for ownCloud
|
b867b738e8
|
[tx-robot] updated from transifex
|
2012-09-04 02:03:21 +02:00 |
Bart Visscher
|
5153b8b293
|
Add url-params to url with new parameter in linkTo function
|
2012-09-03 21:51:32 +02:00 |
Jenkins for ownCloud
|
d386e0172a
|
[tx-robot] updated from transifex
|
2012-09-03 02:07:40 +02:00 |
Jenkins for ownCloud
|
2bb7cb9f64
|
[tx-robot] updated from transifex
|
2012-09-02 02:02:53 +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 |
Jenkins for ownCloud
|
ab090d5277
|
[tx-robot] updated from transifex
|
2012-09-01 02:04:00 +02:00 |
Michael Gapczynski
|
c07eb4fec6
|
Make css selector more specific for the sharing dropdown
|
2012-08-31 17:26:32 -04:00 |
Jenkins for ownCloud
|
75cd7eacf8
|
[tx-robot] updated from transifex
|
2012-08-31 02:07:19 +02: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
|
6324daecc0
|
Don't wait for document ready for setting requesttoken
|
2012-08-30 23:10:24 +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
|
e5cbc532c3
|
Fix password authentication for links and fix template problems for links by creating a new base layout
|
2012-08-29 11:54:49 -04:00 |
Michael Gapczynski
|
9fcb916057
|
Fix toggling of password protection in sharing dropdown
|
2012-08-29 11:54:49 -04:00 |
Jenkins for ownCloud
|
9338d093f9
|
[tx-robot] updated from transifex
|
2012-08-29 02:06:48 +02: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 |
Jenkins for ownCloud
|
8374a49cc1
|
[tx-robot] updated from transifex
|
2012-08-28 02:03:56 +02:00 |
Jan-Christoph Borchardt
|
4910717c09
|
remove background fade from navigation, fix flickering icon issue and make it feel faster
|
2012-08-27 14:05:18 -07:00 |
Jenkins for ownCloud
|
c33a2ca01d
|
[tx-robot] updated from transifex
|
2012-08-27 02:02:37 +02: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 |
Jenkins for ownCloud
|
faf702b9e6
|
[tx-robot] updated from transifex
|
2012-08-26 19:47:33 +02:00 |
Jenkins for ownCloud
|
a1a3862274
|
[tx-robot] updated from transifex
|
2012-08-26 02:02:48 +02:00 |
Jenkins for ownCloud
|
bae07faa34
|
[tx-robot] updated from transifex
|
2012-08-26 01:20:16 +02: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 |
Lukas Reschke
|
76e0ca785b
|
Added XSRF check
|
2012-08-24 14:58:48 +02:00 |
Arthur Schiwon
|
a3b4cb205c
|
Show Login-Button when user+pw are autocompleted, fixes oc-1068
|
2012-08-24 14:54:16 +02:00 |
Jenkins for ownCloud
|
07a889631e
|
[tx-robot] updated from transifex
|
2012-08-24 02:07:18 +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
|
3debb67458
|
Move share CSS to core, add script and style from inside Share API
|
2012-08-22 11:57:58 -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 |
Jenkins for ownCloud
|
e6d87b2c4b
|
[tx-robot] updated from transifex
|
2012-08-22 02:08:16 +02: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
|
49229da0e1
|
Remove setTarget from ajax
|
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 |
Michael Gapczynski
|
5eca531f99
|
Refactor again so we can tell what item is being reshared in case the same source shows up. This is the end of the share_api branch, moving to master.
|
2012-08-19 22:14:38 -04:00 |
Lukas Reschke
|
d54390b1a0
|
Optimized image size
|
2012-08-18 13:56:04 +02: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 |
Michael Gapczynski
|
64ef1e2181
|
Change name of share function to shareItem, silly PHP 5.3.1 thinking it is a constructor...
|
2012-08-12 14:49:41 -04:00 |
Thomas Tanghus
|
eb516b79b6
|
Position appsettings fixed and load it in dynamically added element.
|
2012-08-12 18:42:54 +02:00 |
Bart Visscher
|
db4111f6d5
|
Routing: Add some core routes
|
2012-08-12 16:52:36 +02:00 |
Jenkins for ownCloud
|
355a1adb3a
|
[tx-robot] updated from transifex
|
2012-08-12 02:04:58 +02:00 |
Jakob Sack
|
81b997b56e
|
Merge branch 'backgroundjobs'
|
2012-08-10 13:00:51 +02:00 |
Bart Visscher
|
667cd318fe
|
Use OC_Util::displayLoginPage and cleanup the function
|
2012-08-10 11:43:04 +02:00 |
Lukas Reschke
|
334296b027
|
Removed unused file
|
2012-08-10 00:09:00 +02:00 |
Lukas Reschke
|
ab97c04894
|
Added XSRF check
|
2012-08-10 00:09:00 +02:00 |
Michael Gapczynski
|
78cd1153f0
|
Merge branch 'master' into share_api
Conflicts:
apps/contacts/lib/vcard.php
apps/files_sharing/sharedstorage.php
|
2012-08-09 11:38:22 -04: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 |
Bart Visscher
|
d4882df8cb
|
Fix warnings and better styling
|
2012-08-07 23:29:56 +02:00 |
Bart Visscher
|
1b5c8ff471
|
Don't return error when just no sharing found
|
2012-08-07 23:29:01 +02:00 |
Michael Gapczynski
|
0ddfc94cf5
|
Try to fix last commit
|
2012-08-07 14:34:29 -04:00 |
Michael Gapczynski
|
5e2ef1e918
|
Check if itemShares share type is an array instead of set, javascript likes to set indexes to 'undefined'
|
2012-08-07 14:11:48 -04:00 |
Michael Gapczynski
|
b6b713eb76
|
Only show the user's groups in the share with autocomplete
|
2012-08-06 20:43:08 -04:00 |
Jenkins for ownCloud
|
a9f894ce11
|
[tx-robot] updated from transifex
|
2012-08-07 02:07:50 +02: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 |
Thomas Tanghus
|
cc445e4e47
|
Small changes to allow updating main menu dynamically.
|
2012-08-05 01:42:17 +02:00 |
Tom Needham
|
538e72fe61
|
Fix scrollbar issue. Fixes oc-1414
|
2012-08-04 23:30:28 +00:00 |
Michael Gapczynski
|
002ad4ba16
|
Tweak users delete notification
|
2012-08-04 16:44:26 -04:00 |
Arthur Schiwon
|
c5d5ca88a8
|
Show Login-Button when user+pw are autocompleted, fixes oc-1068
|
2012-08-03 13:15:15 +02:00 |
Jenkins for ownCloud
|
91e828c6ce
|
[tx-robot] updated from transifex
|
2012-08-02 02:06:16 +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 |
Michael Gapczynski
|
2201074e1f
|
Basic setup for sharing with contacts
|
2012-08-01 17:17:28 -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
|
b6aa5d2875
|
Include contacts in share with search
|
2012-07-31 21:05:00 -04:00 |
Jenkins for ownCloud
|
274d1ef87f
|
[tx-robot] updated from transifex
|
2012-08-01 02:02:35 +02:00 |
Jenkins for ownCloud
|
36ccaf51ed
|
[tx-robot] updated from transifex
|
2012-07-31 22:57:24 +02:00 |
Michael Gapczynski
|
94ce8f2168
|
Merge branch 'master' into share_api
Conflicts:
apps/contacts/lib/app.php
apps/files_sharing/js/share.js
|
2012-07-31 15:00:04 -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 |