summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2014-06-08614-1641/+2125
|
* Merge pull request #8942 from owncloud/fix-user-search-fieldVolkan Gezer2014-06-081-1/+1
|\ | | | | fix hidden user group search field
| * fix hidden user group search fieldVolkan Gezer2014-06-071-1/+1
|/
* [tx-robot] updated from transifexJenkins for ownCloud2014-06-07536-15604/+18729
|
* Merge pull request #8927 from owncloud/expire_only_link_sharesBjörn Schießle2014-06-066-111/+136
|\ | | | | only expire link shares
| * set minDate and maxDate in datepickerBjoern Schiessle2014-06-062-1/+7
| |
| * only expire link sharesBjoern Schiessle2014-06-065-110/+129
| |
* | Merge pull request #8935 from owncloud/missed-apps-tagRaghu Nayyar2014-06-061-1/+1
|\ \ | | | | | | wrap App text with t() to let it use locales
| * | wrap App text with t() to let it use localesVolkan Gezer2014-06-061-1/+1
| | |
* | | Merge pull request #8925 from owncloud/extstorage-sidebarVincent Petry2014-06-068-5/+363
|\ \ \ | | | | | | | | Added external storage list in files app
| * | | Fixed delete button CSS in ext storage listVincent Petry2014-06-063-9/+10
| | | |
| * | | Added more columns to ext storage listVincent Petry2014-06-063-22/+55
| | | | | | | | | | | | | | | | | | | | Now using system mount and personal mount calls to get the relevant mount points including backend information.
| * | | Fixed ext storage list sortingVincent Petry2014-06-061-8/+6
| | | |
| * | | Added external storage list in files appVincent Petry2014-06-067-0/+326
| | |/ | |/|
* | | Merge pull request #8933 from owncloud/fix-logo-glitchRaghu Nayyar2014-06-067-62/+10
|\ \ \ | | | | | | | | Fix logo glitch
| * | | reduce padding by 1px after increasing imageJan-Christoph Borchardt2014-06-061-1/+1
| | | |
| * | | fix logo glitch, add whitespace around formJan-Christoph Borchardt2014-06-067-61/+9
| |/ /
* | | Merge pull request #8253 from owncloud/pk-on-all-tables-masterThomas Müller2014-06-068-3/+109
|\ \ \ | | | | | | | | Primary keys on all tables master
| * | | adding PK to table encryptionThomas Müller2014-06-068-3/+109
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | adding auto increment/PK to table files_trash adding PK to table ldap_user_mapping and ldap_group_members adding PK to table ldap_group_mapping truncate permissions table to allow smooth creation of primary key adding unit test for creating an auto increment column on a table which already contains data remove unneeded table files_trashsizes fix unit test no need to truncate *PREFIX*permissions On Oracle adding auto increment columns is not working out of the box - Oracle migrations are to be done manually
* | | | Merge pull request #8921 from owncloud/fix-remove-storage-masterThomas Müller2014-06-061-10/+22
|\ \ \ \ | |_|/ / |/| | | No need to create a storage within remove
| * | | No need to create a storage within removeThomas Müller2014-06-061-10/+22
| | | |
* | | | Merge pull request #8922 from owncloud/design-controls-transparencyJan-Christoph Borchardt2014-06-066-46/+25
|\ \ \ \ | |_|_|/ |/| | | Bugfixes for mobile
| * | | fix left padding of controls bar for apps without navigationJan-Christoph Borchardt2014-06-061-1/+6
| | | |
| * | | slight transparency for controls bar for more open feelJan-Christoph Borchardt2014-06-061-1/+1
| | | |
| * | | fix apps without app-navigationJan-Christoph Borchardt2014-06-061-1/+1
| | | |
| * | | unify controls bar, remove duplicate from user managementJan-Christoph Borchardt2014-06-065-43/+17
| | | |
* | | | Merge pull request #8923 from owncloud/app-settings-inputJan-Christoph Borchardt2014-06-062-4/+9
|\ \ \ \ | | | | | | | | | | app settings: display input fields at full width
| * | | | app settings: display input fields at full widthJan-Christoph Borchardt2014-06-062-4/+9
| | | | |
* | | | | Merge pull request #4553 from owncloud/update_search_classesVincent Petry2014-06-0622-134/+687
|\ \ \ \ \ | |/ / / / |/| | | | Update search classes
| * | | | allow apps to add translation for search result typeidJörn Friedrich Dreyer2014-06-062-1/+8
| | | | |
| * | | | use non static access to searchJörn Friedrich Dreyer2014-06-062-2/+2
| | | | |
| * | | | fix namespace for legacy search classesJörn Friedrich Dreyer2014-06-062-2/+2
| | | | |
| * | | | make search non-static, add ISearch to server container, make legacy a ↵Jörn Friedrich Dreyer2014-06-069-31/+146
| | | | | | | | | | | | | | | | | | | | static wrapper for it, move provider and result to public api
| * | | | minor phpdoc cleanup and importsJörn Friedrich Dreyer2014-06-056-13/+14
| | | | |
| * | | | Simplify client-side result customizationAndrew Brown2014-06-051-28/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The issue was that search results from other providers (contacts, calendar, etc.) were unformatted, like 'event' or 'contact', while the built-in event types (folder, file, etc.) were being modified by custom result functions to something like 'Files' or 'Folders'. The fix is to capitalize and translate all result types by default. Custom formatting is still allowed (and example documentation has been added) but the built-in result formatters where now unnecessary and were removed.
| * | | | Move new search results to 'lib/private/search'Andrew Brown2014-06-055-1/+1
| | | | |
| * | | | Move legacy search to 'lib/private/legacy'Andrew Brown2014-06-055-68/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes errors where apps would try to start providers using OC_Search and would fail. Also, made OC_Search simply inherit from \OC\Search.
| * | | | Re-add type to legacy OC_Search_Result classAndrew Brown2014-06-051-1/+14
| | | | |
| * | | | use path param to create scrollto urlJörn Friedrich Dreyer2014-06-051-11/+16
| | | | |
| * | | | decode filename for scrolltoJörn Friedrich Dreyer2014-06-051-1/+1
| | | | |
| * | | | fix minor typosJörn Friedrich Dreyer2014-06-051-0/+25
| | | | |
| * | | | Add audio and image result typesAndrew Brown2014-06-051-2/+2
| | | | |
| * | | | Add audio and image result typesAndrew Brown2014-06-053-1/+81
| | | | |
| * | | | fix formattingJörn Friedrich Dreyer2014-06-0510-191/+200
| | | | |
| * | | | Add legacy adapters for file searchAndrew Brown2014-06-054-0/+133
| | | | |
| * | | | Move to new namespace convention and add new result sub-classingAndrew Brown2014-06-056-100/+323
| | | | |
* | | | | Merge pull request #8895 from owncloud/mimetype_fixesThomas Müller2014-06-063-3/+78
|\ \ \ \ \ | |_|_|_|/ |/| | | | add more and fix office mimetypes, migrate wrong mimetypes
| * | | | increase version number of files and migration triggerJörn Friedrich Dreyer2014-06-062-2/+2
| | | | |
| * | | | add more and fix office mimetypes, migrate wrong mimetypesJörn Friedrich Dreyer2014-06-062-2/+77
|/ / / /
* | | | Merge pull request #8666 from owncloud/mount-removeicewind19912014-06-0630-377/+1185
|\ \ \ \ | | | | | | | | | | Support for (re)moving mountpoints