wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
29359 commits 157 branches 562 tags 714 MiB
Commit graph

258 commits

Author SHA1 Message Date
Jenkins for ownCloud
6a1a4880f0 Updating license headers 2015-02-23 12:13:59 +01:00
Lukas Reschke
a7df23ceba Manually type-case all AJAX files 
This enforces proper types on POST and GET arguments where I considered it sensible. I didn't update some as I don't know what kind of values they would support 🙈

Fixes https://github.com/owncloud/core/issues/14196 for core
 2015-02-13 13:33:20 +01:00
Morris Jobke
ce47065d8f kill ancient code 2015-01-20 14:14:01 +01:00
Lukas Reschke
ceaaab6295 Verify whether type is correct 
`$this->info` can very well contain an empty array or possibly other values. This means that when this code path is called a PHP Fatal error might get thrown which is not what we want.
 2015-01-08 18:38:17 +01:00
Morris Jobke
bfb6e350d5 Merge pull request #13016 from owncloud/sharing_fixes 
don't delete share table entries for the unique name if re-share permission was removed
 2015-01-07 18:14:53 +01:00
Bjoern Schiessle
e9e7ee67d3 shareType and permissions are integers 2015-01-07 16:36:13 +01:00
Jörn Friedrich Dreyer
d3662722f6 new OC.Search, add search result formatters and handlers, use full content width for results 2015-01-02 10:28:41 +01:00
Bjoern Schiessle
24993280ed Next step in server-to-server sharing next generation, see #12285 
Beside some small improvements and bug fixes this will probably the final state for OC8.

To test this you need to set up two ownCloud instances. Let's say:

URL: myPC/firstOwnCloud user: user1
URL: myPC/secondOwnCloud user: user2
Now user1 can share a file with user2 by entering the username and the URL to the second ownCloud to the share-drop-down, in this case "user2@myPC/secondOwnCloud".

The next time user2 login he will get a notification that he received a server-to-server share with the option to accept/decline it. If he accept it the share will be mounted. In both cases a event will be send back to user1 and add a notification to the activity stream that the share was accepted/declined.

If user1 decides to unshare the file again from user2 the share will automatically be removed from the second ownCloud server and user2 will see a notification in his activity stream that user1@myPC/firstOwnCloud has unshared the file/folder from him.
 2014-12-19 15:20:24 +01:00
Victor Dubiniuk
c9fd3c9d29 Inject config 2014-12-10 01:13:38 +03:00
Victor Dubiniuk
303fce44f4 Use httphelper and cache response even when it empty 2014-12-06 20:17:47 +03:00
Thomas Müller
a589d61b78 in case a translation javascript is not found we no longer bail out 
remove translation.php
 2014-10-29 10:09:12 +01:00
Thomas Müller
d9907b6fa3 move some deprecated usage of OC_Config and OC_AppConfig to \OC::server 2014-10-20 14:44:44 +02:00
Lukas Reschke
ba2472575f Close the session for preview generation 
Without closing the session every preview image generation is locking the session which makes the webinterface unresponsive.
 2014-09-29 14:27:44 +02:00
Lukas Reschke
fa096217b1 Merge pull request #9512 from libasys/patch-2 
Fix use Sharing Api with calendar
 2014-09-09 23:58:24 +02:00
Lukas Reschke
70abce0482 Merge pull request #10739 from owncloud/eventsource-public 
Add EventSource to the public API
 2014-09-08 18:46:27 +02:00
Robin Appelman
fa3393674c Better phpdoc and method naming 2014-09-04 13:26:51 +02:00
Robin Appelman
65608d7c92 Use the public api to get event sources 2014-09-03 13:36:15 +02:00
Vincent Petry
e05b95636b Fix upgrade process when apps enabled for specific groups 
Fix issue where the currently logged user was causing side-effects when
upgrading.
Now setting incognito mode (no user) on update to make sure the whole
apps list is taken into account with getEnabledApps() or isEnabled().
 2014-09-02 17:16:14 +02:00
Robin Appelman
d0266c0bf8 Use public api for getting l10n 2014-08-31 10:08:22 +02:00
Lukas Reschke
4aca46046b Add require_once to update.php due to routing 
Fixes https://github.com/owncloud/core/issues/10585
Partially reverts 52d5429768
 2014-08-22 11:39:05 +02:00
blizzz
52d5429768 Merge pull request #10522 from owncloud/removeLoadAppScript 
Remove loadAppScriptFile
 2014-08-21 19:59:31 +02:00
Lukas Reschke
ab12bd292d Add update route to core 2014-08-19 15:40:08 +02:00
Robin Appelman
fdfc5c67f8 Merge pull request #9866 from owncloud/app-upgrade 
Don't do app upgrades in the background
 2014-08-19 13:33:38 +02:00
