Michael Gapczynski
|
cbfbbe672c
|
Merge commit 'refs/merge-requests/115' of git://gitorious.org/owncloud/owncloud into merge-requests/115
Conflicts:
apps/files/templates/index.php
|
2012-05-17 15:38:28 -04:00 |
|
Thomas Mueller
|
583dce5276
|
removing executable bit - again
|
2012-05-15 00:52:00 +02:00 |
|
Michael Gapczynski
|
6d37f9b951
|
Remove scroll to bookmarks_menu, no longer existent and the bookmark controls are always visible at the top anyways
|
2012-05-13 21:10:27 -04:00 |
|
Michael Gapczynski
|
1629c77eb5
|
Validate bookmark inputs, fixes bug oc-636
|
2012-05-13 16:58:47 -04:00 |
|
Vitaly Kuznetsov
|
6f981738bb
|
Fix some non-utf8-friendly htmlentities (resulting in wrong display of utf8-encoded directory names for example)
|
2012-05-10 09:10:53 +00:00 |
|
Brice Maron
|
41d0308806
|
Change label for saving bookmark button
|
2012-05-08 19:04:06 +00:00 |
|
Brice Maron
|
fa4a52260f
|
Try to correct query string url for search in bookmark
|
2012-05-08 16:22:35 +00:00 |
|
Frank Karlitschek
|
1945cd6946
|
ported the oc_template class
|
2012-05-06 23:00:36 +02:00 |
|
Frank Karlitschek
|
b462795be2
|
added a nice API to get the installes Apps with names, urls and icon from the outside.
This is useful for some nice upcoming desktop and mobile integration
|
2012-05-05 23:42:38 +02:00 |
|
Bart Visscher
|
b6ea57c8b6
|
Bookmarks: Move delete code to Bookmarks class, also change to use id
|
2012-05-03 17:33:57 +02:00 |
|
Frank Karlitschek
|
97a8af7f25
|
ported oc_db
|
2012-05-03 13:06:08 +02:00 |
|
Frank Karlitschek
|
43caa3b3b9
|
ported oc_json
|
2012-05-03 12:23:29 +02:00 |
|
Frank Karlitschek
|
4fe90f62f4
|
port checkAppEnabled
|
2012-05-02 19:08:37 +02:00 |
|
Frank Karlitschek
|
8e99475886
|
first part of the config stuff
|
2012-05-02 13:28:56 +02:00 |
|
Frank Karlitschek
|
2fe646dcec
|
ported the oc_app calls
|
2012-05-02 00:50:26 +02:00 |
|
Frank Karlitschek
|
93b63cf375
|
ported the rest of the OC_Helper calls
|
2012-05-02 00:20:45 +02:00 |
|
Frank Karlitschek
|
e48f511606
|
port linkto and serverHost
|
2012-05-01 23:19:39 +02:00 |
|
Frank Karlitschek
|
31e32e3c10
|
ported checkLoggedIn and checkAdmin
|
2012-05-01 22:59:38 +02:00 |
|
Frank Karlitschek
|
1a2bbd2ee4
|
ported addSyript and other small stuff
|
2012-05-01 20:03:41 +02:00 |
|
Frank Karlitschek
|
70cea18cce
|
ported getUser
|
2012-05-01 18:50:31 +02:00 |
|
Frank Karlitschek
|
d0554bef06
|
finish porting of the LOG calls or the apps to the public api
|
2012-05-01 17:38:27 +02:00 |
|
Frank Karlitschek
|
e8ec999090
|
port to use the new public api
|
2012-05-01 09:49:22 +02:00 |
|
Georg Ehrke
|
3f64eb25ab
|
some fixes fore movable apps
|
2012-04-26 14:52:55 +02:00 |
|
Georg Ehrke
|
1a913ac282
|
bookmarks app seems to work now :)
|
2012-04-25 21:20:06 +02:00 |
|
Georg Ehrke
|
4c2cf35050
|
fix merge conflicts
|
2012-04-22 13:19:12 +02:00 |
|
Frank Karlitschek
|
69f3b5e2d2
|
make the button a bit more consistent to the other ownCloud interface
|
2012-04-21 23:34:24 +02:00 |
|
Georg Ehrke
|
69ee0efc0b
|
remove the require_once lib base from all (or nearly all) files
|
2012-04-17 19:31:29 +02:00 |
|
Arthur Schiwon
|
80f4c4f923
|
Bookmarks: handle input with & and ?, fixes oc-201
|
2012-04-15 15:53:40 +02:00 |
|
Robin Appelman
|
b1bcc60d83
|
reuse OC_L10N objects
|
2012-04-14 16:44:15 +02:00 |
|
Robin Appelman
|
926b2b78fe
|
keep version numbers in their own files for faster reading
|
2012-04-14 16:29:11 +02:00 |
|
Robin Appelman
|
3babb8c22c
|
improve flexibility of search providers a bit
|
2012-04-14 11:29:54 +02:00 |
|
Tom Needham
|
c0869887cf
|
Return JSON for import and export methods of OC_Migrate
|
2012-04-07 21:55:16 +00:00 |
|
Tom Needham
|
bd4fd76bfb
|
Fix bookmarks migration provider
|
2012-03-27 21:35:29 +00:00 |
|
Tom Needham
|
553f4533c0
|
look for migrate.php in appinfo folder
|
2012-03-27 20:45:37 +00:00 |
|
Tom Needham
|
c8acd4a594
|
Merge branch 'master' into migration
|
2012-03-27 20:19:38 +00:00 |
|
Bartek Przybylski
|
c23090b43c
|
spaces to tabs in bookmarks
|
2012-03-24 19:55:44 +01:00 |
|
Bartek Przybylski
|
a3125f164e
|
bookmarks tag placement & list width fix
|
2012-03-24 19:55:43 +01:00 |
|
Georg Ehrke
|
b63b377c4d
|
Bookmarks: make link text click clickable too - bugfix for oc-131
|
2012-03-23 16:58:48 +01:00 |
|
Georg Ehrke
|
45b320d674
|
use unnamed as title for a bookmark if no title was entered and curl fails
|
2012-03-23 16:54:15 +01:00 |
|
Tom Needham
|
514c9ad8e7
|
Added unified import method.
|
2012-03-20 20:19:21 +00:00 |
|
Tom Needham
|
145d6f3566
|
Add OC_Migration_Content class to help app devs. Restructure OC_Migrate.
|
2012-03-19 20:44:20 +00:00 |
|
Tom Needham
|
bc085c3ff4
|
Create new user, create new data dir, copy files, import app data
|
2012-03-17 16:25:14 +00:00 |
|
Tom Needham
|
5332c319a2
|
Migration info is an object. Other fixes
|
2012-03-16 22:50:35 +00:00 |
|
Tom Needham
|
a919a136c4
|
Finish import function for bookmarks
|
2012-03-13 21:24:07 +00:00 |
|
Tom Needham
|
4d5646a59f
|
Find migrate.php even for disabled apps. Improve ui for user and admin migrations
|
2012-03-13 16:21:17 +00:00 |
|
Tom Needham
|
9c032ecc33
|
Fix return value of export
|
2012-03-11 22:20:01 +00:00 |
|
Tom Needham
|
fa5a5649c6
|
Fix copyRows() and sqlite connection
|
2012-03-11 22:09:16 +00:00 |
|
Tom Needham
|
d712d7f52c
|
Lots of fixes, improve copyRows() method and update settings page.
|
2012-03-10 18:18:58 +00:00 |
|
Tom Needham
|
3ca76d24a9
|
Add OC_Migrate::copyRows() method
|
2012-03-10 15:52:38 +00:00 |
|
Tom Needham
|
691103acd5
|
Use json for migration data
|
2012-03-03 17:30:21 +00:00 |
|