Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | rename url parameter | Robin Appelman | 2014-02-24 | 1 | -1/+1 |
| | |||||
* | Add url parameter to control whether previews should return 404 when the ↵ | Robin Appelman | 2014-02-21 | 1 | -1/+2 |
| | | | | mimetype is unsupported | ||||
* | Merge branch 'master' into mimeicons-svg | Robin Appelman | 2014-02-20 | 2 | -105/+34 |
|\ | |||||
| * | Merge pull request #7247 from owncloud/sharing_cleanup_step1 | Björn Schießle | 2014-02-20 | 1 | -99/+13 |
| |\ | | | | | | | clean up the sharing ajax calls, add mail notification class | ||||
| | * | clean up the sharing ajax calls, add mail notification class | Bjoern Schiessle | 2014-02-19 | 1 | -99/+13 |
| | | | |||||
| * | | Check whether the app is set | Lukas Reschke | 2014-02-18 | 1 | -1/+4 |
| | | | |||||
| * | | Check whether the Key is set | Lukas Reschke | 2014-02-18 | 1 | -1/+1 |
| | | | |||||
| * | | An admin should not be able to add remote and public services on its own. ↵ | Lukas Reschke | 2014-02-18 | 1 | -6/+18 |
| |/ | | | | | | | | | | | 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. | ||||
* / | Show svg mime icons when no preview is available | Robin Appelman | 2014-02-19 | 1 | -13/+17 |
|/ | |||||
* | Merge pull request #6726 from owncloud/fix_6630 | Vincent Petry | 2014-02-14 | 1 | -1/+1 |
|\ | | | | | don't urldecode get var, php does this automatically | ||||
| * | remove empty line | Georg Ehrke | 2014-01-30 | 1 | -1/+0 |
| | | |||||
| * | don't urldecode get var, php does this automatically | Georg Ehrke | 2014-01-30 | 1 | -1/+2 |
| | | |||||
* | | fix DI | Arthur Schiwon | 2014-02-11 | 1 | -1/+2 |
| | | |||||
* | | move sorter into a class | Arthur Schiwon | 2014-02-11 | 1 | -24/+3 |
| | | |||||
* | | respect coding guidelines | Arthur Schiwon | 2014-02-11 | 1 | -1/+1 |
| | | |||||
* | | on filtering the share box users and groups whose name begins with the ↵ | Arthur Schiwon | 2014-02-11 | 1 | -0/+24 |
|/ | | | | search term shall appear on top, fixes #6430 | ||||
* | use localised date in notification mails | Bjoern Schiessle | 2014-01-27 | 1 | -5/+4 |
| | |||||
* | add expire date to link share if possible | Bjoern Schiessle | 2014-01-24 | 1 | -2/+19 |
| | |||||
* | pass the name of the item source from the browser to the server - no need to ↵ | Thomas Müller | 2013-10-23 | 1 | -1/+2 |
| | | | | get the data via complicated db queries | ||||
* | Merge pull request #5446 from frisco82/fixNotifyUser | Frank Karlitschek | 2013-10-21 | 1 | -1/+1 |
|\ | | | | | Fix notify user checkbox | ||||
| * | fix notify user, and made js more resiliant to changes | Ramiro Aparicio | 2013-10-21 | 1 | -1/+1 |
| | | |||||
* | | fix user displayName not being shown after add, added class for improved ↵ | Ramiro Aparicio | 2013-10-21 | 1 | -3/+4 |
|/ | | | | styling, fix strong for groups when english is not being used | ||||
* | Merge pull request #5133 from owncloud/js_vcategories_to_tags | Thomas Tanghus | 2013-10-11 | 6 | -222/+0 |
|\ | | | | | Js vcategories to tags | ||||
| * | Remove obsolete files. | Thomas Tanghus | 2013-10-04 | 6 | -222/+0 |
| | | |||||
* | | find users which are in the same group | Bjoern Schiessle | 2013-10-08 | 1 | -1/+1 |
| | | |||||
* | | Fixed array syntax to work with PHP 5.3 | Vincent Petry | 2013-10-04 | 1 | -1/+1 |
| | | | | | | | | | | | | 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. | ||||
* | | fix array_diff call | Bjoern Schiessle | 2013-10-04 | 1 | -1/+1 |
| | | |||||
* | | fix mail subject; don't show time for expire date | Bjoern Schiessle | 2013-09-30 | 1 | -2/+3 |
| | | |||||
* | | use template for txt and html mails to send notification mails | Bjoern Schiessle | 2013-09-25 | 1 | -19/+22 |
| | | |||||
* | | coding-style fixes | Bjoern Schiessle | 2013-09-03 | 1 | -2/+14 |
| | | |||||
* | | Merge branch 'master' into sharing_mail_notification_master | Bjoern Schiessle | 2013-09-02 | 2 | -6/+45 |
|\| | | | | | | | | | Conflicts: lib/util.php | ||||
| * | Merge master into oc_preview | Georg Ehrke | 2013-08-30 | 1 | -6/+5 |
| |\ | |||||
| | * | Use Group methods for searching, fixes #4201 | Arthur Schiwon | 2013-08-30 | 1 | -6/+5 |
| | | | |||||
| * | | Merge master into oc_preview | Georg Ehrke | 2013-08-29 | 2 | -13/+18 |
| |\| | |||||
| * | | outsource sharing and deleted files previews to apps | Georg Ehrke | 2013-08-19 | 2 | -129/+0 |
| | | | |||||
| * | | style fixes for preview lib | Georg Ehrke | 2013-08-19 | 1 | -4/+5 |
| | | | |||||
| * | | Merge master into oc_preview | Georg Ehrke | 2013-08-14 | 1 | -1/+1 |
| |\ \ | |||||
| * | | | remove \OC\Preview::showErrorPreview | Georg Ehrke | 2013-08-14 | 3 | -12/+0 |
| | | | | |||||
| * | | | fix code style of try catch blocks | Georg Ehrke | 2013-07-30 | 1 | -1/+1 |
| | | | | |||||
| * | | | style fixes | Georg Ehrke | 2013-07-30 | 3 | -0/+180 |
| | | | | |||||
* | | | | add expiration date if it is already set | Bjoern Schiessle | 2013-08-30 | 1 | -2/+6 |
| | | | | |||||
* | | | | don't send mail to the user who shared the file | Bjoern Schiessle | 2013-08-30 | 1 | -0/+3 |
| | | | | |||||
* | | | | set sendMail status back to false | Bjoern Schiessle | 2013-08-30 | 1 | -5/+3 |
| | | | | |||||
* | | | | some clean-up | Bjoern Schiessle | 2013-08-30 | 1 | -51/+32 |
| | | | | |||||
* | | | | enable user to inform recipients about a shared file by mail | Bjoern Schiessle | 2013-08-30 | 1 | -4/+102 |
| |_|/ |/| | | |||||
* | | | Merge pull request #4552 from dampfklon/fix4552 | Morris Jobke | 2013-08-28 | 1 | -1/+5 |
|\ \ \ | | | | | | | | | Make group suffix in share dialog translatable | ||||
| * | | | Make group suffix in share dialog translatable | dampfklon | 2013-08-22 | 1 | -1/+5 |
| | |/ | |/| | |||||
* / | | adding translations to update events | Thomas Müller | 2013-08-27 | 1 | -12/+13 |
|/ / | |||||
* | | Merge pull request #4271 from owncloud/plural_translations | Owen Winkler | 2013-08-08 | 1 | -1/+1 |
|\ \ | |/ |/| | Plural translations | ||||
| * | return plural form in ajax translations | Thomas Müller | 2013-08-03 | 1 | -1/+1 |
| | |