Bjoern Schiessle
d9f35d8c15 we need the recipient as a additional parameter to know for which share the notification was send 2014-08-13 17:02:51 +02:00
Robin Appelman
3184983565 Send feedback from upgrading apps to the upgrade ui 2014-08-04 13:41:05 +02:00
Thomas Müller
6d06a765f4 in case $_POST['itemSourceName'] does not exist we simply default it to null 2014-08-01 09:10:14 +02:00
Thomas Müller
4eb2b4e1b0 Merge pull request #10051 from owncloud/preview-empty-text 
Use svg mimeicons for empty text files
 2014-07-31 11:38:29 +02:00
Robin Appelman
4a9b0d5465 Use svg mimeicons for empty text files 2014-07-30 16:31:37 +02:00
Robin Appelman
c066320208 Also keep maxY into account when scaling a preview while preserving aspect ratio 2014-07-30 13:52:40 +02:00
Bjoern Schiessle
ecc1f92bb6 add OCS api call to set expire date for link shares 2014-07-25 13:38:18 +02:00
libasys
e6b093bfb9 Fix use Sharing Api with calendar 
Without this fix it logs this error:
Undefined index: itemSourceName at /opt/local/apache2/htdocs/oc7/core/ajax/share.php#44
I think the itemSourceName is only used with sharing files!
 2014-07-08 10:57:51 +02:00
Bjoern Schiessle
9c00f5ddb6 set minDate and maxDate in datepicker 2014-06-06 17:40:16 +02:00
Bjoern Schiessle
6578f00b4b unify share settings 2014-06-05 15:49:34 +02:00
Vincent Petry
5b97369b00 Simulate apps database schema update on upgrade 
When upgrade, also simulate the database schema update for apps before
doing the actual upgrade.
 2014-06-04 17:16:44 +02:00
Vincent Petry
02f682b156 Now showing disabled apps as upgrade status line 
- Added app id in update overview.
- Added status message for disabled app for CLI upgrade and web upgrade
 2014-05-27 15:20:33 +02:00
Joas Schilling
ab7ae004f7 Automatically copy the share expiration date when new shares are created 
Fix #4823
 2014-05-19 01:38:47 +02:00
Thomas Müller
20893cc3b3 Images on public sharing get downscaled to increase use experience - this will speed up loading time 
- adding keep aspect to core/ajax/preview.php
- remove duplicate method Preview::show()
- no more hard coded mimetype of preview
- remove .png from the preview urls
- keep old route preview.png for backwards compatibility
- aspect preserving previews are now cached
 2014-05-02 17:02:57 +02:00
Thomas Müller
dcca5f7bdd Merge pull request #5857 from owncloud/type-ahead-share-by-mail-master 
introduce auto completion on share email - integrated with the contactsm...
 2014-04-11 00:04:58 +02:00
Thomas Müller
f9279ac77a killing some more calls to OC_App::loadApps(); - because we load all apps in handleRequest() 2014-03-25 17:42:41 +01:00
Thomas Tanghus
0b4d879619 Fix copy/paste error :P 2014-03-25 15:38:11 +01:00
Thomas Tanghus
aa5bba2bcc 'ID' => 'id' and check existence of EMAIL 2014-03-25 14:22:39 +01:00
Thomas Müller
6ff96b34ad Merge branch 'master' into load-apps-proper-master 
Conflicts:
	apps/files/ajax/rawlist.php
	cron.php
	ocs/v1.php
 2014-03-21 14:05:08 +01:00
Vincent Petry
6252c248c2 Merge pull request #7557 from owncloud/issue/7297 
Do not allow setting an expiration date in the past
 2014-03-19 15:53:08 +01:00
Thomas Müller
6b9ae27b90 drop file cache migration OC5 -> OC6 2014-03-18 17:14:38 +01:00
Thomas Müller
f1ecc758f5 send an individual email to each recipient 2014-03-10 21:54:23 +01:00
Joas Schilling
80393d9c0f Do not allow setting an expiration date in the past 
Fix #7297
 2014-03-05 13:12:58 +01:00
Robin Appelman
7c4f81bd78 rename url parameter 2014-02-24 13:24:10 +01:00
Robin Appelman
4715fb12c8 Add url parameter to control whether previews should return 404 when the mimetype is unsupported 2014-02-21 14:06:15 +01:00
Robin Appelman
0624476aa1 Merge branch 'master' into mimeicons-svg 2014-02-20 16:55:18 +01:00
Björn Schießle
16eb43c033 Merge pull request #7247 from owncloud/sharing_cleanup_step1 
clean up the sharing ajax calls, add mail notification class
 2014-02-20 11:56:20 +01:00
Bjoern Schiessle
2fd75d8f1c clean up the sharing ajax calls, add mail notification class 2014-02-19 19:33:00 +01:00
Robin Appelman
609a91a9b1 Show svg mime icons when no preview is available 2014-02-19 14:47:29 +01:00
Lukas Reschke
c19cacb29f Check whether the app is set 2014-02-18 14:12:49 +01:00
Lukas Reschke
1352c63dca Check whether the Key is set 2014-02-18 12:47:05 +01:00
Lukas Reschke
dc6f1d875d An admin should not be able to add remote and public services on its own. This should only be possible programmatically. 
This change is due the fact that an admin may not be expected to execute arbitrary code in every environment.
 2014-02-18 12:32:57 +01:00
