Thomas Tanghus
|
19b55d3fce
|
Edited combobox to adhere to coding standards and added a dblclick handler.
|
2012-05-12 13:43:34 +02:00 |
|
Thomas Tanghus
|
a36a8faad4
|
Contacts: Change placeholder text to avoid confusion. No, JanC, I won't change it back again ;-)
|
2012-05-12 13:43:33 +02:00 |
Bartek Przybylski
|
ab9927d5fc
|
oc-627, calling base function instead of loading too much useless functions
|
2012-05-12 13:25:04 +02:00 |
Michael Gapczynski
|
b4e7c05959
|
Encoded slashes (%2F) don't look pretty in our private link urls
|
2012-05-11 20:58:21 -04:00 |
|
Michael Gapczynski
|
faebee5f25
|
Turn async off when fetching users to make sure the users get removed from the select form
|
2012-05-11 20:39:48 -04:00 |
Robin Appelman
|
d07512c82d
|
fix gallery previous not showing
|
2012-05-12 00:37:19 +02:00 |
|
Robin Appelman
|
736739bbbd
|
load remote and public paths from info.xml during upgrade instead of setting them every time
|
2012-05-11 20:33:56 +02:00 |
Arthur Schiwon
|
3c2af95108
|
LDAP: offer only ownCloud-enabled users for sharing
|
2012-05-11 19:21:13 +02:00 |
|
Thomas Tanghus
|
8e5240d579
|
Contacts: Make the structured name dialog modal to avoid confusion.
|
2012-05-11 18:21:55 +02:00 |
|
Thomas Tanghus
|
646a4bd635
|
Contacts: Clone event handlers as well.
|
2012-05-11 18:21:55 +02:00 |
|
Thomas Tanghus
|
08e0b6cf5e
|
Contacts: Also strip parameters.
|
2012-05-11 18:21:55 +02:00 |
Sam Tuke
|
d98d72aa99
|
improved url generation - made use of OC.linkTo() for linking to versions history page
|
2012-05-11 17:13:58 +01:00 |
Michiel de Jong
|
f0362dbf58
|
register public.php?service=host-meta
|
2012-05-11 17:25:32 +02:00 |
|
Michiel de Jong
|
9469c9947f
|
fix warning 'unknown var appsDir'
|
2012-05-11 16:59:44 +02:00 |
|
Arthur Schiwon
|
7efa7171e3
|
LDAP: wrong assumptions for case (in)sensitivity, implement far better solution
|
2012-05-11 15:42:57 +02:00 |
|
Michiel de Jong
|
3fd2e0d2ce
|
correct host-meta mime type
|
2012-05-11 15:27:11 +02:00 |
|
Michiel de Jong
|
4c02a82f6c
|
move lrdd to jrd
|
2012-05-11 15:26:45 +02:00 |
|
Michiel de Jong
|
b133f22d7f
|
move host-meta to JRD because I can't work out how to deal with ampersands in XRD
|
2012-05-11 15:21:45 +02:00 |
|
Michiel de Jong
|
a95c1b8082
|
fix auth dialog includes
|
2012-05-11 15:21:45 +02:00 |
|
Sam Tuke
|
03fad97764
|
fixed some include path issues
imroved wording of history page revert instructions
cleaned up js call to ajax getVersions.php
|
2012-05-11 13:17:37 +01:00 |
|
Michiel de Jong
|
61d535984d
|
clean up auth dialog
|
2012-05-11 11:05:44 +02:00 |
|
Michiel de Jong
|
2e309aae97
|
announce OAuth2 implicit grant end-point the new way
|
2012-05-11 10:52:37 +02:00 |
|
Michiel de Jong
|
02cee2c562
|
trying to fix /.well-known/host-meta
|
2012-05-11 10:47:42 +02:00 |
|
Michiel de Jong
|
0c7f0aa3fa
|
attempt to align the webfinger app with new public.php routing
|
2012-05-11 10:26:30 +02:00 |
|
Michael Gapczynski
|
59a2616105
|
Fix music file action i.e. click to play, make OC.filePath act like OC_Helper::linkTo() for index.php links
|
2012-05-10 23:04:27 -04:00 |
|
Michael Gapczynski
|
20d9a8b6a1
|
Fix accidental creation of duplicate files because of extra / in search results
|
2012-05-10 22:04:05 -04:00 |
|
Michael Gapczynski
|
a3f250bfe6
|
Fix text files for search results
|
2012-05-10 21:44:04 -04:00 |
|
Michael Gapczynski
|
0c86f8a61e
|
Fix image previews for search results
|
2012-05-10 21:36:17 -04:00 |
|
Michael Gapczynski
|
daff3aa667
|
Prevent overwriting of private link status
|
2012-05-10 21:06:45 -04:00 |
|
Michael Gapczynski
|
60103d9b94
|
Only mount shared storage after a user has logged in, fixes shared folder not appearing for some WebDAV clients and sync client
|
2012-05-10 19:56:41 -04:00 |
|
Thomas Tanghus
|
e5840e1fe2
|
Contacts: Hack to add structured name from formatted name.
|
2012-05-11 01:14:11 +02:00 |
|
Thomas Tanghus
|
aa51639271
|
Contacts: Fix check for version.
|
2012-05-11 01:14:11 +02:00 |
|
Thomas Tanghus
|
78c11700f9
|
Added some margin.
|
2012-05-11 01:14:11 +02:00 |
Brice Maron
|
4094f6f8e0
|
Correct undef variable mistake from prev commit
|
2012-05-10 19:51:03 +00:00 |
Jan-Christoph Borchardt
|
d1e5a56bc6
|
fixing upload icon color
|
2012-05-10 21:40:22 +02:00 |
|
Brice Maron
|
ffe5ef2268
|
Correct calendar loading when calendar are from hooks. fix oc-619
|
2012-05-10 19:36:30 +00:00 |
|
Thomas Tanghus
|
7bc6e86969
|
Contacts: Fix some regressions from last commit.
|
2012-05-10 20:44:12 +02:00 |
|
Michael Gapczynski
|
3c6c8ecab0
|
Make email private link submit on enter as well
|
2012-05-10 11:44:06 -04:00 |
|
Thomas Tanghus
|
2c6740b0c7
|
Some UI and code restructering according to usability tests: https://mail.kde.org/pipermail/owncloud/2012-May/003194.html
|
2012-05-10 16:53:25 +02:00 |
|
Thomas Tanghus
|
ddd991a59e
|
Minor css fix.
|
2012-05-10 16:42:10 +02:00 |
|
Jan-Christoph Borchardt
|
e3f452cf53
|
larger clickable area for new button
|
2012-05-10 14:08:08 +00:00 |
|
Jan-Christoph Borchardt
|
2ae37b32d4
|
fixing background for clicked new button
|
2012-05-10 13:44:30 +00:00 |
Jan-Christoph Borchardt
|
8fc565821f
|
reduced text shadow brightness
|
2012-05-10 13:37:48 +00:00 |
|
Jan-Christoph Borchardt
|
46b1f35107
|
highlight the files new and upload button all the time
|
2012-05-10 13:34:44 +00:00 |
|
Arthur Schiwon
|
7a5028317d
|
LDAP: don't fall over case insensitive LDAP attribute name
|
2012-05-10 12:59:20 +02: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 |
Bart Visscher
|
94803dc222
|
Gallery: No short tags
|
2012-05-10 09:04:10 +02:00 |
|
Bart Visscher
|
2062ebacef
|
Gallery: Show thumbnails after document is ready
|
2012-05-10 09:04:10 +02:00 |
|
Michael Gapczynski
|
93c0e8b3bf
|
Fix unsharing files also deleting private link, bug fix for oc-251
|
2012-05-09 17:38:35 -04:00 |
|
Brice Maron
|
de6aa0f88c
|
Use a clean uri param constructor to get files
|
2012-05-09 21:35:59 +00:00 |
|
Michael Gapczynski
|
98cd98e2e5
|
Skip over users that have already been shared with when sharing with a group
|
2012-05-09 17:16:31 -04:00 |
|
Michael Gapczynski
|
d4636f4b86
|
Fix renaming of shared files if target already exists, bug fix for oc-81
|
2012-05-09 17:01:46 -04:00 |
|
Michael Gapczynski
|
2e826fa82a
|
Go back to updating mtime of shared folder to invoke a file cache rescan
|
2012-05-09 16:20:38 -04:00 |
|
Robin Appelman
|
3e57e76c48
|
fix creating the shared folder when the user home folder is not in the root mount
|
2012-05-09 20:36:08 +02:00 |
|
Michael Gapczynski
|
14b240a3f4
|
Still trying to fix some sharing use cases
|
2012-05-09 13:51:52 -04:00 |
Georg Ehrke
|
a589a700e1
|
revert 000d7ba975
|
2012-05-09 18:34:44 +02:00 |
|
Georg Ehrke
|
99db3c01ee
|
fix bug in events.php
|
2012-05-09 17:36:48 +02:00 |
|
Michiel de Jong
|
890c57bad5
|
fix requires in apps/remoteStorage/ajax/revoke.php
|
2012-05-09 15:40:39 +02:00 |
|
Michiel de Jong
|
4de182c7af
|
bearer token should be the whole thing, not the http basic pass
|
2012-05-09 15:28:30 +02:00 |
|
Michiel de Jong
|
9d443e021d
|
new requires in WebDAV.php
|
2012-05-09 15:28:30 +02:00 |
|
Michiel de Jong
|
2cf5bb6849
|
new requires now necessary
|
2012-05-09 15:28:30 +02:00 |
|
Michiel de Jong
|
7d090a45d2
|
attempt at reusing access tokens
|
2012-05-09 15:28:30 +02:00 |
|
Robin Appelman
|
588b51d88a
|
update translations
|
2012-05-09 12:41:01 +02:00 |
|
Georg Ehrke
|
000d7ba975
|
fix bug in calendar
|
2012-05-09 11:53:16 +02:00 |
|
Arthur Schiwon
|
eb7e2d7d35
|
Sharing: even if a user has more groups in common, he should appear only once in the dropdown list
|
2012-05-09 11:35:36 +02:00 |
|
Brice Maron
|
fae1ce4ea7
|
Correct file move by dropping on folder
|
2012-05-08 22:07:14 +00:00 |
|
Arthur Schiwon
|
c1490239e5
|
LDAP group: support for memberUid, fix for oc-594
|
2012-05-08 23:49:33 +02:00 |
Tom Needham
|
7dcf38c40f
|
Better checking of ajax paramters and better logging
|
2012-05-08 19:48:28 +00:00 |
|
Brice Maron
|
41d0308806
|
Change label for saving bookmark button
|
2012-05-08 19:04:06 +00:00 |
|
Bart Visscher
|
4f88fadbc1
|
Add remote for media/tomahawk.php
|
2012-05-08 18:40:40 +02:00 |
|
Bart Visscher
|
da1da8197e
|
Calendar: Resize content after creating calendar layout
The calendar can be higher than the window, this corrects for the scrollbar
|
2012-05-08 18:40:40 +02:00 |
|
Brice Maron
|
fa4a52260f
|
Try to correct query string url for search in bookmark
|
2012-05-08 16:22:35 +00:00 |
|
Michael Gapczynski
|
f6df71b74d
|
Set Content-Disposition to attachment for shared private links
|
2012-05-08 10:27:02 -04:00 |
|
Arthur Schiwon
|
9dee2a6b2c
|
LDAP: settings for group filter, fixes oc-587
|
2012-05-08 14:44:29 +02:00 |
|
Arthur Schiwon
|
c067cfc3b5
|
, not .
|
2012-05-08 14:09:38 +02:00 |
|
Arthur Schiwon
|
d01db3a807
|
LDAP: make sure, configuration is read when a public method needs it
|
2012-05-08 14:02:16 +02:00 |
|
Arthur Schiwon
|
5dee914ed2
|
LDAP: sqlite compatibility
|
2012-05-08 13:56:07 +02:00 |
|
Arthur Schiwon
|
251a6d1a9f
|
LDAP: write to log in case bind fails.
|
2012-05-08 12:04:52 +02:00 |
|
Georg Ehrke
|
cdf5d4e231
|
fix for previous commit
|
2012-05-08 08:49:14 +02:00 |
|
Georg Ehrke
|
0ce1cbdd14
|
fix calendar vulnerability
|
2012-05-08 08:46:27 +02:00 |
|
Brice Maron
|
010b97febd
|
Avoid touch operation when unshare public link
|
2012-05-07 22:37:18 +00:00 |
|
Bart Visscher
|
4dbc2093c6
|
Create a function for linking to remote.php
|
2012-05-07 21:47:14 +02:00 |
|
Georg Ehrke
|
9b5e0bebef
|
fix path for ampache in settings
|
2012-05-07 20:47:32 +02:00 |
|
Georg Ehrke
|
5b7cefb1e5
|
make ampache work with remote.php
|
2012-05-07 20:26:09 +02:00 |
|
Arthur Schiwon
|
5a1ea62437
|
LDAP: Fall back to Base DN if user/group base settings are blanked
|
2012-05-07 18:38:02 +02:00 |
|
Michael Gapczynski
|
bf8b3b0696
|
Forgot to set token variable
|
2012-05-07 12:36:29 -04:00 |
|
Arthur Schiwon
|
e9c7ecf22d
|
applying coding guideline
|
2012-05-07 17:35:23 +02:00 |
|
Arthur Schiwon
|
0ff5ab65be
|
applying coding guideline
|
2012-05-07 17:35:23 +02:00 |
|
Michael Gapczynski
|
e0a5f976e7
|
Fix bug oc-542, encode urls for private links
|
2012-05-07 11:30:36 -04:00 |
|
Michael Gapczynski
|
71423ec566
|
Fix bug oc-402, check if token is set for a private link
|
2012-05-07 10:47:55 -04:00 |
|
Michael Gapczynski
|
b9033d3b78
|
Only load sharing statuses if in files app
|
2012-05-07 10:47:55 -04:00 |
|
Georg Ehrke
|
f28d71bb9c
|
fix gallery sharing
|
2012-05-07 16:46:35 +02:00 |
|
Georg Ehrke
|
ef073a148f
|
make calendar compatible with public.php
|
2012-05-07 15:48:41 +02:00 |
|
Georg Ehrke
|
936c8ba1cc
|
improve remote.php and create public.php
|
2012-05-07 15:39:17 +02:00 |
|
Georg Ehrke
|
5904d5cf50
|
Merge branch 'remote.php'
|
2012-05-07 15:07:16 +02:00 |
|
Georg Ehrke
|
1138df0f4b
|
fix webdav, bloody merge conflicts
|
2012-05-07 12:47:34 +02:00 |
|
Georg Ehrke
|
6bdbcc1f49
|
fix path of carddav in addressbook management
|
2012-05-07 12:18:58 +02:00 |
|
Georg Ehrke
|
b125caaaf6
|
fix path of caldav in calendar management
|
2012-05-07 12:16:25 +02:00 |
|
Georg Ehrke
|
ef10603c26
|
fix pathes in calendar and contacts
|
2012-05-07 12:02:20 +02:00 |
|
Georg Ehrke
|
46fe2e3e2a
|
fix merge conflicts
|
2012-05-07 11:47:14 +02:00 |
|
Georg Ehrke
|
7d2a68fc31
|
make carddav work with remote.php
|
2012-05-07 11:24:19 +02:00 |
Florian Hülsmann
|
8534373f2f
|
better invalid webfinger URI handling
|
2012-05-07 11:15:24 +02:00 |
|
Michiel de Jong
|
3a184e2e1d
|
whitespace correction in webfinger.php
|
2012-05-07 09:51:37 +02:00 |
|
Michiel de Jong
|
c4e47953ac
|
require base lib and deal with malformed user addresses in webfinger.php
|
2012-05-07 09:46:15 +02:00 |
|
Michiel de Jong
|
5155f589fd
|
prevent xss in webfinger
|
2012-05-07 09:26:54 +02:00 |
|
Thomas Tanghus
|
65b9850e53
|
Code cleanup.
|
2012-05-07 04:46:09 +02:00 |
|
Michael Gapczynski
|
471cad7d90
|
Remove manual file cache insertions of shared files, update mtime of shared folder
|
2012-05-06 20:14:29 -04:00 |
|
Michael Gapczynski
|
41179a1456
|
Fix feedback for sharing errors
|
2012-05-06 19:06:24 -04:00 |
|
Brice Maron
|
333345d201
|
Add php-pdo to soft depend check
|
2012-05-06 21:42:33 +00:00 |
|
Brice Maron
|
fe8b10a922
|
Add php-xml as dependency for core fix oc-364
|
2012-05-06 21:38:35 +00:00 |
Frank Karlitschek
|
1945cd6946
|
ported the oc_template class
|
2012-05-06 23:00:36 +02:00 |
|
Thomas Tanghus
|
2488cdb8a1
|
Calendar: Fixed image paths.
|
2012-05-06 19:19:16 +02:00 |
|
Thomas Tanghus
|
5bf69cace1
|
Contacts: Re-added some styling that got lost in a revert.
|
2012-05-06 19:19:15 +02:00 |
|
Brice Maron
|
9dbc6b5158
|
Correct wrong DB quotes for calendar share functions
|
2012-05-06 15:41:14 +00:00 |
|
Thomas Tanghus
|
bede32be24
|
Contacts: Fix for Android browser again, again.
|
2012-05-06 13:51:16 +02:00 |
|
Thomas Tanghus
|
c1019a6e98
|
Contacts: Resized Add button. Now how do I add a gradient? ;-)
|
2012-05-06 13:51:16 +02:00 |
|
Thomas Tanghus
|
400ade063c
|
Revert Android positioning 'fix'.
This reverts commit 20f1c1e6ca and 93ae945414.
|
2012-05-06 13:51:16 +02:00 |
|
Thomas Tanghus
|
f2ec68d40c
|
Revert "Contacts: Fix for leftcontent positioning in Android browser."
This reverts commit 93ae945414.
|
2012-05-06 13:51:16 +02:00 |
|
Bart Visscher
|
f69f764e8b
|
Working remote.php with webdav and caldav
|
2012-05-06 00:12:51 +02:00 |
|
Georg Ehrke
|
c996600786
|
push changes
|
2012-05-05 22:54:14 +02:00 |
|
Georg Ehrke
|
6c2fc0cbe8
|
fix writing of webdav.php
|
2012-05-05 20:43:11 +02:00 |
|
Georg Ehrke
|
aa4f01fbcc
|
fix pathes for cal andcarddav
|
2012-05-05 18:58:58 +02:00 |
|
Georg Ehrke
|
4b4c3c3f3a
|
remove debug messages
|
2012-05-05 18:58:58 +02:00 |
|
Bart Visscher
|
24a8451b2e
|
Tasks: Fix addtask for <5.4 php version
|
2012-05-05 18:48:24 +02:00 |
|
Georg Ehrke
|
101406eba7
|
fix writing in remote folder
|
2012-05-05 18:29:26 +02:00 |
|
Bart Visscher
|
2facf509cc
|
Merge branch 'tasks' for Tasks app
|
2012-05-05 18:26:13 +02:00 |
|
Bart Visscher
|
2092caf6d3
|
Tasks: Fix add task action
|
2012-05-05 18:16:14 +02:00 |
|
Robin Appelman
|
70cb053e6b
|
improve cryptstream fro writing non-chunksized data
|
2012-05-05 16:49:48 +02:00 |
|
Robin Appelman
|
d875191777
|
only emit the filesystem hooks once when creating a new file
|
2012-05-05 16:49:48 +02:00 |
|
Florian Hülsmann
|
4a7591d0ab
|
Custom icons for contacts app
|
2012-05-05 16:31:58 +02:00 |
|
Thomas Tanghus
|
74a0df335a
|
Contacts: Make editable fields more discoverable. Align group field vertically #pixelpushing
|
2012-05-05 15:23:48 +02:00 |
|
Thomas Tanghus
|
eda42cece9
|
Contacts: Don't try to render invalid properties.
|
2012-05-05 13:49:47 +02:00 |
|
Thomas Tanghus
|
f9aadfff7a
|
Contacts: Set min-width on note to make it render correctly.
|
2012-05-05 13:49:47 +02:00 |
|
Frank Karlitschek
|
9bcc5c11a8
|
porting the hooks and starting with the templates
|
2012-05-05 10:18:45 +02:00 |
|
Thomas Tanghus
|
2c264f836c
|
Contacts: Better checks for GD library.
|
2012-05-04 23:53:29 +02:00 |
|
Bart Visscher
|
d0b7b01737
|
Tasks: Some styling
|
2012-05-04 20:57:37 +02:00 |
|
Bart Visscher
|
19d2b94837
|
Tasks: More updates to public API
|
2012-05-04 20:20:37 +02:00 |
|
Thomas Tanghus
|
76b8d06284
|
Add missing file.
|
2012-05-04 20:17:15 +02:00 |
|
Bart Visscher
|
1fef13b0c0
|
Calendar: Use array_merge to join event arrays
|
2012-05-04 17:34:13 +02:00 |
|
Bart Visscher
|
eae21f3269
|
Tasks: Fix ajax calls in javascript
|
2012-05-04 17:27:10 +02:00 |
|
Bart Visscher
|
0006b432f5
|
Tasks: Update for movable apps
|
2012-05-04 17:20:24 +02:00 |
|
Bart Visscher
|
439467746a
|
Tasks: Update to new public API
|
2012-05-04 17:19:25 +02:00 |
|
Bart Visscher
|
1e47156226
|
Merge branch 'master' into tasks
|
2012-05-04 17:04:11 +02:00 |
|
Thomas Tanghus
|
01da64caf7
|
Contacts: Changed the Add property button to not fixed and use plain button.
|
2012-05-04 16:36:45 +02:00 |
|
Thomas Tanghus
|
248eae2d0f
|
Contacts: Improve NOTE UI. Cleanup markup.
|
2012-05-04 15:47:55 +02:00 |
|
Arthur Schiwon
|
907fa9d85b
|
LDAP: check first, if requested attribute exists
|
2012-05-04 14:13:23 +02:00 |
|
Arthur Schiwon
|
716c5a3c8e
|
LDAP: use the correct attribute for the display name
|
2012-05-04 14:02:04 +02:00 |
|
Arthur Schiwon
|
231eec7325
|
LDAP: also those functions were not meant to be static
|
2012-05-04 13:48:55 +02:00 |
|
Arthur Schiwon
|
6c670cb82d
|
LDAP: more cleanup
|
2012-05-04 13:48:18 +02:00 |
|
Arthur Schiwon
|
333e8986f6
|
LDAP: copyright stuff
|
2012-05-04 13:26:07 +02:00 |
|
Arthur Schiwon
|
def59755ad
|
LDAP: cleanup
|
2012-05-04 13:26:07 +02:00 |
|
Arthur Schiwon
|
adb32ad347
|
LDAP: checkPassword ain't static
|
2012-05-04 13:26:07 +02:00 |
|
Arthur Schiwon
|
594221a467
|
LDAP: make oc_user_ldap::checkPassword make use of central OC_LDAP
|
2012-05-04 13:26:07 +02:00 |
|
Arthur Schiwon
|
3499783ea5
|
remove debug info
|
2012-05-04 13:26:07 +02:00 |
|
Arthur Schiwon
|
7aad40ca4d
|
LDAP: make oc_user_ldap::userExists make use of central OC_LDAP
|
2012-05-04 13:26:07 +02:00 |
|
Arthur Schiwon
|
6f982d2e20
|
LDAP: make oc_user_ldap::getUsers make use of central OC_LDAP
|
2012-05-04 13:26:07 +02:00 |
|
Arthur Schiwon
|
7a06e144ec
|
LDAP: central function for user and group list retrieval (will replace retrieveList from group part)
|
2012-05-04 13:26:07 +02:00 |
|
Thomas Tanghus
|
2296521a2e
|
Changed $APPROOT to $APPSROOT as in https://gitorious.org/owncloud/owncloud/merge_requests/116
|
2012-05-04 11:16:29 +02:00 |
|
Thomas Tanghus
|
e61e40c23d
|
Contacts: Hack around malformed BDAY.
|
2012-05-04 01:27:59 +02:00 |
|
Thomas Tanghus
|
bde5b4a7ff
|
Contacts: Don't load event handlers more than once, or you're asking for trouble :-P
|
2012-05-04 00:13:35 +02:00 |
|
Bart Visscher
|
07ff1e723a
|
Calendar: Fix repeating events
|
2012-05-03 23:33:44 +02:00 |
|
Bart Visscher
|
89c8316f8f
|
Merge branch 'master' of git://gitorious.org/owncloud/owncloud
|
2012-05-03 23:26:43 +02:00 |
|
Bart Visscher
|
077ea94f71
|
Merge commit 'refs/merge-requests/89' of git://gitorious.org/owncloud/owncloud
Conflicts:
apps/calendar/ajax/events.php
|
2012-05-03 23:18:43 +02:00 |
|
Arthur Schiwon
|
76a60a2fc3
|
ups, we don't have a CSS file therefore
|
2012-05-03 23:03:05 +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 |
|
Thomas Tanghus
|
8076b1e12d
|
Contacts: Remove some logging.
|
2012-05-03 16:01:40 +02:00 |
|
Thomas Tanghus
|
a89231ac1d
|
Contacts: Clean up tipsies.
|
2012-05-03 16:01:40 +02:00 |
|
Thomas Tanghus
|
5be9084c73
|
Contacts: Fixed paths in import.
|
2012-05-03 16:01:40 +02:00 |
|
Thomas Tanghus
|
cbee0d3128
|
Contacts: Fix paths and improve markup and css in address book overview.
|
2012-05-03 16:01:40 +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 |
|
Thomas Tanghus
|
375ba98645
|
Contacts: Move gif used by jquery.Jcrop and make style sheet use %webroot% path.
|
2012-05-03 11:15:44 +02:00 |
|
Thomas Tanghus
|
15be032740
|
Contacts: Improve loading contact.
|
2012-05-03 11:15:44 +02:00 |
|
Thomas Tanghus
|
6cc9f600d2
|
Contacts: Don't resize profile picture if it's not too big.
|
2012-05-03 11:15:44 +02:00 |
|
Frank Karlitschek
|
351740601a
|
port oc_response
|
2012-05-03 10:46:27 +02:00 |
|
Michael Gapczynski
|
80dff77b65
|
Fix private links
|
2012-05-02 19:24:43 -04:00 |
|
Robin Appelman
|
e5ef3e1340
|
move archive library to core so we can properly depend on it
|
2012-05-02 23:48:23 +02:00 |
|
Robin Appelman
|
0b51c53443
|
run none of the extranal storage tests on default
|
2012-05-02 23:44:00 +02:00 |
|
Robin Appelman
|
4ba527625f
|
don't try to register file actions when we're not in the files app
|
2012-05-02 23:26:57 +02:00 |
|
Bart Visscher
|
47081a2471
|
Gallery: Update version for database update
|
2012-05-02 21:36:34 +02:00 |
|
Bart Visscher
|
f7e410147f
|
Contacts: check for malformed VCards in calendar hook
|
2012-05-02 21:36:33 +02:00 |
|
Michael Gapczynski
|
6d37b8567b
|
Refactoring and upload support for Google Drive backend
|
2012-05-02 14:41:57 -04:00 |
|
Frank Karlitschek
|
4fe90f62f4
|
port checkAppEnabled
|
2012-05-02 19:08:37 +02:00 |
|
Frank Karlitschek
|
eec7c3833c
|
fix install
|
2012-05-02 19:02:41 +02:00 |
|
Bart Visscher
|
71f9b1968e
|
Tasks: Make it possible to close the details area
|
2012-05-02 17:28:19 +02:00 |
|
Georg Ehrke
|
33c343ed11
|
add require_once('../lib/base.php'); to webdav.php
|
2012-05-02 16:47:25 +02:00 |
|
Georg Ehrke
|
da03d05700
|
create folder 'remote' for the remote services like caldav, carddav and webdav
|
2012-05-02 16:41:23 +02:00 |
|
Frank Karlitschek
|
82a61e2e1a
|
port oc_preferences
|
2012-05-02 15:54:34 +02:00 |
|
Frank Karlitschek
|
ff66600bc0
|
port appconfig
|
2012-05-02 14:11:29 +02:00 |
|
Frank Karlitschek
|
8e99475886
|
first part of the config stuff
|
2012-05-02 13:28:56 +02:00 |
|
Frank Karlitschek
|
8c7f854671
|
move all the files stuff into a files class
|
2012-05-02 12:54:31 +02:00 |
|
Thomas Tanghus
|
f1830866a3
|
Contacts: Removed styling and (most) js from template. Started making app more keyboard/screenreader friendly. General cleanup in code and markup.
|
2012-05-02 12:10:44 +02:00 |
|
Thomas Tanghus
|
72256abf34
|
Contacts: Trying to improve PHOTO handling a bit.
|
2012-05-02 11:44:00 +02:00 |
|
Arthur Schiwon
|
6750998984
|
files is not internal any more, part II
|
2012-05-02 11:26:22 +02:00 |
Thomas Müller
|
8ed8d9cd91
|
fixing namespace
|
2012-05-02 00:55:26 +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
|
e2fb094693
|
some more porting
|
2012-05-01 21:07:08 +02:00 |