9b8375cf2c
Prevent ajax race conditions when using routes by offering a callback that is run after the the routes have finished loading
2012-11-14 22:37:21 +01:00
493ae19bca
If you using the sharing by link the array monthNames don't exist and causes errors in all browsers! so we check if the type of the variable isn't undefined!
2012-11-14 16:47:52 +01:00
49f05dfade
Merge pull request #402 from zimba12/master
...
Uncomment hours entries in relative date functions
2012-11-14 05:36:04 -08:00
e06513d76b
Fixing syntax error - closes #406
2012-11-14 11:17:21 +01:00
99af3433d1
Fixing syntax error - closes #406
2012-11-14 11:10:31 +01:00
7d01342bab
fix translation issues with previous commit
2012-11-13 19:32:26 -05:00
aa917cfb18
uncomment hours entries in relative date functions
2012-11-13 19:18:26 -05:00
c353568ea0
Merge pull request #41 from owncloud/vcategories_db
...
OC_VCategories - this time actually usable ;)
2012-11-13 15:40:46 -08:00
9c36326e47
[tx-robot] updated from transifex
2012-11-14 00:03:38 +01:00
34a7e81ffb
Merge branch 'master' of github.com:owncloud/core into vcategories_db
2012-11-13 12:10:49 +01:00
ad85087fcc
Use util function to protect datadirectory in setup
2012-11-13 08:54:19 +01:00
ac22cd4ab0
[tx-robot] updated from transifex
2012-11-13 00:07:19 +01:00
268a48479d
Merge branch 'master' of github.com:owncloud/core into vcategories_db
2012-11-12 23:36:59 +01:00
7b53c9d3f0
Merge pull request #157 from owncloud/setup
...
Make lib/setup.php usable outside of install setup
2012-11-12 13:23:31 -08:00
fd709fc021
Merge branch 'master' of github.com:owncloud/core into vcategories_db
2012-11-11 20:20:09 +01:00
9f8cc09642
[tx-robot] updated from transifex
2012-11-11 00:02:42 +01:00
7ec0efe5c2
[tx-robot] updated from transifex
2012-11-10 00:02:29 +01:00
b33a443088
[tx-robot] updated from transifex
2012-11-09 10:07:45 +01:00
cb57a20ec2
[tx-robot] updated from transifex
2012-11-09 00:03:49 +01:00
c8f24fa3c9
[tx-robot] updated from transifex
2012-11-08 00:03:43 +01:00
972ba89bc2
Merge branch 'master' of github.com:owncloud/core into vcategories_db
2012-11-07 15:33:21 +01:00
50dbb30eb9
Moved relative_modified_date from file/js to core/js
2012-11-06 10:56:42 -05:00
c2d6ac53b2
fix human filesize column header
2012-11-06 11:08:02 +01:00
8f0269f121
Merge pull request #265 from owncloud/fix-button-img-cursor
...
make images in buttons also show click-hand on hover
2012-11-05 15:15:56 -08:00
73d59bd397
Merge branch 'master' of github.com:owncloud/core into vcategories_db
2012-11-06 00:10:45 +01:00
4d052c1eee
[tx-robot] updated from transifex
2012-11-06 00:01:40 +01:00
1aec5378b8
make images in buttons also show click-hand on hover
2012-11-05 19:54:48 +01:00
be77d81152
VCategories: Closing brace must be on a line by itself.
2012-11-05 16:38:23 +01:00
8c492a86fc
VCategories: Line too long.
2012-11-05 16:35:25 +01:00
3c59bc41d7
VCategories: Line too long.
2012-11-05 16:32:20 +01:00
1147dc9774
Merge branch 'master' of github.com:owncloud/core into vcategories_db
...
Conflicts:
lib/vcategories.php
2012-11-05 12:06:59 +01:00
8ac3849a95
Merge pull request #238 from fmms/checkstyle04
...
Checkstyle fixes
2012-11-04 08:59:45 -08:00
8c4c74b23f
Merge pull request #178 from owncloud/JustOneCSRFTokenPerSession
...
Just one CSRF token per session
2012-11-04 05:54:02 -08:00
e6a7bba095
Merge branch 'master' of github.com:owncloud/core into vcategories_db
...
Conflicts:
lib/vcategories.php
2012-11-04 12:31:06 +01:00
4648dcfa46
VCategories: Use correct variable.
2012-11-04 12:09:04 +01:00
30d7993e01
Checkstyle fixes: NoSpaceAfterComma
2012-11-04 11:10:46 +01:00
17d466b03b
[tx-robot] updated from transifex
2012-11-04 00:01:42 +01:00
b05666219e
Merge branch 'master' into navigation
2012-11-02 13:36:01 +01:00
627509875e
[tx-robot] updated from transifex
2012-11-02 00:04:59 +01:00
01bd0efc36
Merge branch 'master' into navigation
2012-11-01 16:58:06 +01:00
b0ae67d5c5
Update vcategories ajax scripts.
2012-11-01 03:06:20 +01:00
290d0714df
Add routes for vcategory favorites.
2012-11-01 03:05:48 +01:00
a327087c8b
[tx-robot] updated from transifex
2012-11-01 00:02:14 +01:00
81f019b6c5
Make the redirect_url working again
...
Fixes #160
2012-10-31 22:03:55 +01:00
f50c043cfb
Merge branch 'navigation' of github.com:owncloud/core into navigation
2012-10-31 18:52:13 +01:00
393d2517ee
Change the requesttoken back to OC.EventSource.requesttoken
2012-10-31 18:43:16 +01:00
7a7f12a0c1
Create only one CSRF token per session
...
Before, the CSRF token expired every hour. We had a script in place
which should refresh the token but this don't worked in every case.
(Laptop sleeping etc.)
With this commit, the token will only get once created for every
session so that the "Token expired" warning shouldn't appear.
2012-10-31 18:37:59 +01:00
5fc0c89a73
Merge branch 'master' of github.com:owncloud/core into vcategories_db
2012-10-31 16:09:11 +01:00
3813ee78c3
Merge pull request #112 from libasys/Fix-strange-Isue-IE8
...
Use $.each() instead of for(var...) in oc.dialogs. Fixes accessing undefined vars in IE8.
2012-10-31 06:16:13 -07:00
b095e32227
UPDATE oc-dialogs.js and Fix some small Bugs Added in the description of form a select ecample
2012-10-31 09:42:26 +01:00
aca6d3252f
[tx-robot] updated from transifex
2012-10-31 00:02:32 +01:00
246d7ea2ea
Separate control code from class definition
2012-10-30 20:56:31 +01:00
3db43a9980
Merge branch 'master' into navigation
2012-10-30 14:23:38 +01:00
5550cde03b
Merge branch 'master' of github.com:owncloud/core into vcategories_db
...
Fix conflicts:
core/ajax/vcategories/add.php
core/ajax/vcategories/delete.php
2012-10-30 06:53:49 +01:00
56cf7660bd
[tx-robot] updated from transifex
2012-10-30 00:01:50 +01:00
a9ff5635d8
Move loading setting routing to OC_Router
2012-10-29 15:04:56 +01:00
ed7accd237
Change search to use routing
2012-10-29 15:04:55 +01:00
1bdd0c949b
Move and fix app setting navigation detect
2012-10-29 15:04:55 +01:00
c4b8bb1041
added old functions again to not break apps, but show a deprecation warning
2012-10-29 01:14:07 +01:00
dbb4e74c79
[tx-robot] updated from transifex
2012-10-29 00:02:45 +01:00
e5a74903e4
Try to fix shared status icons again
2012-10-28 16:36:17 -04:00
60e5054ae8
Fix shared status icons
2012-10-28 16:02:05 -04:00
db5e8f3eea
enable hover state, now that needs to be added to the other icons
2012-10-28 17:22:18 +01:00
d7abd44dea
merge breadcrumb root into navigation
2012-10-28 17:10:31 +01:00
99ba05e766
Merge branch 'navigation' of github.com:owncloud/core into navigation
2012-10-28 16:48:30 +01:00
71435ac1cc
improve user menu
2012-10-28 16:47:25 +01:00
7af8c6c3cb
first version of breadcrumb 'root', still have a weird feeling about this
2012-10-28 16:05:31 +01:00
f2f2b8ba3b
added some visual feedback is password was set
2012-10-28 14:57:36 +01:00
a4a1dad831
set password if user leaves password field (issue #57 )
2012-10-28 14:31:34 +01:00
d7a6b09406
deny the usage of dots in database name
2012-10-28 14:11:41 +01:00
cf2a504d42
Merge branch 'master' into navigation
2012-10-28 14:10:10 +01:00
fe6b987b3d
use css to show/hide fileactions
2012-10-28 12:47:42 +01:00
5245e2b6be
->l expects two parameters
2012-10-28 10:33:18 +01:00
2d5edead77
Revert "Fix a typo"
...
This reverts commit a306e4b8a0
2012-10-28 10:21:06 +01:00
a306e4b8a0
Fix a typo
2012-10-28 10:19:31 +01:00
1a08ef6a06
[tx-robot] updated from transifex
2012-10-28 00:02:29 +02:00
fefc4e1707
Load all apps in core share ajax file for apps to register their share backends
2012-10-27 17:25:10 -04:00
a6f3a570c6
dont resize content div with javascript but use css box-sizing to do it
2012-10-27 19:42:25 +02:00
fc280b2887
first move of settings to top right
2012-10-27 18:58:16 +02:00
fecfeac55d
Fix introduced style errors
2012-10-27 17:45:15 +02:00
b595ea6efc
first icon update. Next step: make sprited hover state (like for home already)
2012-10-27 17:44:24 +02:00
939b51e46f
Fix download url generation
2012-10-27 15:10:21 +02:00
0120f3fd62
Merge branch 'routing'
...
Conflicts:
core/lostpassword/index.php
core/lostpassword/resetpassword.php
2012-10-27 11:58:02 +02:00
3bef19c623
[tx-robot] updated from transifex
2012-10-27 00:02:05 +02:00
3eea7aac13
first base on navigation rework, less obtrusive, icons need to be updated, settings moved
2012-10-26 23:38:36 +02:00
46871e9b2e
update infieldlabel script from @zawaideh to fix autofill overlap, https://github.com/zawaideh/In-Field-Labels-jQuery-Plugin
2012-10-26 21:47:05 +02:00
628c7ca9cf
closes #113
2012-10-26 21:18:03 +02:00
0cf1fef3fa
Fix for problems using for() function instead of $.each for arrays with IE8
2012-10-26 20:34:04 +02:00
da57fbc93a
show/hide navigation entries after enabling/disabling app
2012-10-26 20:13:24 +02:00
c7d64811d6
[tx-robot] updated from transifex
2012-10-26 02:05:56 +02:00
d9d8da0a5c
Merge branch 'master' of github.com:owncloud/core into vcategories_db
2012-10-25 20:34:03 +02:00
ec613b589b
Fix not defined JS variables
2012-10-25 17:51:59 +02:00
43bae1b473
[tx-robot] updated from transifex
2012-10-25 02:11:53 +02:00
675a56c5ed
Merge branch 'master' of github.com:owncloud/core into vcategories_db
...
Conflicts:
lib/vcategories.php
2012-10-24 21:55:25 +02:00
916e0fc343
Place the brackets in the first line
2012-10-24 13:09:09 +02:00
f33af71eb0
[tx-robot] updated from transifex
2012-10-24 02:08:34 +02:00
f112d8cd69
Merge pull request #75 from fmms/master
...
More Checkstyle cleanup
2012-10-23 15:07:14 -07:00
9185cd5dae
Remove uneeded vendor prefixes
2012-10-24 00:01:18 +02:00
9c17aa41ed
Format CSS in a readable way
2012-10-24 00:00:58 +02:00
4956380a89
Remove uneeded vendor prefixes
2012-10-23 23:56:15 +02:00
dcb286855e
Format the CSS in a readable way...
2012-10-23 23:55:59 +02:00
787994139b
Remove uneeded vendor prefixes
2012-10-23 23:55:17 +02:00
badda69b89
Format the CSS in a readable way...
2012-10-23 23:54:39 +02:00
b1150f6a7f
Urlencode the share URL
...
Fixes #63
2012-10-23 17:55:49 +02:00
b66dd3ebef
Merge pull request #38 from scambra/datepicker-l10n
...
Translate Datepicker
2012-10-22 23:53:24 -07:00
2d61f03452
More Checkstyle cleanup
...
This is for all LowerCaseConstant warnings
2012-10-23 08:01:09 +02:00
befdd6b63b
Merge branch 'master' of github.com:owncloud/core into vcategories_db
2012-10-23 06:23:03 +02:00
bc2a648f2d
[tx-robot] updated from transifex
2012-10-23 02:06:03 +02:00
69cf89c5f6
Merge branch 'master' of github.com:owncloud/core into vcategories_db
2012-10-22 15:41:39 +02:00
273fdb7b64
Added type and callback arguments to most methods.
2012-10-22 15:40:08 +02:00
d8e945466d
[tx-robot] updated from transifex
2012-10-22 02:06:18 +02:00
16c4eb66d7
[tx-robot] updated from transifex
2012-10-21 02:06:44 +02:00
699a484f42
Fix font family for textarea
2012-10-20 14:15:33 -04:00
dd58849aa0
Apply textbox CSS rules to textarea as well
2012-10-20 14:11:35 -04:00
cfbd310d34
[tx-robot] updated from transifex
2012-10-20 02:03:53 +02:00
41b597e179
Translate formatDate using jquery datepicker
2012-10-19 13:56:19 +02:00
a24d8db4b2
translate datepicker
2012-10-19 13:56:19 +02:00
03ff614265
Merge branch 'master' of github.com:owncloud/core into vcategories_db
2012-10-19 02:27:04 +02:00
fdf3ec1027
Add wait state to category dialog while processing.
2012-10-19 02:25:39 +02:00
e55cc23132
app !== type
2012-10-19 02:24:57 +02:00
f5043c0661
[tx-robot] updated from transifex
2012-10-19 02:08:00 +02:00
81536a81e3
More js updates for app/type in OCCategories
2012-10-19 00:39:09 +02:00
b9c9fdfe20
Use get for loading dialog.
2012-10-19 00:38:23 +02:00
3b6cfe4977
Merge branch 'master' of github.com:owncloud/core into vcategories_db
2012-10-19 00:17:28 +02:00
97c884c548
Updated category js for handling favorites and use post instead of get.
2012-10-19 00:09:07 +02:00
26719005a4
Added ajax files for favorite category handling.
2012-10-19 00:07:41 +02:00
f4fd4a5a52
Updated category ajax files to use type instead of app and add callCheck.
2012-10-19 00:06:18 +02:00
e4c0bb59e5
Merge pull request #39 from scambra/date-l10n-fixes
...
Date l10n fixes
2012-10-18 08:09:58 -07:00
519a0ae4ab
[tx-robot] updated from transifex
2012-10-18 02:09:32 +02:00
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
a8d0f84829
Resetting the password should also invalidate the token login cookies
2012-10-17 17:26:12 +02:00
0a614429af
Change the lostpassword flow to a controller
2012-10-17 17:24:49 +02:00
6081bfa2bc
Merge branch 'master' into routing
...
Conflicts:
lib/search/provider/file.php
settings/ajax/changepassword.php
settings/settings.php
2012-10-17 16:38:11 +02:00
fd6adc7d08
[tx-robot] updated from transifex
2012-10-16 23:39:13 +02:00
c814a7a841
use interpolation for some translations in js
2012-10-16 20:53:31 +02:00
ec253f1354
Use strftime to format date with translated month names
2012-10-16 20:19:35 +02:00
c3823aa864
[tx-robot] updated from transifex
2012-10-16 02:08:21 +02:00
3eb43c1fbe
Show a warning in the installer if .htaccess is not working
2012-10-15 23:25:15 +02:00
d7a4547482
avoid undefined index warning on login page
2012-10-15 20:37:52 +02:00
842d6dad47
Remove space
2012-10-15 17:42:38 +02:00
d33bec09fe
Verify password page for users
2012-10-15 17:42:38 +02:00
c930ac9f88
Merge pull request #30 from visit1985/logonpage
...
extend logon page to display multiple error messages
2012-10-15 03:52:11 -07:00
7095b3a083
extend logon page to display multiple error messages
2012-10-14 19:57:24 +02:00
2c427f050e
Show a warning in the installer if no secure RNG is available
2012-10-14 17:18:30 +02:00
99cd922b82
Doublehash the token to prevent timing attacks
2012-10-14 12:13:02 +02:00
c88cf5cae5
[tx-robot] updated from transifex
2012-10-14 02:08:47 +02:00
d386bc8737
[tx-robot] updated from transifex
2012-10-13 02:08:50 +02:00
cdd30216b1
escapeHTML function
2012-10-12 14:10:11 +02:00
b761143047
[tx-robot] updated from transifex
2012-10-12 02:07:10 +02:00
673e3dae3f
[tx-robot] updated from transifex
2012-10-11 02:07:32 +02:00
a0c53619ff
Merge pull request #24 from owncloud/js_variable_interpolation
...
A suggestion for simple, yet efficient variable interpolation in js translations
2012-10-10 00:40:47 -07:00
fce6ce9bc6
[tx-robot] updated from transifex
2012-10-10 02:09:28 +02:00
b475164e95
Fix autocomplete search for users for groups only share policy
2012-10-09 08:35:07 -04:00
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
71ff6382b5
Prevent closing sharing dialog on picking the date
2012-10-08 22:38:14 +03:00
06d00af9f8
Prevent closing sharing dialog on month adjustment. Fixes oc-1884
2012-10-08 22:03:16 +03:00
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
b934668b9e
[tx-robot] updated from transifex
2012-10-08 02:07:01 +02:00
e36317c21a
[tx-robot] updated from transifex
2012-10-07 02:08:12 +02:00
35c5f71989
[tx-robot] updated from transifex
2012-10-06 02:06:49 +02:00
f493e97f5d
always generate access token, also for forms shown to anonymous users (e.g. public shares)
2012-10-05 10:32:38 +02:00
f3a211c03c
Implement routing on javascript side
2012-10-05 09:42:36 +02:00
bb345770af
Suggestion for simple, yet efficient variable interpolation in js translations.
2012-10-05 03:33:46 +02:00
16eade5a3b
share.expiration is null if no expiration date is set.
2012-10-04 11:18:37 +02:00
5c042d88ad
[tx-robot] updated from transifex
2012-10-04 02:07:35 +02:00
7bee735877
Show correct public link url for folders
2012-10-03 16:17:36 -04:00
32a6b3b862
[tx-robot] updated from transifex
2012-10-02 23:18:26 +02:00
de1bfe9d6b
Make the core ajax calls use the router
2012-10-02 21:58:42 +02:00
bb136b9adf
Make the settings ajax calls use the router
2012-10-02 18:00:23 +02:00
f0c4356392
[tx-robot] updated from transifex
2012-10-02 02:06:08 +02:00
36696a8057
Fixed old, annoying css error that it turned out I had made myself :-P
2012-10-01 23:42:45 +02:00
43c85248d4
Share - Dropdown dialog - cut off username if it's longer than 14 chars - bugfix for oc-1871
2012-10-01 16:04:20 +02:00
377fb19818
[tx-robot] updated from transifex
2012-10-01 02:08:31 +02:00
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
7e30c74ea4
[tx-robot] updated from transifex
2012-09-30 02:05:59 +02:00
a33dda3c65
Fix double url decoding in fileDownloadPath function
2012-09-29 18:10:23 +02:00
ef57e9294b
Fallback for systems without openssl
2012-09-29 16:44:02 +02:00
36f1c9b083
rand() + uniqid() are not from cryptographic quality
2012-09-29 15:33:10 +02:00
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
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
dc66e94ee3
[tx-robot] updated from transifex
2012-09-29 02:04:55 +02:00
27bd9df027
[tx-robot] updated from transifex
2012-09-28 23:36:09 +02:00
7f6a984e57
Merge pull request #20 from scambra/undo-l10n
...
undo interpolation in js for 4.5
2012-09-28 14:32:44 -07:00
d0bd2bbf27
Convert menu entries of settings pages to use router
2012-09-28 23:20:17 +02:00
22d22d19c0
Do urlencoding in linkTo functions
2012-09-28 22:27:52 +02:00
c9317b5a68
Merge branch 'master' into routing
2012-09-28 21:41:21 +02:00
8f27881770
undo interpolation in js for 4.5
2012-09-28 19:53:18 +02:00
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
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
4dbd4c35c5
Merge branch 'master' of git://github.com/owncloud/core
2012-09-28 13:31:01 +02:00
743826bbf3
Reimplementation of CSRF protection including autorefresh
2012-09-28 13:30:44 +02:00
5144d26088
[tx-robot] updated from transifex
2012-09-28 02:06:03 +02:00
09aa95586a
[tx-robot] updated from transifex
2012-09-27 02:03:09 +02:00
2c00f8c850
[tx-robot] updated from transifex
2012-09-26 13:22:37 +02:00
b4e40b1c21
Fix unsetting share expiration date
2012-09-26 00:09:35 -04:00
00103d730f
Show share expiration date set for shared item
2012-09-26 00:04:27 -04:00
2bdf89f4d4
Stop autocomplete selection event propogration so share dropdown doesn't disappear, fixes bug oc-1773
2012-09-25 23:18:36 -04:00
5855355faa
[tx-robot] updated from transifex
2012-09-26 02:06:37 +02:00
e5487376da
[tx-robot] updated from transifex
2012-09-25 02:05:18 +02:00
ecb90d72f3
[tx-robot] updated from transifex
2012-09-24 02:04:10 +02:00
a22a5d6807
some js style fixes
2012-09-23 03:16:52 +02:00
81ecabb19c
[tx-robot] updated from transifex
2012-09-23 02:04:41 +02:00
ac79fe649c
Added a missing CSRF check
2012-09-22 11:02:03 +02:00
08132587d1
[tx-robot] updated from transifex
2012-09-22 02:01:19 +02:00
01160d0fb4
[tx-robot] updated from transifex
2012-09-22 01:18:31 +02:00
d5211f9615
some characters in comments avoid finding some strings to translate
2012-09-21 12:05:01 +02:00
0f15bc881f
fix translating dialog buttons, they are translated in core not dialogs app
2012-09-21 11:48:57 +02:00
22c6b48d2f
translate files_sharing app
2012-09-21 11:48:20 +02:00
b1c60841e8
float right element needs to be the first element, otherwise firefox will move it to a new line
2012-09-20 10:31:23 +02:00
edbbb2bd9f
General style fixes for the share dropdown
2012-09-19 20:04:16 +00:00
fb3724ba64
Fix datepicker icons for all uses across ownCloud
2012-09-19 16:51:20 +00:00
518ca0ac58
Fix changing of share status icons, bug fix for oc-1631
2012-09-19 01:44:15 -04:00
1e1e8ae3b5
Don't show the expiration option until a share occurs, bug fix for oc-1724
2012-09-19 01:02:57 -04:00
b0e645fe13
[tx-robot] updated from transifex
2012-09-19 02:07:26 +02:00
06e963c54f
[tx-robot] updated from transifex
2012-09-18 02:04:26 +02:00
dbd2dea689
[tx-robot] updated from transifex
2012-09-17 02:07:23 +02:00
e41ccd4344
[tx-robot] updated from transifex
2012-09-14 02:03:18 +02:00
df528cfe95
show the current username. This confused some people
2012-09-12 12:23:21 +02:00
60feaf9abf
Merge branch 'master' into share_expiration
...
Conflicts:
core/js/share.js
lib/util.php
2012-09-12 01:06:57 -04:00
54d4e556fe
Add lock and clock icon for sharing
2012-09-12 01:02:08 -04:00
8f0354bcdd
Temporarily disable sharing with contacts and emails, will come in next release
2012-09-12 01:02:08 -04:00
6a29bbda7a
[tx-robot] updated from transifex
2012-09-11 02:03:53 +02:00
6c17a4cb77
Don't display actions for children in shared collections, show the parent collection the child is shared in
2012-09-09 14:44:08 -04:00
13d513c17c
Fix shared collection item searching
2012-09-09 11:50:12 -04:00
a050915167
move breadcrumb css to core so we can reuse it
2012-09-09 03:00:01 +02:00
0b2633a787
add breadcrumb controll to js
2012-09-09 03:00:01 +02:00
5e790368bc
[tx-robot] updated from transifex
2012-09-09 02:03:35 +02:00
9beb958845
forgot a ,
2012-09-09 00:35:02 +02:00
b14265b5c3
add js versions of basename and dirname
2012-09-08 23:59:02 +02:00
d5d2e89622
[tx-robot] updated from transifex
2012-09-08 02:05:41 +02:00
edcd297476
Move handling of core remotes to OC_TemplateLayout
2012-09-07 16:42:46 +02:00
5eba579827
Merge branch 'master' into routing
...
Conflicts:
apps/files/js/fileactions.js
lib/base.php
lib/helper.php
lib/ocs.php
2012-09-07 15:51:44 +02:00
3829460ab8
adding space between) and {
2012-09-07 15:22:01 +02:00
a94b56b57b
[tx-robot] updated from transifex
2012-09-07 02:07:22 +02:00
90462b2dcf
make icons look good on bright and dark backgrounds
2012-09-06 13:47:07 +02:00
af3e767489
[tx-robot] updated from transifex
2012-09-06 02:06:37 +02:00
daf41885e5
jquery added to ignorelist for l10n
2012-09-05 22:53:48 +02:00
e0db35fac0
Fix name for OCCategories
2012-09-05 22:26:09 +02:00
a8de0af273
Add 'var' before some global js vars
2012-09-05 22:26:09 +02:00
9329af921d
Add missing ; to js code
2012-09-05 22:26:09 +02:00
f188f6cc2f
Fix some jslint warnings
2012-09-04 21:27:37 +02:00
5868f834c8
Respect coding style
2012-09-04 13:21:36 +03:00
ae67841461
Respect coding style
2012-09-04 13:21:00 +03:00
ff8b8909c1
Respect coding style
2012-09-04 13:19:44 +03:00
f4cace6cc1
Respect coding style
2012-09-04 13:19:04 +03:00
6e76c59007
Remove closing php tag
2012-09-04 13:18:11 +03:00
5bd4d6b051
Respect coding style
2012-09-04 13:17:14 +03:00
9e5807d1f9
fixing syntax error - sorry for that
2012-09-04 13:13:18 +03:00
6d358c051f
Update core/lostpassword/templates/email.php
...
respect coding style
2012-09-04 13:10:14 +03:00
97e4647ad5
Update core/lostpassword/resetpassword.php
2012-09-04 13:09:25 +03:00
395ea2a028
Update core/lostpassword/index.php
...
respect coding style
2012-09-04 13:08:55 +03:00
b867b738e8
[tx-robot] updated from transifex
2012-09-04 02:03:21 +02:00
5153b8b293
Add url-params to url with new parameter in linkTo function
2012-09-03 21:51:32 +02:00
d386e0172a
[tx-robot] updated from transifex
2012-09-03 02:07:40 +02:00
2bb7cb9f64
[tx-robot] updated from transifex
2012-09-02 02:02:53 +02:00
6c29334b48
Add support for share expiration
2012-09-01 18:53:48 -04:00
5a9a795cd5
Fix check in Javascript for password protected link
2012-09-01 13:52:12 -04:00
ab090d5277
[tx-robot] updated from transifex
2012-09-01 02:04:00 +02:00
c07eb4fec6
Make css selector more specific for the sharing dropdown
2012-08-31 17:26:32 -04:00
75cd7eacf8
[tx-robot] updated from transifex
2012-08-31 02:07:19 +02:00
ca8120e9f4
unify permissions (3/3): remove old PERMISSION_X from FileActions & OC.Share
2012-08-31 01:11:10 +02:00
3ba27e624f
unify permissions (2/3): change apps to use OC::PERMISSION_X
2012-08-31 01:11:10 +02:00
61a3e5f96b
unify permissions (1/3): add permission conastants to javascript OC
2012-08-31 01:11:10 +02:00
6324daecc0
Don't wait for document ready for setting requesttoken
2012-08-30 23:10:24 +02:00
b483f2aab8
Merge branch 'master' into routing
...
Conflicts:
apps/contacts/js/contacts.js
apps/contacts/lib/search.php
apps/files_archive/js/archive.js
apps/gallery/lib/tiles.php
apps/gallery/templates/index.php
lib/ocs.php
2012-08-30 21:49:28 +02:00
8990855f88
add OC.get and OC.set to get/set variables by name in javascript
2012-08-30 03:02:29 +02:00
3828d86191
Remove old Javascript code
2012-08-29 14:37:36 -04:00
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
76bc4753e9
Fix displaying if a link is password protected
2012-08-29 14:06:55 -04:00
0788c6e968
Hide link password controls if link is removed
2012-08-29 14:06:55 -04:00
26501a0bc8
Delete old link if user sets a password
2012-08-29 14:06:55 -04:00
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
9fcb916057
Fix toggling of password protection in sharing dropdown
2012-08-29 11:54:49 -04:00
9338d093f9
[tx-robot] updated from transifex
2012-08-29 02:06:48 +02:00
92c782c1b0
return the jQuery deferred object when using OC.loadScript
2012-08-29 01:57:59 +02:00
2aac6f02a0
Reimplement links support for sharing and add password protection option
2012-08-27 20:37:38 -04:00
0a9d1ed3a6
Initial previewer for public links
2012-08-27 20:37:38 -04:00
8374a49cc1
[tx-robot] updated from transifex
2012-08-28 02:03:56 +02:00
4910717c09
remove background fade from navigation, fix flickering icon issue and make it feel faster
2012-08-27 14:05:18 -07:00
c33a2ca01d
[tx-robot] updated from transifex
2012-08-27 02:02:37 +02:00
545812f589
Move additional jquery.inview files
2012-08-26 18:50:20 -04:00
d6bb04a74e
Move jquery.inview from contacts app to core
2012-08-26 17:55:51 -04:00
faf702b9e6
[tx-robot] updated from transifex
2012-08-26 19:47:33 +02:00
a1a3862274
[tx-robot] updated from transifex
2012-08-26 02:02:48 +02:00
bae07faa34
[tx-robot] updated from transifex
2012-08-26 01:20:16 +02:00
fd5af9aff4
Merge branch 'master' of git://gitorious.org/owncloud/owncloud into oracle-support
2012-08-25 00:06:20 +02:00
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
d84b1adf34
Dynamically update shared status icon
2012-08-24 15:32:06 -04:00
7168fa4b05
Add padding to the reshared text
2012-08-24 15:12:16 -04:00
fedb3641f9
Determine if reshare needs to be checked
2012-08-24 15:12:16 -04:00
36487246ed
Switch to using file cache ids instead of paths for file sharing
2012-08-24 10:05:37 -04:00
cfec290ad9
Prevent resharing in UI if share permission not granted
2012-08-24 10:05:37 -04:00
76e0ca785b
Added XSRF check
2012-08-24 14:58:48 +02:00
a3b4cb205c
Show Login-Button when user+pw are autocompleted, fixes oc-1068
2012-08-24 14:54:16 +02:00
07a889631e
[tx-robot] updated from transifex
2012-08-24 02:07:18 +02:00
aefa52018d
Use right variable name.
2012-08-23 05:02:30 +02:00
885b8c481b
Check if files_sharing app is enabled, move file specific javascript to files_sharing app
2012-08-22 12:32:07 -04:00
3debb67458
Move share CSS to core, add script and style from inside Share API
2012-08-22 11:57:58 -04:00
9699ff03bd
Revert using item name, no longer allowing the same item source exist for a user
2012-08-22 11:57:58 -04:00
e6d87b2c4b
[tx-robot] updated from transifex
2012-08-22 02:08:16 +02:00
09e851a9c4
Fix share ajax calls to use itemName/itemSource, show who shared a file with you
2012-08-20 21:22:22 -04:00
49229da0e1
Remove setTarget from ajax
2012-08-20 21:22:22 -04:00
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
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
d54390b1a0
Optimized image size
2012-08-18 13:56:04 +02:00
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
df8a2e5361
File sharing cleanup, works perfectly I think :)
2012-08-16 12:20:14 -04:00
63af75586b
Merge branch 'master' into routing
2012-08-15 17:39:00 +02:00
4954e46bb2
Use core routes in js too
2012-08-15 17:38:55 +02:00
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
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
eb516b79b6
Position appsettings fixed and load it in dynamically added element.
2012-08-12 18:42:54 +02:00
db4111f6d5
Routing: Add some core routes
2012-08-12 16:52:36 +02:00
355a1adb3a
[tx-robot] updated from transifex
2012-08-12 02:04:58 +02:00
81b997b56e
Merge branch 'backgroundjobs'
2012-08-10 13:00:51 +02:00
667cd318fe
Use OC_Util::displayLoginPage and cleanup the function
2012-08-10 11:43:04 +02:00
334296b027
Removed unused file
2012-08-10 00:09:00 +02:00
ab97c04894
Added XSRF check
2012-08-10 00:09:00 +02:00
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
7fa896971f
JavaScript file for activating web cron
2012-08-09 00:58:54 +02:00
d02b0e39b2
Fix issues with hiding and showing dropdown
2012-08-08 17:50:09 -04:00
a22f30fb78
Reset item shares variable, fixes autocomplete not showing people
2012-08-08 11:39:00 -04:00
b1a7e30819
Actually change background image of shared items
2012-08-07 21:23:55 -04:00
d4882df8cb
Fix warnings and better styling
2012-08-07 23:29:56 +02:00
1b5c8ff471
Don't return error when just no sharing found
2012-08-07 23:29:01 +02:00
0ddfc94cf5
Try to fix last commit
2012-08-07 14:34:29 -04:00
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
b6b713eb76
Only show the user's groups in the share with autocomplete
2012-08-06 20:43:08 -04:00
a9f894ce11
[tx-robot] updated from transifex
2012-08-07 02:07:50 +02:00
51ddc44b62
Somewhat fixes dropdown display issues in the contacts app
2012-08-06 15:43:20 -04:00
6f83540dd6
Remove person from array after unshare, so name appears in autocomplete again
2012-08-06 14:45:45 -04:00
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
4f10574065
Don't load item if it doesn't have it status set
2012-08-06 13:30:44 -04:00
3b2c853916
Lots of refactoring to share API
2012-08-06 11:27:13 -04:00
cc445e4e47
Small changes to allow updating main menu dynamically.
2012-08-05 01:42:17 +02:00
538e72fe61
Fix scrollbar issue. Fixes oc-1414
2012-08-04 23:30:28 +00:00
002ad4ba16
Tweak users delete notification
2012-08-04 16:44:26 -04:00
c5d5ca88a8
Show Login-Button when user+pw are autocompleted, fixes oc-1068
2012-08-03 13:15:15 +02:00
91e828c6ce
[tx-robot] updated from transifex
2012-08-02 02:06:16 +02:00
26e406c3c0
Hide 'can edit' if not checked
2012-08-01 18:03:00 -04:00
4933128850
Throw exceptions in share API for UI to display
2012-08-01 17:52:29 -04:00
2201074e1f
Basic setup for sharing with contacts
2012-08-01 17:17:28 -04:00
98f37b93f6
Propagate exceptions in OC.appSettings.
2012-08-01 16:24:02 +02:00
83b935a1c2
Prevent up and down arrow from changing the share with input value
2012-07-31 21:31:59 -04:00
b6aa5d2875
Include contacts in share with search
2012-07-31 21:05:00 -04:00
274d1ef87f
[tx-robot] updated from transifex
2012-08-01 02:02:35 +02:00
36ccaf51ed
[tx-robot] updated from transifex
2012-07-31 22:57:24 +02:00
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
269922543e
Give share with search focus when sharing dropdown appears
2012-07-31 14:48:19 -04:00
795e78809f
add oracle to install & setup
2012-07-31 19:34:30 +02:00
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
8729119d4b
Add suggestion to share with search for sharing via email
2012-07-31 10:18:26 -04:00
6df95db8e8
Forgot to also use the options I added :-P
2012-07-31 16:05:58 +02:00
8837576ce7
Added some more options to OC.appSettings().
2012-07-31 16:03:08 +02:00
fb14cb87bd
Made the parameter for OC.appSettings() an object to be able to extend it.
2012-07-31 14:17:28 +02:00
084866cb1e
White space
2012-07-31 14:06:44 +02:00
553773f2e1
Popup for app specific settings.
2012-07-31 12:23:22 +02:00
d66f071d3e
Use search and limit parameters for share with search in sharing dropdown
2012-07-30 20:21:48 -04:00
ed71343df8
Autocomplete for share with search in sharing dropdown
2012-07-30 15:30:21 -04:00
3430dcd367
[tx-robot] updated from transifex
2012-07-30 02:05:41 +02:00
e18639551d
Tweak appearance of undo delete notification
2012-07-29 18:02:08 -04:00
db72ce398b
Add support for configuring which permissions are possible for items
2012-07-27 10:13:23 -04:00
680eed6bac
fix for bug #1295 , don't escape password reset link
2012-07-27 15:35:36 +02:00
cb21406e18
Implement CRUDS in share dropdown, and some clean-up
2012-07-26 21:56:22 -04:00
0a9c33e151
[tx-robot] updated from transifex
2012-07-27 02:04:26 +02:00
ba0ea21074
[tx-robot] updated from transifex
2012-07-26 08:04:12 +02:00
12dfe5868a
Updated style
2012-07-26 01:38:46 +02:00
d24326ecce
Updated style
2012-07-26 01:38:20 +02:00
d425740dc2
Remove unused files
2012-07-26 01:19:46 +02:00
1554d7a2c0
Check for admin user
2012-07-26 01:16:32 +02:00
9605e1926c
Check for admin user
2012-07-26 00:06:51 +02:00
85a410d7a3
Remove unused files
2012-07-26 00:04:12 +02:00
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
4d17ed2f71
Make file actions permissions aware
2012-07-25 16:33:08 -04:00
b1010160b3
CSRF protection for eventsource
2012-07-22 16:37:49 +02:00
f9d3388854
Merge branch 'master' into calendar_import
2012-07-21 17:37:10 +02:00
20a174e71b
remove second "autocomplete" statement
2012-07-18 12:27:15 +02:00
3895e3a5ae
remember username and provide autocomplete feature
2012-07-18 12:26:10 +02:00
0ea29398c7
remember username and provide autocomplete feature
2012-07-18 12:22:30 +02:00
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
88f4845ca3
Sanitization isn't required here
2012-07-11 20:04:18 -04:00
cbf851de69
Show private link in dropdown
2012-07-11 12:21:30 -04:00
ccb5e99395
Generate random token for private links (more entropy than past private links)
2012-07-11 12:18:59 -04:00
5575493900
Merge branch 'master' into calendar_import
2012-07-11 10:47:30 +02:00
b148256233
Get rid of sneaky error_log() that got left behind
2012-07-10 21:30:52 -04:00
c0e1b8e7e7
Sanitize POST and GET in ajax/share
2012-07-10 19:54:03 -04:00
7c908a0016
Sharing files working using share API
2012-07-10 18:56:22 -04:00
e59a1806cf
remove superfluous ?> at the end of .php files (left out apps/*/templates)
2012-07-09 16:51:16 +02:00
0045e64041
Fix time formatting for minutes, prepend 0 if minutes is less than 10
2012-07-06 16:49:15 -04:00
90e4af312a
Fix time formatting for minutes, prepend 0 if minutes is less than 10
2012-07-06 16:38:54 -04:00
657eef354a
Merge branch 'master' into calendar_import
2012-07-04 13:03:30 +02:00
799e34acd4
Add slash to app url if not set fix oc-1169
2012-07-03 21:58:36 +00:00
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
db33765e36
Add share with to list in dropdown after sharing
2012-07-03 16:52:53 -04:00
5e8ef33190
Clean up in the dropdown for unsharing
2012-07-03 14:00:09 -04:00
dd56416a39
Remove the method getItemsSharedStatuses, it is easy enough to just pass the format instead
2012-07-02 14:23:13 -04:00
dd7d34a40e
Prevent adding a duplicate to a multiselect
2012-07-01 11:36:44 -04:00
949cab7ea1
Add new group to other user's group select forms
2012-07-01 11:36:31 -04:00
f456cee9d8
Fix fetching item type from share class element, comment out the auto hider for now since it doesn't work outside of the Files app
2012-06-30 21:06:04 -04:00
433d15d309
Merge branch 'master' into calendar_import
2012-06-30 12:50:26 +02:00
8e4832bd12
Prevent adding a duplicate to a multiselect
2012-06-29 16:44:08 -04:00
05cb94801a
Add new group to other user's group select forms
2012-06-29 16:29:58 -04:00
cb19fdd55b
Show users and groups shared with in dropdown
2012-06-27 01:05:37 +02:00
578b8a9da1
$_POST variables should be $_GET for fetch
2012-06-27 01:05:36 +02:00
b5961635ea
Fix ajax share file and replace 'User or Group' select form with a textbox
2012-06-27 01:05:36 +02:00
f21fdf14f9
Forgot I got rid of the class field backendTypes, use the array keys of the backends field instead
2012-06-27 01:05:36 +02:00
bc68f14c4b
Prepare drop down UI for share API
2012-06-27 01:05:36 +02:00
945565f420
Move ajax and js files to core
2012-06-27 01:05:36 +02:00
4e53db3d9c
Merge branch 'master' into oc_error
2012-06-26 14:17:32 +02:00
595ff468f5
typo in js statement fixed
2012-06-26 10:36:33 +02:00
18d5420744
typo in js statement fixed
2012-06-26 10:35:19 +02:00
f374dae233
Added text ACS warning to admin's user settings page, and corresponding CSS styles
2012-06-25 18:04:10 +01:00
a113ee9e9f
add x-webkit-speech to searchbox
2012-06-24 00:42:16 +02:00
243f910ae4
Merge branch 'master' into oc_error
2012-06-22 21:37:03 +02:00
df60d6d5d2
Fixes for multi app dir :
...
Url should be given as relative path (to webroot)
Correct link construction from js
2012-06-22 12:24:56 +02:00
e5c56b2433
Merge branch 'master' into multi_app_dir
...
Conflicts:
lib/app.php
lib/base.php
lib/minimizer/css.php
lib/minimizer/js.php
lib/template.php
lib/util.php
2012-06-21 17:15:35 +00:00
34739b7ec5
use new sanitizeHTML() function
2012-06-21 13:57:18 +02:00
ccacb6f918
Merge branch 'master' into oc_error
2012-06-19 11:30:18 +02:00
c3cd3f3571
CSS class headerAction -> header-action
2012-06-18 23:22:52 +02:00
0132b80282
added CSS class .headerAction
2012-06-18 23:18:32 +02:00
6bd0a158f7
Merge branch 'master' into oc_error
2012-06-18 15:59:39 +02:00
2f00384b51
Use TemplateLayout functions for finding js and css files in minimizer
2012-06-18 15:40:48 +02:00
e31c9a7b6f
Merge branch 'master' into oc_error
2012-06-18 14:34:49 +02:00
4a50c15a8e
corrected header width and floating (can now dynamically add stuff to header); someone may test this in IE
2012-06-18 13:36:49 +02:00
617de811f7
Cache the minimized output also on the server
2012-06-18 11:11:46 +02:00
06c610c2ee
Merge branch 'master' into oc_error
2012-06-17 08:36:33 +02:00
99a68abbd5
Add session_write_close to the minimizer
2012-06-16 20:52:10 +02:00
2c8a61ae9c
Merge branch 'master' into oc_error
2012-06-15 20:48:37 +02:00
4753cc3ebd
Merge branch 'master' into multi_app_dir
...
Conflicts:
apps/bookmarks/ajax/addBookmark.php
config/config.sample.php
lib/app.php
remote.php
2012-06-14 21:16:59 +00:00
f0b87bc421
Make requesttoken global.
2012-06-14 18:13:01 +02:00
5b1a14f9ea
Contacts: Implement CSRF prevention.
2012-06-14 18:00:13 +02:00
625cd822c3
Backport CSRF prevention.
2012-06-14 13:52:22 +02:00
b5889d6ffe
Merge commit 'refs/merge-requests/127' of git://gitorious.org/owncloud/owncloud into merge-requests/127
...
Conflicts:
apps/files_external/templates/settings.php
lib/template.php
2012-06-13 15:17:46 -04:00
89464721c7
Added JSON methods for CSRF prevention. Make request token accessible from template and add js var.
2012-06-13 17:33:19 +02:00
48ee265170
urlencode link fort password reset (bug #970 )
2012-06-13 17:26:30 +02:00
b9d5f510c3
urlencode link fort password reset (bug #970 )
2012-06-13 17:22:28 +02:00
6defbc7f4d
Removed some unessecary sanitizations
2012-06-11 19:20:48 +02:00
2b22c538c8
Make some apps compatible
2012-06-11 19:07:51 +02:00
82abbed883
Merge branch 'master' into oc_error
2012-06-10 18:38:38 +02:00
8f616ecf76
fix potential xss in multiselect
2012-06-09 15:08:05 +02:00
cfe219fbb9
fix potential xss in multiselect
2012-06-09 15:07:16 +02:00
f43fd1765e
fix merge conflicts
2012-06-08 11:23:58 +02:00
4260dce826
Better handling of core.css and core.js
...
Fixes calling remote.php on install.
Fixes http://bugs.owncloud.org/thebuggenie/owncloud/issues/oc-933
2012-06-07 21:35:40 +02:00
cf02f3c107
Merge branch 'master' into multi_app_dir
2012-06-07 19:11:55 +00:00
d28e0f4d5b
Remove old internal mail call for password reset, fixes bug oc-934
...
Conflicts:
core/lostpassword/index.php
2012-06-07 09:36:23 -04:00
3c3a2b9b27
Remove old internal mail call for password reset, fixes bug oc-934
2012-06-07 09:25:50 -04:00
5c2b2fc842
Change app path logic in templates
2012-06-06 20:24:16 +00:00
cc494259d3
Unit path and webpath, correct some more
2012-06-06 20:24:15 +00:00
fa0c45b005
Merge branch 'master' into oc_error
2012-06-06 10:12:54 +02:00
f1b10fcc93
update translations
2012-06-06 00:29:44 +02:00
f7d221f5f0
update translations
2012-06-06 00:29:28 +02:00
eed0450351
Fix remap dir for CSS minimizer
2012-06-05 18:09:32 +02:00
7e017253f5
Load apps before minimizing the core css and js
2012-06-04 23:17:50 +02:00
4a5973662c
Merge branch 'unstable'
...
Conflicts:
apps/files_external/tests/config.php
apps/files_versions/ajax/getVersions.php
apps/files_versions/appinfo/app.php
apps/files_versions/history.php
apps/files_versions/js/versions.js
apps/files_versions/templates/history.php
apps/files_versions/versions.php
lib/base.php
2012-06-04 23:02:05 +02:00
b8275691e7
Merge branch 'master' into oc_error
2012-06-04 10:35:50 +02:00
d4ea853fcf
use our own serverHost call so that ownCloud works with reverse proxy servers
2012-05-31 20:26:09 +02:00
5d425a9f79
use our own serverHost call so that ownCloud works with reverse proxy servers
2012-05-31 20:16:44 +02:00
94c633b6b7
Merge branch 'master' into oc_error
2012-05-26 22:54:49 +02:00
a945fa10a6
update copyright
2012-05-26 19:14:24 +02:00
79bf933319
Merge branch 'master' into oc_error
2012-05-25 10:30:44 +02:00
ede89ee405
oc-657: icons for M$ office file types
2012-05-21 09:35:31 +02:00
fc536c3491
add htmlentities() call into login form
2012-05-18 16:12:49 +02:00
3d713e711b
Merge branch 'master' into oc_error
2012-05-17 22:17:31 +02:00
cbfbbe672c
Merge commit 'refs/merge-requests/115' of git://gitorious.org/owncloud/owncloud into merge-requests/115
...
Conflicts:
apps/files/templates/index.php
2012-05-17 15:38:28 -04:00
58adeaa80a
only check our own input fields when determining to show the login button
...
fixes a problem with browser plugins adding hidden inputs
2012-05-17 01:17:44 +02:00
ac8bfc218e
update translations
2012-05-17 00:36:21 +02:00
ce1e4425c2
Combine and minimize core and default app js files
2012-05-16 18:53:46 +02:00
f71fec8cdc
Combine and minimize core and default app css files
2012-05-16 18:53:46 +02:00
4c6d11e223
move auth.css and remoteStorage-big.png to assets folders From where they can be included
2012-05-14 17:05:35 +02:00
198b73ddd1
Sanitize search queries, thanks to Lukas Reschke
2012-05-13 15:57:46 -04:00
ee0294bbb1
update translations
2012-05-13 20:00:34 +02:00
a5f0ac811f
Merge branch 'master' into oc_error
2012-05-13 19:13:31 +02:00
9eb91a111d
update to jquery 1.7.2
2012-05-12 00:37:19 +02:00
20499e336b
Remove duplicate line
2012-05-11 22:13:05 +02:00
00e1d174a9
fixed settings text not being clickable
2012-05-11 12:24:49 +00:00
59a2616105
Fix music file action i.e. click to play, make OC.filePath act like OC_Helper::linkTo() for index.php links
2012-05-10 23:04:27 -04:00
d1e5a56bc6
fixing upload icon color
2012-05-10 21:40:22 +02:00
bf93b9e98a
Make select_all checkbox more central
2012-05-10 18:08:46 +00:00
20f8137ca0
upload button goes MJ
2012-05-10 20:05:30 +02:00
6f981738bb
Fix some non-utf8-friendly htmlentities (resulting in wrong display of utf8-encoded directory names for example)
2012-05-10 09:10:53 +00:00
588b51d88a
update translations
2012-05-09 12:41:01 +02:00
52d113b9e1
Prevent extra '/' from being added to url if app is not defined
2012-05-07 12:35:02 -04:00
df6b15445d
Fix bug on browsers like rekonq which stopped execution of javascript
2012-05-07 17:35:23 +02:00
936c8ba1cc
improve remote.php and create public.php
2012-05-07 15:39:17 +02:00
2facf509cc
Merge branch 'tasks' for Tasks app
2012-05-05 18:26:13 +02:00
4a7591d0ab
Custom icons for contacts app
2012-05-05 16:31:58 +02:00
2580d8540d
Dialogs: Clean indentation. Add some missing brackets.
2012-05-05 13:49:47 +02:00
a004759230
Tasks: Really correct icon
2012-05-04 20:44:11 +02:00
d9592ddcb0
Tried to make settings/apps more keyboard/screenreader friendly.
2012-05-04 17:56:00 +02:00
1e47156226
Merge branch 'master' into tasks
2012-05-04 17:04:11 +02:00
27da29525a
Made the global settings icon accessable via keyboard.
...
Bug http://bugs.owncloud.org/thebuggenie/owncloud/issues/oc-561
2012-05-04 09:53:36 +02:00
8d1754041e
VCategories: Check if any categories are selected before json call. Add Close button. Remove log calls.
2012-05-04 01:33:47 +02:00
a4a3d62a55
Check for callback in OC.dialogs.alert.
2012-05-04 00:13:35 +02:00
5611e6c9d3
fix incorrect dialog computing in ff
2012-05-03 12:32:37 +02:00
8feb7dd9d9
fix filepicker in webkit
2012-05-03 12:09:59 +02:00
71f9b1968e
Tasks: Make it possible to close the details area
2012-05-02 17:28:19 +02:00
c536e930f4
add appswebroot to the guest template
2012-05-02 16:41:23 +02:00
98e0db15a2
correction of bug oc-393 in using owncloud V2, V3, V4 with android browser :
...
JSON.parse(null) results in 'Uncaught illegal access' and not 'null' (see google for details)
solved
Signed-off-by: bourgeoa
2012-05-01 23:46:51 +02:00
051cb7d96b
show the username in the title. good idea.
2012-04-30 13:08:32 +02:00
07f2e316e4
removing executable bit from various files
2012-04-30 12:05:57 +02:00
9c520c70a8
Various file path fixes.
2012-04-30 01:48:01 +02:00
993d655aad
Merge branch 'master' into movable_apps_2
2012-04-27 10:30:50 +02:00
74b5e22a68
some more csrf fixes
2012-04-26 23:17:46 +02:00
6930af4c0f
Merge branch 'master' into movable_apps_2
2012-04-26 21:27:22 +02:00
6bdefef31e
csrf protection
2012-04-26 19:35:33 +02:00
2b10371bde
fix merge conflicts
2012-04-26 18:08:49 +02:00
40f95ffdf3
fix security check for the path of the requested file
2012-04-26 17:55:00 +02:00
0249a72cab
fix downloading of files in files app
2012-04-26 17:35:12 +02:00
ebcaa46482
fix loading of css files that are core related
2012-04-26 15:19:27 +02:00
3f64eb25ab
some fixes fore movable apps
2012-04-26 14:52:55 +02:00
02a65f30ec
added history buttons
2012-04-25 14:01:03 +01:00
d6346b5b0b
fix OC.filePath in main js
2012-04-24 21:54:09 +02:00
a85d49833b
fix position of Semicolon
2012-04-24 21:52:44 +02:00
684007bbae
fix pathes in contacts
2012-04-24 21:33:34 +02:00
42a570788b
Merge branch 'master' into movable_apps
2012-04-23 19:56:07 +02:00
6d92ebca45
use native functions of php to parse the string into the Var
2012-04-23 17:09:28 +02:00
9226cb7a6a
rename var file to getfile to prevent fails in files app
2012-04-23 16:36:24 +02:00
1b29fc3fb2
fixing multiselect overflow, issue 341
2012-04-23 14:29:11 +02:00
3ba9a9e6a8
adding proper copyright and license notice to the style files
2012-04-23 14:19:03 +02:00
6b9072de58
fix merge conflicts
2012-04-22 13:20:25 +02:00
4c2cf35050
fix merge conflicts
2012-04-22 13:19:12 +02:00
f08cfcecec
Personal settings: Emphasized labels etc, mono-spaced generated paths and moved text formatting to style sheet.
2012-04-22 03:59:28 +02:00
e29ae46609
fix merge conflicts
2012-04-21 22:12:31 +02:00
711aa229b8
Merge branch 'master' into movable_apps
2012-04-20 22:41:39 +02:00
12ef2f5054
modify OC.filepath for movable apps
2012-04-20 22:35:12 +02:00
2fbc92bd4b
new OC_Mail class to handle all mail sending. The benefit is that is way mor flexible than the standard mail command. can be configured to use a remote smtp relay for example. also port the lostpassword code
2012-04-20 20:49:35 +02:00
3fb91a7411
restore require once command for non app files
2012-04-18 17:49:50 +02:00
eb29c577c2
Merge branch 'master' into movable_apps
2012-04-18 12:20:09 +02:00
cf492a9649
Merge branch 'master' into calendar_sharing
2012-04-18 11:51:59 +02:00
69ee0efc0b
remove the require_once lib base from all (or nearly all) files
2012-04-17 19:31:29 +02:00
cfd0140e2f
fix 2 potential xss problems
2012-04-16 12:59:38 +02:00
3c182bdb35
adding sticker logo jpg
2012-04-16 12:57:17 +02:00
961c239ee4
improving leftcontent display, increasing item height
2012-04-16 12:52:48 +02:00
70d0103a67
updated logos and icons
2012-04-16 11:34:16 +02:00
c8cb870a27
Merge branch 'master' into oc_error
2012-04-15 22:27:47 +02:00
dc18e65b46
fix merge conflicts
2012-04-15 22:26:55 +02:00
e5cda3abcd
tooltip for delete shows up to the left
2012-04-15 17:49:54 +02:00
1f91224f9e
fixing opacity and fading, also for IE
2012-04-15 14:37:42 +02:00
8ddea7e95c
Merge branch 'master' into calendar_sharing
2012-04-15 14:28:31 +02:00
7ddd043427
renamed extention to extension, also now only showing lowercase
2012-04-15 13:34:30 +02:00
5868199e85
fixed settings hover, now whole row sensitive and fading not jerky
2012-04-15 13:34:30 +02:00
e292b1fcdb
fix merge conflicts
2012-04-15 12:43:07 +02:00
fbb314ef4b
Merge branch 'master' of gitorious.org:owncloud/owncloud
2012-04-14 18:56:55 +02:00
30498fd6f8
Use offset function to position block elements
2012-04-14 18:31:41 +02:00
a0a5668d1e
increase opacity of search field and logout icon
2012-04-14 17:20:50 +02:00
b1bcc60d83
reuse OC_L10N objects
2012-04-14 16:44:15 +02:00
e5e7d4a73a
fix merge conflicts
2012-04-13 16:44:31 -04:00
afcb0aee40
fix merge conflicts
2012-04-13 16:40:10 -04:00
b8466d362e
Fix rescan "File not Found" error handling in oc-vcategories.js
2012-04-13 21:13:58 +02:00
eea0d2e096
fixing delete tooltip
2012-04-13 18:28:17 +02:00
add9673ad6
merging tanghus category CSS
2012-04-13 17:23:56 +02:00
31df4c00ec
adding tipsy tooltips for file actions
2012-04-13 17:22:23 +02:00
bc81179163
Fix categories delete fallback when there is no app specific ajax categories delete function
2012-04-12 23:10:49 +02:00
56bc2c4591
add a title attribute to the logout button
2012-04-12 20:34:56 +02:00
2f3c0a6d80
wrong defaultValue definition in OC.AppConfig.getValue
...
done
2012-04-12 19:14:25 +02:00
ac2d14101c
Merge branch 'master' into calendar_sharing
2012-04-10 20:10:07 -04:00
9f547a1b39
VCategories: fix function names to coding standard
2012-04-10 21:53:51 +02:00
d1ae6512cc
Contacts: Misc. cleanup tweaks.
2012-04-07 16:03:43 +02:00
96c99125da
mimetype filter for filepicker
2012-04-05 23:18:44 +02:00
fe3d3be399
filepicker loading style fixup
2012-04-05 22:25:58 +02:00
5b4a303672
loading screen for filepicker
2012-04-05 21:29:54 +02:00
8a2c5dda6d
Merge commit 'refs/merge-requests/102' of git://gitorious.org/owncloud/owncloud into merge-requests/102
2012-04-04 21:36:50 +02:00
85f9869f69
Make the token really random
2012-04-04 13:18:02 +00:00
95c2ac5d58
Dont typecast variables as integers
2012-04-03 21:14:55 +00:00
cd05dfb943
adding icons to filepicker
2012-04-03 22:18:03 +02:00
ff5dbc52b8
multiselect handle for filepicker
2012-04-02 21:32:35 +02:00
f21d6d4f9f
dialogs filepicker first draft
2012-04-02 19:39:24 +02:00
d01b78a4b4
prevent an possible xss exploit
2012-04-01 00:55:49 +02:00
4e327295c6
adding callback when ok click on alert dialog
2012-04-01 00:30:52 +02:00
2f68b08491
fix eventsource for ie
2012-03-31 16:40:42 +02:00
ad495a9218
fix potential problem when using multiply eventsource's
2012-03-31 16:10:29 +02:00
6b704a780d
select field added to oc.dialogs.form, gallery ported to use it
2012-03-30 22:50:57 +02:00
d15959d573
Merge branch 'master' into calendar_sharing
2012-03-29 23:19:31 +02:00
e45e48ff3d
Merge branch 'master' into oc_error
2012-03-29 23:18:47 +02:00
d049d9bd0c
initial commit for OC_Exception
2012-03-29 23:16:19 +02:00
e2fd0bbf02
IE 8: fix appeareance of checkboxes on login and files pages
2012-03-29 18:32:25 +02:00
ede0a675bc
Merge branch 'master' into calendar_sharing
2012-03-27 20:53:40 +02:00
0a07e5fdaa
Added some documentation.
2012-03-27 12:30:20 +02:00
96dd008f5e
Merge branch 'master' into calendar_sharing
2012-03-26 09:50:39 +02:00
ec40f69c9e
add error 403 site
2012-03-25 14:16:39 +02:00
19c101a660
fix merge conflicts
2012-03-25 14:02:02 +02:00
cbdcb68c2b
gallery sharing, experimental version
2012-03-24 18:35:42 +01:00
7ed8f39744
as preperation for the sgf viewer app i added a file icon for .sgf files (saved go games), and an according mimetype.
2012-03-23 13:34:07 +01:00
61166c1002
Merge branch 'master' into calendar_sharing
2012-03-21 09:43:29 +01:00
03120959e9
add a proper email address for lostpassword service - bugfix for oc-178
2012-03-19 09:09:18 +01:00
27218f85cb
Merge branch 'master' into calendar_sharing
2012-03-16 12:17:58 +01:00
03eb5197b6
Added category editor for apps using OC_VObjects.
2012-03-12 14:13:03 +01:00
ab760578f8
Allow overflow of rightcontent area
2012-03-07 21:46:42 +01:00
c40668e3a9
Merge branch 'master' into calendar_sharing
2012-03-04 10:10:19 +01:00
c411826fe5
moving gallery op to one file, migrate gallery dialogs to oc dialogs
2012-03-04 00:35:37 +01:00
f2dcab50b5
fix merge conflicts
2012-03-03 15:06:51 +01:00
2754cac21f
dialogs library for apps
2012-02-28 23:02:30 +01:00
630cee0ef2
bookmarklets should not look like buttons
2012-02-27 18:20:40 -05:00
2a351f4456
Fixed off by one bug. List length is 1 larger than the index of the last
...
element.
2012-02-26 22:09:21 +01:00
3d0d47957e
improved humanFileSize for js
2012-02-26 14:12:50 +01:00
a5e892505e
more robust png fallback
2012-02-26 03:10:29 +01:00
797e921b9a
improve log browsing
2012-02-26 03:10:29 +01:00
bfb67286c8
fix merge conflicts
2012-02-25 16:54:27 +01:00
8b93a9a237
add javascript bindings for OC_AppConfig
2012-02-25 16:35:40 +01:00
862f824d64
some multiselect improvements
2012-02-25 16:35:40 +01:00
11cb45bd43
slight change to select style
2012-02-24 23:54:38 +01:00
b3f3b8c23f
UI problems solved. Bookmarks app updated.
2012-02-22 16:04:31 +01:00
6540bda238
some icons for filetypes have been added.
...
for licensing information please have look at core/img/filetypes/readme-2.txt
2012-02-20 22:33:38 +01:00
f47444e1f7
Use separate function to make absolute urls
2012-02-17 22:07:14 +01:00
01827e9340
Merge branch 'master' into calendar_sharing
2012-02-13 17:08:52 +01:00
a25bda8e41
Add application name to title
2012-02-12 21:56:01 +01:00
a8b7ae515c
Merge branch 'master' into calendar_sharing
2012-02-10 19:36:00 +01:00
c95e8a1fc5
Added custom combobox widget.
2012-02-10 16:40:40 +01:00
90a830baba
Added files for new contact editor/viewer.
2012-02-08 07:59:39 +01:00
f91702d7b5
Merge branch 'master' into calendar
2012-01-31 17:03:48 +01:00
fdf3df3de5
add option to send get data along with an eventsource request
2012-01-31 16:35:47 +01:00
538618df62
Merge branch 'master' into calendar
2012-01-31 11:58:40 +01:00
217151eb9c
add textfield style declaration
2012-01-31 11:50:45 +01:00
6a1121ab2e
provide server side close option for EventStream
2012-01-30 23:19:58 +01:00
45038af948
provide small wrapper around server side events and provide a fallback for IE
2012-01-30 20:21:16 +01:00
039bbfde2d
automatically show advanced options when no sqlite is available
2012-01-29 18:00:55 +01:00
ad4e305c96
update translations
2012-01-27 00:59:24 +01:00
6fccf12299
update translations
2012-01-24 00:42:08 +01:00
7ea2923fa8
translation updates
2012-01-20 18:53:45 +01:00
965ea96439
update translations
2012-01-16 17:34:53 +01:00
b366b0eb52
quick fix for javascript translations
2012-01-16 00:09:43 +01:00
a883fcca3c
add user and instance awere localstorage to prevent collisions when using localstorage
2012-01-15 19:22:32 +01:00
7cd809b286
update translations
2012-01-15 15:12:58 +01:00
9c04858631
added vcards to the mimetype fix list and renamed the icon for vcards
2012-01-15 11:02:08 +01:00
872d301af3
fix inconsitent behaviour when trying to remove yourself from the admin group
2012-01-15 00:50:01 +01:00
5cd6e0f4d9
remove some of the flickering in opera
2012-01-15 00:14:42 +01:00
56af6ee752
fix some of the styling issues on opera
2012-01-14 23:47:31 +01:00
0ac9e56da9
small fix for server svg mimetype detection
2012-01-14 23:41:48 +01:00
5eb6071b04
make the minimum width of the multiselect configurable
2012-01-14 23:10:14 +01:00
ffd47ef4d7
Merge branch 'master' of gitorious.org:owncloud/owncloud into ace-editor
2012-01-13 16:55:55 +00:00
f67e5d18e7
update translations
2012-01-11 01:06:59 +01:00
3f67918522
Merge branch 'master' of gitorious.org:owncloud/owncloud into ace-editor
2012-01-09 21:17:41 +00:00
6c78cd2765
Moved .separator to core css
2012-01-09 18:39:09 +00:00
6dcabdc61c
Fixed merge conflict in /files/ajax/move.php
2012-01-04 16:31:06 +00:00
a1af757ef6
Fix whitespace username in the installation form
2012-01-02 14:21:46 +01:00
1415cb8d19
add infieldlabel source
2012-01-01 23:48:38 +01:00
cbb2db8622
Fix merge conflicts
2012-01-01 01:18:02 +00:00
5ebf8a87f2
Removed old jquery-ui css and js
2011-12-30 23:08:44 +00:00
39e67707d7
Updated jquery ui js and css. Improved color scheme.
2011-12-30 22:47:39 +00:00
e1b9b65e41
Use correct appid for lostpassword email preference
2011-12-18 23:10:43 +01:00
e5a3ab8aad
Merge branch 'master' into fullcalendar
2011-11-12 15:09:37 +01:00
2c68aab198
Merge branch 'master' into newbutton
2011-11-04 03:00:03 +01:00
c7d1737d47
attempt to manage some special chars in file list
...
Added a jquery function to filter by attributes.
Add more logging in rename file
Use the new function to avoid errors
2011-11-01 22:35:13 +01:00
9832a0817d
Merge branch 'master' into fullcalendar
...
Conflicts:
apps/calendar/index.php
2011-10-24 22:40:22 +02:00
abf33d32b9
use existing correct info icons
2011-10-23 21:53:00 +02:00
0c890a501c
upgraded the new new button. Didn't and doesn't work in Firefox though
2011-10-23 21:51:56 +02:00
4140a75a5e
corrected position of in-field labels a bit
2011-10-23 11:46:34 +02:00
c28504deca
textfield is now less obtrusive / opaque
2011-10-23 11:46:34 +02:00
93c18e9ae3
added all logo source SVGs
2011-10-23 11:46:34 +02:00
d46288b0ab
'New' button, needs some css work
2011-10-23 11:40:40 +02:00
Bernhard Posselt
libasys
Thomas Müller
Alessandro Cosentino
Thomas Tanghus
Bart Visscher
Jörn Friedrich Dreyer
Jan-Christoph Borchardt
Lukas Reschke
Felix Moeller
Michael Gapczynski
Björn Schießle
Georg Ehrke
Robin Appelman
scambra
Michael Göhler
Victor Dubiniuk
Frank Karlitschek
Christian Reiner
Christian Reiner
Tom Needham
Arthur Schiwon
Anders Nor Berle
Jakob Sack
Brice Maron
Michael Gapczynski
Sam Tuke
Florian Hülsmann
Michiel de Jong
Vitaly Kuznetsov
Simon Birnbach
Bartek Przybylski
unknown
Frank Karlitschek
Frank Karlitschek
Sam Tuke
Jan-Christoph Borchardt
Nils Jansen
Roland van Laar
Marvin Thomas Rabe
Robin Appelman
Georg Ehrke