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
2201074e1f
Basic setup for sharing with contacts
2012-08-01 17:17:28 -04:00
b6aa5d2875
Include contacts in share with search
2012-07-31 21:05:00 -04: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
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
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
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
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
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
e59a1806cf
remove superfluous ?> at the end of .php files (left out apps/*/templates)
2012-07-09 16:51:16 +02: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
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
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
b1bcc60d83
reuse OC_L10N objects
2012-04-14 16:44:15 +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
2f3c0a6d80
wrong defaultValue definition in OC.AppConfig.getValue
...
done
2012-04-12 19:14:25 +02:00
03eb5197b6
Added category editor for apps using OC_VObjects.
2012-03-12 14:13:03 +01:00
2e05bd69f5
add javascript bindings for OC_AppConfig
2012-02-22 22:20:11 +01:00
17e631bc5e
Use OC_JSON for json responses
...
Create OC_JSON class, for single point of creating json responses.
No real logic change, this just cleans up the code a bit.
2011-09-25 22:19:28 +02:00
30dab8473d
Change authentication method to basic http auth instead of using $_GET variables
...
Also use OC_User::isLoggedIn to check if new authentication is needed for grouplist.php and userlist.php
For validateuser.php, credentials are always needed.
2011-08-17 12:47:56 +02:00
4f3fdf6c45
Add scripts to get user list and group list as json data.
...
Info about which groups the users belong to are also in the user list. Both files need logging in through GET because unauthorized users are not allowed to see this data.
2011-08-15 17:38:31 +02:00
bd12bdfe56
Add validateuser.php ajax file returning json data saying whether a user exists and the credentials are correct
2011-08-13 21:07:51 +02:00
bcfd1ff304
Adapt javascript-i18n to latest changes
2011-06-20 22:57:28 +02:00
61993419ec
New i18n-structure
2011-06-20 21:54:21 +02:00
Michael Gapczynski
Bart Visscher
Robin Appelman
Thomas Tanghus
Felix Moeller
Björn Schießle
Christian Reiner
Lukas Reschke
Thomas Mueller
Jörn Friedrich Dreyer
Michael Gapczynski
unknown
Hans Bakker
Jakob Sack