Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
| | | |||||
* | | split upgrade logic from ajax file | Robin Appelman | 2013-07-06 | 1 | -107/+28 |
|/ | |||||
* | Use templates to theme share e-mails (#3683) | Stephan Arts | 2013-06-14 | 1 | -9/+14 |
| | |||||
* | Add undefined verision variables | Michael Gapczynski | 2013-05-17 | 1 | -1/+3 |
| | |||||
* | Connect watcher failure function to the failure signal | Bart Visscher | 2013-05-04 | 1 | -1/+1 |
| | |||||
* | Move start of the maintenance mode to the ajax call | Bart Visscher | 2013-05-04 | 1 | -0/+3 |
| | | | | Make sure the update page is shown in a browser. And not an ajax request | ||||
* | port 22c8194cc8fde88957dbc8c6d9e253fac3c637bb | Arthur Schiwon | 2013-04-02 | 1 | -3/+7 |
| | |||||
* | Add missing backticks. | root | 2013-03-30 | 1 | -2/+2 |
| | | | | Especially at user without "" PostgreSQL likes to fail. | ||||
* | Remove Debug output | Arthur Schiwon | 2013-03-27 | 1 | -2/+0 |
| | |||||
* | Upgrade FileCache on ownCloud upgrade for all users with files | Arthur Schiwon | 2013-03-27 | 1 | -0/+45 |
| | |||||
* | Merge pull request #2320 from ceri/master | Frank Karlitschek | 2013-03-15 | 1 | -2/+2 |
|\ | | | | | Fix erroneous email when folders are shared | ||||
| * | Correct emails when folders are shared. | Ceri Davies | 2013-03-14 | 1 | -2/+2 |
| | | | | | | | | itemType is never "dir"; it's either "file" or "folder". | ||||
* | | use display name as sender for private link mails, approved in #2294 | Björn Schießle | 2013-03-14 | 1 | -1/+1 |
|/ | |||||
* | Clear the CSS and JS cache earlier to make sure update goes smoothly | Michael Gapczynski | 2013-03-05 | 1 | -4/+0 |
| | |||||
* | Fix notice | Lukas Reschke | 2013-03-02 | 1 | -1/+2 |
| | |||||
* | up limit of share dropdown from 4 to 15, scrollbar after 4 1/2 entries, fix #135 | Jan-Christoph Borchardt | 2013-02-28 | 1 | -3/+3 |
| | |||||
* | Disable prepared query caching while doing an upgrade | Robin Appelman | 2013-02-26 | 1 | -1/+2 |
| | |||||
* | Style cleanup core dir | Bart Visscher | 2013-02-21 | 1 | -10/+52 |
| | |||||
* | Remove invalid characters from app id to prevent loading of invalid resources | Bart Visscher | 2013-02-09 | 1 | -0/+1 |
| |