Vincent Petry
d7f4547717 Merge pull request #6726 from owncloud/fix_6630 
don't urldecode get var, php does this automatically
 2014-02-14 14:34:20 +01:00
Arthur Schiwon
af781bdea7 fix DI 2014-02-11 10:50:03 +01:00
Arthur Schiwon
41e8d44cf7 move sorter into a class 2014-02-11 10:49:34 +01:00
Arthur Schiwon
1d0a236563 respect coding guidelines 2014-02-11 10:49:27 +01:00
Arthur Schiwon
71e4d965a1 on filtering the share box users and groups whose name begins with the search term shall appear on top, fixes #6430 2014-02-11 10:49:22 +01:00
Thomas Müller
0db5fead8e remove some more global variable $RUNTIME_NOAPPS 2014-02-06 10:04:18 +01:00
Georg Ehrke
f7c291e276 remove empty line 2014-01-30 16:32:45 +01:00
Georg Ehrke
c5742520e1 don't urldecode get var, php does this automatically 2014-01-30 16:32:45 +01:00
Bjoern Schiessle
2bb13a8db9 use localised date in notification mails 2014-01-27 12:47:54 +01:00
Bjoern Schiessle
77de47858b add expire date to link share if possible 2014-01-24 10:46:08 +01:00
Thomas Müller
d4c0ac7790 introduce auto completion on share email - integrated with the contactsmanager api 2013-11-14 09:38:55 +01:00
Thomas Müller
1317b7c03d pass the name of the item source from the browser to the server - no need to get the data via complicated db queries 2013-10-23 18:39:37 +02:00
Frank Karlitschek
6915367622 Merge pull request #5446 from frisco82/fixNotifyUser 
Fix notify user checkbox
 2013-10-21 14:07:33 -07:00
Ramiro Aparicio
b27595888a fix notify user, and made js more resiliant to changes 2013-10-21 16:14:23 +02:00
Ramiro Aparicio
85edbb08c1 fix user displayName not being shown after add, added class for improved styling, fix strong for groups when english is not being used 2013-10-21 15:31:31 +02:00
Thomas Tanghus
31714f8871 Merge pull request #5133 from owncloud/js_vcategories_to_tags 
Js vcategories to tags
 2013-10-11 04:17:59 -07:00
Bjoern Schiessle
835f36cb09 find users which are in the same group 2013-10-08 16:43:23 +02:00
Thomas Tanghus
f19a236c8e Remove obsolete files. 2013-10-04 17:24:28 +02:00
Vincent Petry
e257c3f27c Fixed array syntax to work with PHP 5.3 
It seems that array brackets are only supported starting with PHP 5.4.
Fixed the array brackets to be compatible and not cause a syntax error
in PHP 5.3.
 2013-10-04 14:28:11 +02:00
Bjoern Schiessle
304803d102 fix array_diff call 2013-10-04 12:23:40 +02:00
Bjoern Schiessle
17aa49a890 fix mail subject; don't show time for expire date 2013-09-30 13:33:02 +02:00
Bjoern Schiessle
883d1c0df3 use template for txt and html mails to send notification mails 2013-09-25 11:51:28 +02:00
Bjoern Schiessle
fd7469db9e coding-style fixes 2013-09-03 13:37:06 +02:00
Bjoern Schiessle
b918c06be6 Merge branch 'master' into sharing_mail_notification_master 
Conflicts:
	lib/util.php
 2013-09-02 14:41:46 +02:00
Georg Ehrke
8ef40277b2 Merge master into oc_preview 2013-08-30 18:11:18 +02:00
Bjoern Schiessle
4bbefdf608 add expiration date if it is already set 2013-08-30 17:20:10 +02:00
Bjoern Schiessle
e7959f4fd2 don't send mail to the user who shared the file 2013-08-30 16:52:06 +02:00
Bjoern Schiessle
65ddefc89d set sendMail status back to false 2013-08-30 16:29:22 +02:00
Bjoern Schiessle
36574241f8 some clean-up 2013-08-30 16:21:52 +02:00
Bjoern Schiessle
77adaee645 enable user to inform recipients about a shared file by mail 2013-08-30 13:53:49 +02:00
Arthur Schiwon
22e1f73d5e Use Group methods for searching, fixes #4201 2013-08-30 12:37:46 +02:00
Georg Ehrke
b7758d0f8d Merge master into oc_preview 2013-08-29 10:50:55 +02:00
Morris Jobke
ea6e74ca95 Merge pull request #4552 from dampfklon/fix4552 
Make group suffix in share dialog translatable
 2013-08-28 15:46:51 -07:00
Thomas Müller
9909b8b726 adding translations to update events 2013-08-27 00:26:44 +02:00
dampfklon
87c3f34a93 Make group suffix in share dialog translatable 2013-08-22 19:52:08 +02:00
Georg Ehrke
d9e8ebabdc outsource sharing and deleted files previews to apps 2013-08-19 13:24:07 +02:00
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