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
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
b0ae67d5c5
Update vcategories ajax scripts.
2012-11-01 03:06:20 +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
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
1bdd0c949b
Move and fix app setting navigation detect
2012-10-29 15:04:55 +01: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
0120f3fd62
Merge branch 'routing'
...
Conflicts:
core/lostpassword/index.php
core/lostpassword/resetpassword.php
2012-10-27 11:58:02 +02:00
da57fbc93a
show/hide navigation entries after enabling/disabling app
2012-10-26 20:13:24 +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
2d61f03452
More Checkstyle cleanup
...
This is for all LowerCaseConstant warnings
2012-10-23 08:01:09 +02:00
e55cc23132
app !== type
2012-10-19 02:24:57 +02:00
b9c9fdfe20
Use get for loading dialog.
2012-10-19 00:38:23 +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
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
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
de1bfe9d6b
Make the core ajax calls use the router
2012-10-02 21:58:42 +02:00
743826bbf3
Reimplementation of CSRF protection including autorefresh
2012-09-28 13:30:44 +02:00
ac79fe649c
Added a missing CSRF check
2012-09-22 11:02:03 +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
8f0354bcdd
Temporarily disable sharing with contacts and emails, will come in next release
2012-09-12 01:02:08 -04:00
13d513c17c
Fix shared collection item searching
2012-09-09 11:50:12 -04:00
3829460ab8
adding space between) and {
2012-09-07 15:22:01 +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
6c29334b48
Add support for share expiration
2012-09-01 18:53:48 -04:00
2aac6f02a0
Reimplement links support for sharing and add password protection option
2012-08-27 20:37:38 -04:00
fedb3641f9
Determine if reshare needs to be checked
2012-08-24 15:12:16 -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
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
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
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
334296b027
Removed unused file
2012-08-10 00:09:00 +02:00
ab97c04894
Added XSRF check
2012-08-10 00:09:00 +02: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
4933128850
Throw exceptions in share API for UI to display
2012-08-01 17:52:29 -04:00
Thomas Müller
Thomas Tanghus
Lukas Reschke
Bart Visscher
Michael Gapczynski
Robin Appelman
Felix Moeller
Björn Schießle
Christian Reiner