Georg Ehrke
48f0c54261
style fixes for preview lib
2013-08-19 12:16:55 +02:00
Georg Ehrke
4b5fb08c2c
Merge master into oc_preview
2013-08-14 20:56:44 +02:00
Georg Ehrke
f9b2815767
remove \OC\Preview::showErrorPreview
2013-08-14 12:21:27 +02:00
Owen Winkler
a2ac5e0163
Merge pull request #4271 from owncloud/plural_translations
...
Plural translations
2013-08-08 10:34:28 -07:00
Thomas Müller
2e5f1142be
return plural form in ajax translations
2013-08-03 23:27:18 +02:00
Georg Ehrke
640253fa31
fix code style of try catch blocks
2013-07-30 13:43:15 +02:00
Georg Ehrke
ac6a3133ec
style fixes
2013-07-30 12:33:54 +02:00
Robin Appelman
58f473d734
split upgrade logic from ajax file
2013-07-06 17:00:00 +02:00
Stephan Arts
3cd7747e7b
Use templates to theme share e-mails ( #3683 )
2013-06-14 17:38:56 +02:00
Michael Gapczynski
4687f50e75
Add undefined verision variables
2013-05-17 11:15:53 -04:00
Bart Visscher
ff64c87adb
Connect watcher failure function to the failure signal
2013-05-04 00:07:30 +02:00
Bart Visscher
41f7eb948a
Move start of the maintenance mode to the ajax call
...
Make sure the update page is shown in a browser. And not an ajax request
2013-05-04 00:05:29 +02:00
Arthur Schiwon
e25c1f3130
port 22c8194cc8
2013-04-02 21:03:13 +02:00
root
7f74f08808
Add missing backticks.
...
Especially at user without "" PostgreSQL likes to fail.
2013-03-30 23:52:26 +01:00
Arthur Schiwon
18554059a4
Remove Debug output
2013-03-27 19:12:53 +01:00
Arthur Schiwon
e2afd0cb42
Upgrade FileCache on ownCloud upgrade for all users with files
2013-03-27 19:12:28 +01:00
Frank Karlitschek
761540e78b
Merge pull request #2320 from ceri/master
...
Fix erroneous email when folders are shared
2013-03-15 04:22:44 -07:00
Björn Schießle
8154b4be7d
use display name as sender for private link mails, approved in #2294
2013-03-14 13:26:20 +01:00
Ceri Davies
17cb47fbf6
Correct emails when folders are shared.
...
itemType is never "dir"; it's either "file" or "folder".
2013-03-14 10:04:58 +00:00
Michael Gapczynski
5300d6ad55
Clear the CSS and JS cache earlier to make sure update goes smoothly
2013-03-05 21:13:07 -05:00
Lukas Reschke
630483c75d
Fix notice
2013-03-02 00:53:53 +01:00
Jan-Christoph Borchardt
fbb989f548
up limit of share dropdown from 4 to 15, scrollbar after 4 1/2 entries, fix #135
2013-02-28 12:07:56 +01:00
Robin Appelman
47b899e0c8
Disable prepared query caching while doing an upgrade
2013-02-26 22:41:48 +01:00
Bart Visscher
1a747b3e48
Style cleanup core dir
2013-02-21 23:47:21 +01:00
Bart Visscher
9dddcae9ca
Remove invalid characters from app id to prevent loading of invalid resources
2013-02-09 15:10:40 +01:00
Thomas Mueller
5f92d269dc
l10n support enhanced in core
2013-02-07 16:49:36 +01:00
Björn Schießle
590c4aa710
search display name instead of uid; fix key/value order for array access
2013-01-28 15:58:40 +01:00
Björn Schießle
e9a57e28fc
show display name instead of uid
2013-01-25 13:57:08 +01:00
Lukas Reschke
8daefd00fb
Sanitize the exception
2013-01-19 19:57:17 +01:00
Michael Gapczynski
f6426cee04
Tweak failure message and throw exceptions from updateDbFromStructure()
2013-01-05 12:13:36 -05:00
Michael Gapczynski
6b2216f0d6
Remove old data directory protection from update, should already have taken place or not working because the server isn't Apache
2013-01-05 11:09:48 -05:00
Michael Gapczynski
e7eea3dd2e
Use hooks to send updates from apps
2013-01-04 10:21:33 -05:00
Michael Gapczynski
7505837079
Basic update progress of database update only
2013-01-03 21:32:33 -05:00
Randolph Carter
d2828bab07
fixes default email sender address
2012-12-19 01:09:14 +01:00
Thomas Mueller
162a2c0fba
moving sharing email code to core
2012-12-10 23:22:42 +01:00
Jörn Friedrich Dreyer
d8a171df26
implement share via link token
2012-11-20 15:03:12 +01:00
Thomas Müller
e06513d76b
Fixing syntax error - closes #406
2012-11-14 11:17:21 +01:00
Thomas Müller
99af3433d1
Fixing syntax error - closes #406
2012-11-14 11:10:31 +01:00
Thomas Tanghus
3c59bc41d7
VCategories: Line too long.
2012-11-05 16:32:20 +01:00
Thomas Tanghus
1147dc9774
Merge branch 'master' of github.com:owncloud/core into vcategories_db
...
Conflicts:
lib/vcategories.php
2012-11-05 12:06:59 +01:00
Thomas Tanghus
b0ae67d5c5
Update vcategories ajax scripts.
2012-11-01 03:06:20 +01:00
Lukas Reschke
7a7f12a0c1
Create only one CSRF token per session
...
Before, the CSRF token expired every hour. We had a script in place
which should refresh the token but this don't worked in every case.
(Laptop sleeping etc.)
With this commit, the token will only get once created for every
session so that the "Token expired" warning shouldn't appear.
2012-10-31 18:37:59 +01:00
Thomas Tanghus
5550cde03b
Merge branch 'master' of github.com:owncloud/core into vcategories_db
...
Fix conflicts:
core/ajax/vcategories/add.php
core/ajax/vcategories/delete.php
2012-10-30 06:53:49 +01:00
Bart Visscher
1bdd0c949b
Move and fix app setting navigation detect
2012-10-29 15:04:55 +01:00
Michael Gapczynski
fefc4e1707
Load all apps in core share ajax file for apps to register their share backends
2012-10-27 17:25:10 -04:00
Bart Visscher
0120f3fd62
Merge branch 'routing'
...
Conflicts:
core/lostpassword/index.php
core/lostpassword/resetpassword.php
2012-10-27 11:58:02 +02:00
Robin Appelman
da57fbc93a
show/hide navigation entries after enabling/disabling app
2012-10-26 20:13:24 +02:00
Thomas Tanghus
675a56c5ed
Merge branch 'master' of github.com:owncloud/core into vcategories_db
...
Conflicts:
lib/vcategories.php
2012-10-24 21:55:25 +02:00
Felix Moeller
2d61f03452
More Checkstyle cleanup
...
This is for all LowerCaseConstant warnings
2012-10-23 08:01:09 +02:00
Thomas Tanghus
e55cc23132
app !== type
2012-10-19 02:24:57 +02:00
Thomas Tanghus
b9c9fdfe20
Use get for loading dialog.
2012-10-19 00:38:23 +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
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
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
Bart Visscher
de1bfe9d6b
Make the core ajax calls use the router
2012-10-02 21:58:42 +02:00
Christian Reiner
743826bbf3
Reimplementation of CSRF protection including autorefresh
2012-09-28 13:30:44 +02:00
Lukas Reschke
ac79fe649c
Added a missing CSRF check
2012-09-22 11:02:03 +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
8f0354bcdd
Temporarily disable sharing with contacts and emails, will come in next release
2012-09-12 01:02:08 -04:00
Michael Gapczynski
13d513c17c
Fix shared collection item searching
2012-09-09 11:50:12 -04:00
Thomas Mueller
3829460ab8
adding space between) and {
2012-09-07 15:22:01 +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
Michael Gapczynski
6c29334b48
Add support for share expiration
2012-09-01 18:53:48 -04:00
Michael Gapczynski
2aac6f02a0
Reimplement links support for sharing and add password protection option
2012-08-27 20:37:38 -04:00
Michael Gapczynski
fedb3641f9
Determine if reshare needs to be checked
2012-08-24 15:12:16 -04:00
Michael Gapczynski
9699ff03bd
Revert using item name, no longer allowing the same item source exist for a user
2012-08-22 11:57:58 -04:00
Michael Gapczynski
09e851a9c4
Fix share ajax calls to use itemName/itemSource, show who shared a file with you
2012-08-20 21:22:22 -04:00
Michael Gapczynski
49229da0e1
Remove setTarget from ajax
2012-08-20 21:22:22 -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
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
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
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
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
Michael Gapczynski
b6aa5d2875
Include contacts in share with search
2012-07-31 21:05:00 -04: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
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
d66f071d3e
Use search and limit parameters for share with search in sharing dropdown
2012-07-30 20:21:48 -04:00
Michael Gapczynski
ed71343df8
Autocomplete for share with search in sharing dropdown
2012-07-30 15:30:21 -04:00
Lukas Reschke
d24326ecce
Updated style
2012-07-26 01:38:20 +02:00
Lukas Reschke
d425740dc2
Remove unused files
2012-07-26 01:19:46 +02:00
Lukas Reschke
1554d7a2c0
Check for admin user
2012-07-26 01:16:32 +02:00
Michael Gapczynski
4bf13adff2
Merge branch 'master' into share_api
...
Conflicts:
apps/contacts/lib/addressbook.php
apps/files_sharing/js/share.js
apps/files_sharing/sharedstorage.php
2012-07-11 20:25:59 -04:00
Michael Gapczynski
88f4845ca3
Sanitization isn't required here
2012-07-11 20:04:18 -04:00
Michael Gapczynski
b148256233
Get rid of sneaky error_log() that got left behind
2012-07-10 21:30:52 -04:00
Michael Gapczynski
c0e1b8e7e7
Sanitize POST and GET in ajax/share
2012-07-10 19:54:03 -04:00
Jörn Friedrich Dreyer
e59a1806cf
remove superfluous ?> at the end of .php files (left out apps/*/templates)
2012-07-09 16:51:16 +02:00